diff options
1356 files changed, 35117 insertions, 19020 deletions
diff --git a/nixpkgs/doc/functions/dockertools.xml b/nixpkgs/doc/functions/dockertools.xml index cb32db74b424..e95ce1979ded 100644 --- a/nixpkgs/doc/functions/dockertools.xml +++ b/nixpkgs/doc/functions/dockertools.xml @@ -437,18 +437,7 @@ pullImage { <callout arearefs='ex-dockerTools-pullImage-2'> <para> <varname>imageDigest</varname> specifies the digest of the image to be - downloaded. Skopeo can be used to get the digest of an image, with its - <varname>inspect</varname> subcommand. Since a given - <varname>imageName</varname> may transparently refer to a manifest list of - images which support multiple architectures and/or operating systems, - supply the `--override-os` and `--override-arch` arguments to specify - exactly which image you want. By default it will match the OS and - architecture of the host the command is run on. -<programlisting> -$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'" -sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b -</programlisting> - This argument is required. + downloaded. This argument is required. </para> </callout> <callout arearefs='ex-dockerTools-pullImage-3'> @@ -486,6 +475,34 @@ sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b </para> </callout> </calloutlist> + + <para> + <literal>nix-prefetch-docker</literal> command can be used to get required + image parameters: + +<programlisting> +$ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5 +</programlisting> + + Since a given <varname>imageName</varname> may transparently refer to a + manifest list of images which support multiple architectures and/or + operating systems, you can supply the <option>--os</option> and + <option>--arch</option> arguments to specify exactly which image you want. + By default it will match the OS and architecture of the host the command is + run on. + +<programlisting> +$ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux +</programlisting> + + Desired image name and tag can be set using + <option>--final-image-name</option> and <option>--final-image-tag</option> + arguments: + +<programlisting> +$ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod +</programlisting> + </para> </section> <section xml:id="ssec-pkgs-dockerTools-exportImage"> diff --git a/nixpkgs/doc/languages-frameworks/python.section.md b/nixpkgs/doc/languages-frameworks/python.section.md index e1630c8cb03a..9d49eb9e17ad 100644 --- a/nixpkgs/doc/languages-frameworks/python.section.md +++ b/nixpkgs/doc/languages-frameworks/python.section.md @@ -278,32 +278,31 @@ The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). ```nix -{ # ... +{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, dateutil, pytest }: - datashape = buildPythonPackage rec { - pname = "datashape"; - version = "0.4.7"; +buildPythonPackage rec { + pname = "datashape"; + version = "0.4.7"; - src = fetchPypi { - inherit pname version; - sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; + }; - checkInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy multipledispatch dateutil ]; - meta = with lib; { - homepage = https://github.com/ContinuumIO/datashape; - description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; + meta = with lib; { + homepage = https://github.com/ContinuumIO/datashape; + description = "A data description language"; + license = licenses.bsd2; + maintainers = with maintainers; [ fridh ]; }; } ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a +`dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a test runner and is only used during the `checkPhase` and is therefore not added to `propagatedBuildInputs`. @@ -313,25 +312,24 @@ Python bindings to `libxml2` and `libxslt`. These libraries are only required when building the bindings and are therefore added as `buildInputs`. ```nix -{ # ... +{ lib, pkgs, buildPythonPackage, fetchPypi }: - lxml = buildPythonPackage rec { - pname = "lxml"; - version = "3.4.4"; +buildPythonPackage rec { + pname = "lxml"; + version = "3.4.4"; - src = fetchPypi { - inherit pname version; - sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; + }; - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - meta = with lib; { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = https://lxml.de; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; - }; + meta = with lib; { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = https://lxml.de; + license = licenses.bsd3; + maintainers = with maintainers; [ sjourdois ]; }; } ``` @@ -347,35 +345,34 @@ find each of them in a different folder, and therefore we have to set `LDFLAGS` and `CFLAGS`. ```nix -{ # ... +{ lib, pkgs, buildPythonPackage, fetchPypi, numpy, scipy }: - pyfftw = buildPythonPackage rec { - pname = "pyFFTW"; - version = "0.9.2"; +buildPythonPackage rec { + pname = "pyFFTW"; + version = "0.9.2"; - src = fetchPypi { - inherit pname version; - sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; + }; - buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; + buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; - propagatedBuildInputs = with self; [ numpy scipy ]; + propagatedBuildInputs = [ numpy scipy ]; - # Tests cannot import pyfftw. pyfftw works fine though. - doCheck = false; + # Tests cannot import pyfftw. pyfftw works fine though. + doCheck = false; - preConfigure = '' - export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" - export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" - ''; + preConfigure = '' + export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" + export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" + ''; - 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 ]; - maintainers = with maintainers; [ fridh ]; - }; + 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 ]; + maintainers = with maintainers; [ fridh ]; }; } ``` @@ -403,7 +400,7 @@ Indeed, we can just add any package we like to have in our environment to `propa ```nix with import <nixpkgs> {}; -with pkgs.python35Packages; +with python35Packages; buildPythonPackage rec { name = "mypackage"; @@ -436,7 +433,7 @@ Let's split the package definition from the environment definition. We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix -{ lib, pkgs, buildPythonPackage }: +{ lib, buildPythonPackage }: buildPythonPackage rec { pname = "toolz"; @@ -456,18 +453,17 @@ buildPythonPackage rec { } ``` -It takes two arguments, `pkgs` and `buildPythonPackage`. +It takes an argument `buildPythonPackage`. We now call this function using `callPackage` in the definition of our environment ```nix with import <nixpkgs> {}; ( let - toolz = pkgs.callPackage /path/to/toolz/release.nix { - pkgs = pkgs; - buildPythonPackage = pkgs.python35Packages.buildPythonPackage; + toolz = callPackage /path/to/toolz/release.nix { + buildPythonPackage = python35Packages.buildPythonPackage; }; - in pkgs.python35.withPackages (ps: [ ps.numpy toolz ]) + in python35.withPackages (ps: [ ps.numpy toolz ]) ).env ``` @@ -565,7 +561,7 @@ buildPythonPackage rec { ''; checkInputs = [ hypothesis ]; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy ]; meta = with lib; { @@ -585,11 +581,6 @@ The `buildPythonPackage` mainly does four things: environment variable and add dependent libraries to script's `sys.path`. * In the `installCheck` phase, `${python.interpreter} setup.py test` is ran. -As in Perl, dependencies on other Python packages can be specified in the -`buildInputs` and `propagatedBuildInputs` attributes. If something is -exclusively a build-time dependency, use `buildInputs`; if it is (also) a runtime -dependency, use `propagatedBuildInputs`. - By default tests are run because `doCheck = true`. Test dependencies, like e.g. the test runner, should be added to `checkInputs`. @@ -733,7 +724,7 @@ Saving the following as `default.nix` with import <nixpkgs> {}; python.buildEnv.override { - extraLibs = [ pkgs.pythonPackages.pyramid ]; + extraLibs = [ pythonPackages.pyramid ]; ignoreCollisions = true; } ``` @@ -815,11 +806,12 @@ Given a `default.nix`: ```nix with import <nixpkgs> {}; -buildPythonPackage { name = "myproject"; - -buildInputs = with pkgs.pythonPackages; [ pyramid ]; +pythonPackages.buildPythonPackage { + name = "myproject"; + buildInputs = with pythonPackages; [ pyramid ]; -src = ./.; } + src = ./.; +} ``` Running `nix-shell` with no arguments should give you @@ -1005,10 +997,13 @@ Create this `default.nix` file, together with a `requirements.txt` and simply ex ```nix with import <nixpkgs> {}; -with pkgs.python27Packages; +with python27Packages; stdenv.mkDerivation { name = "impurePythonEnv"; + + src = null; + buildInputs = [ # these packages are required for virtualenv and pip to work: # @@ -1028,14 +1023,15 @@ stdenv.mkDerivation { libxslt libzip stdenv - zlib ]; - src = null; + zlib + ]; + shellHook = '' - # set SOURCE_DATE_EPOCH so that we can use python wheels - SOURCE_DATE_EPOCH=$(date +%s) - virtualenv --no-setuptools venv - export PATH=$PWD/venv/bin:$PATH - pip install -r requirements.txt + # set SOURCE_DATE_EPOCH so that we can use python wheels + SOURCE_DATE_EPOCH=$(date +%s) + virtualenv --no-setuptools venv + export PATH=$PWD/venv/bin:$PATH + pip install -r requirements.txt ''; } ``` diff --git a/nixpkgs/doc/package-notes.xml b/nixpkgs/doc/package-notes.xml index 169f70283e6d..12d81ae29bff 100644 --- a/nixpkgs/doc/package-notes.xml +++ b/nixpkgs/doc/package-notes.xml @@ -311,6 +311,10 @@ packageOverrides = pkgs: { <title>Elm</title> <para> + To start a development environment do <command>nix-shell -p elmPackages.elm elmPackages.elm-format</command> + </para> + + <para> To update Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>. </para> diff --git a/nixpkgs/doc/stdenv.xml b/nixpkgs/doc/stdenv.xml index 74f815fc1d79..0435362306ba 100644 --- a/nixpkgs/doc/stdenv.xml +++ b/nixpkgs/doc/stdenv.xml @@ -2754,9 +2754,9 @@ addEnvHooks "$hostOffset" myBashFunction <listitem> <para> Overrides the configure, build, and install phases. This will run the - "waf" script used by many projects. If waf doesn’t exist, it will copy - the version of waf available in Nixpkgs wafFlags can be used to pass - flags to the waf script. + "waf" script used by many projects. If wafPath (default ./waf) doesn’t + exist, it will copy the version of waf available in Nixpkgs. wafFlags can + be used to pass flags to the waf script. </para> </listitem> </varlistentry> diff --git a/nixpkgs/lib/lists.nix b/nixpkgs/lib/lists.nix index 9f2ccc00cafe..30d87ece6641 100644 --- a/nixpkgs/lib/lists.nix +++ b/nixpkgs/lib/lists.nix @@ -633,8 +633,7 @@ rec { else let x = head list; - xs = unique (drop 1 list); - in [x] ++ remove x xs; + in [x] ++ unique (remove x list); /* Intersects list 'e' and another list. O(nm) complexity. diff --git a/nixpkgs/lib/sources.nix b/nixpkgs/lib/sources.nix index 1a9f3f7d1f34..f02ddad17c6d 100644 --- a/nixpkgs/lib/sources.nix +++ b/nixpkgs/lib/sources.nix @@ -12,8 +12,8 @@ rec { # Bring in a path as a source, filtering out all Subversion and CVS # directories, as well as backup files (*~). cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! ( - # Filter out Subversion and CVS directories. - (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || + # Filter out version control software files/directories + (baseName == ".git" || type == "directory" && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || # Filter out editor backup / swap files. lib.hasSuffix "~" baseName || builtins.match "^\\.sw[a-z]$" baseName != null || diff --git a/nixpkgs/lib/systems/default.nix b/nixpkgs/lib/systems/default.nix index 9c6b51400dcb..52b9bd46e600 100644 --- a/nixpkgs/lib/systems/default.nix +++ b/nixpkgs/lib/systems/default.nix @@ -36,6 +36,7 @@ rec { else if final.isLinux /* default */ then "glibc" else if final.isMsp430 then "newlib" else if final.isAvr then "avrlibc" + else if final.isNetBSD then "nblibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; extensions = { diff --git a/nixpkgs/lib/systems/doubles.nix b/nixpkgs/lib/systems/doubles.nix index 58677c0bdd90..2cf06b6ac1c8 100644 --- a/nixpkgs/lib/systems/doubles.nix +++ b/nixpkgs/lib/systems/doubles.nix @@ -47,5 +47,5 @@ in rec { unix = filterDoubles predicates.isUnix; windows = filterDoubles predicates.isWindows; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"]; + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; } diff --git a/nixpkgs/lib/systems/examples.nix b/nixpkgs/lib/systems/examples.nix index 27a32181df88..3e90c5ec2273 100644 --- a/nixpkgs/lib/systems/examples.nix +++ b/nixpkgs/lib/systems/examples.nix @@ -44,14 +44,6 @@ rec { platform = platforms.aarch64-multiplatform; }; - armv5te-android-prebuilt = rec { - config = "armv5tel-unknown-linux-androideabi"; - sdkVer = "21"; - ndkVer = "18b"; - platform = platforms.armv5te-android; - useAndroidPrebuilt = true; - }; - armv7a-android-prebuilt = rec { config = "armv7a-unknown-linux-androideabi"; sdkVer = "24"; @@ -217,4 +209,11 @@ rec { libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; + + # BSDs + + amd64-netbsd = { + config = "x86_64-unknown-netbsd"; + libc = "nblibc"; + }; } diff --git a/nixpkgs/lib/systems/platforms.nix b/nixpkgs/lib/systems/platforms.nix index 03bfce256103..a2b43c970a41 100644 --- a/nixpkgs/lib/systems/platforms.nix +++ b/nixpkgs/lib/systems/platforms.nix @@ -253,22 +253,11 @@ rec { kernelTarget = "zImage"; }; - # https://developer.android.com/ndk/guides/abis#armeabi - armv5te-android = { - name = "armeabi"; - gcc = { - arch = "armv5te"; - float = "soft"; - float-abi = "soft"; - }; - }; - # https://developer.android.com/ndk/guides/abis#v7a armv7a-android = { name = "armeabi-v7a"; gcc = { arch = "armv7-a"; - float = "hard"; float-abi = "softfp"; fpu = "vfpv3-d16"; }; diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 039da8cbff80..de8d00f94337 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -1219,6 +1219,11 @@ github = "dgonyeo"; name = "Derek Gonyeo"; }; + dhkl = { + email = "david@davidslab.com"; + github = "dhl"; + name = "David Leung"; + }; dipinhora = { email = "dipinhora+github@gmail.com"; github = "dipinhora"; @@ -1229,6 +1234,11 @@ github = "disassembler"; name = "Samuel Leathers"; }; + disserman = { + email = "disserman@gmail.com"; + github = "divi255"; + name = "Sergei S."; + }; dizfer = { email = "david@izquierdofernandez.com"; github = "dizfer"; @@ -1613,6 +1623,11 @@ github = "FireyFly"; name = "Jonas Höglund"; }; + flexw = { + email = "felix.weilbach@t-online.de"; + github = "FlexW"; + name = "Felix Weilbach"; + }; flokli = { email = "flokli@flokli.de"; github = "flokli"; @@ -2733,6 +2748,11 @@ github = "lo1tuma"; name = "Mathias Schreck"; }; + loewenheim = { + email = "loewenheim@mailbox.org"; + github = "loewenheim"; + name = "Sebastian Zivota"; + }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; @@ -2885,6 +2905,11 @@ email = "markus@wotringer.de"; name = "Markus Wotringer"; }; + marius851000 = { + email = "mariusdavid@laposte.net"; + name = "Marius David"; + github = "marius851000"; + }; marsam = { email = "marsam@users.noreply.github.com"; github = "marsam"; @@ -3292,6 +3317,11 @@ github = "mvnetbiz"; name = "Matt Votava"; }; + mwilsoninsight = { + email = "max.wilson@insight.com"; + github = "mwilsoninsight"; + name = "Max Wilson"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "myrl"; @@ -3431,6 +3461,11 @@ github = "nocoolnametom"; name = "Tom Doggett"; }; + nomeata = { + email = "mail@joachim-breitner.de"; + github = "nomeata"; + name = "Joachim Breitner"; + }; noneucat = { email = "andy@lolc.at"; github = "noneucat"; @@ -4584,6 +4619,11 @@ github = "stumoss"; name = "Stuart Moss"; }; + suhr = { + email = "suhr@i2pmail.org"; + github = "suhr"; + name = "Сухарик"; + }; SuprDewd = { email = "suprdewd@gmail.com"; github = "SuprDewd"; @@ -5237,6 +5277,11 @@ github = "xnwdd"; name = "Guillermo NWDD"; }; + xrelkd = { + email = "46590321+xrelkd@users.noreply.github.com"; + github = "xrelkd"; + name = "xrelkd"; + }; xurei = { email = "olivier.bourdoux@gmail.com"; github = "xurei"; @@ -5416,4 +5461,14 @@ github = "shazow"; name = "Andrey Petrov"; }; + freezeboy = { + email = "freezeboy@users.noreply.github.com"; + github = "freezeboy"; + name = "freezeboy"; + }; + tesq0 = { + email = "mikolaj.galkowski@gmail.com"; + github = "tesq0"; + name = "Mikolaj Galkowski"; + }; } diff --git a/nixpkgs/nixos/doc/manual/development/releases.xml b/nixpkgs/nixos/doc/manual/development/releases.xml index dcedad540e1f..f45fecd16c35 100755 --- a/nixpkgs/nixos/doc/manual/development/releases.xml +++ b/nixpkgs/nixos/doc/manual/development/releases.xml @@ -177,6 +177,12 @@ </listitem> <listitem> <para> + Update "Chapter 4. Upgrading NixOS" section of the manual to match + new stable release version. + </para> + </listitem> + <listitem> + <para> Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations diff --git a/nixpkgs/nixos/doc/manual/installation/installing.xml b/nixpkgs/nixos/doc/manual/installation/installing.xml index f4f8d470f802..9687c21a01e6 100644 --- a/nixpkgs/nixos/doc/manual/installation/installing.xml +++ b/nixpkgs/nixos/doc/manual/installation/installing.xml @@ -54,7 +54,7 @@ <para> To manually configure the network on the graphical installer, first disable - network-manager with <command>systemctl stop network-manager</command>. + network-manager with <command>systemctl stop NetworkManager</command>. </para> <para> diff --git a/nixpkgs/nixos/doc/manual/installation/upgrading.xml b/nixpkgs/nixos/doc/manual/installation/upgrading.xml index 69668b1d4bd6..35b4d266e12e 100644 --- a/nixpkgs/nixos/doc/manual/installation/upgrading.xml +++ b/nixpkgs/nixos/doc/manual/installation/upgrading.xml @@ -14,11 +14,11 @@ <para> <emphasis>Stable channels</emphasis>, such as <literal - xlink:href="https://nixos.org/channels/nixos-17.03">nixos-17.03</literal>. + xlink:href="https://nixos.org/channels/nixos-19.03">nixos-19.03</literal>. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded - from 4.9.16 to 4.9.17 (a minor bug fix), but not from - 4.9.<replaceable>x</replaceable> to 4.11.<replaceable>x</replaceable> (a + from 4.19.34 to 4.19.38 (a minor bug fix), but not from + 4.19.<replaceable>x</replaceable> to 4.20.<replaceable>x</replaceable> (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created. </para> @@ -38,7 +38,7 @@ <para> <emphasis>Small channels</emphasis>, such as <literal - xlink:href="https://nixos.org/channels/nixos-17.03-small">nixos-17.03-small</literal> + xlink:href="https://nixos.org/channels/nixos-19.03-small">nixos-19.03-small</literal> or <literal xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. @@ -63,8 +63,8 @@ <para> When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For instance, if you - installed from a 17.03 ISO, you will be subscribed to the - <literal>nixos-17.03</literal> channel. To see which NixOS channel you’re + installed from a 19.03 ISO, you will be subscribed to the + <literal>nixos-19.03</literal> channel. To see which NixOS channel you’re subscribed to, run the following as root: <screen> # nix-channel --list | grep nixos @@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable # nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos </screen> (Be sure to include the <literal>nixos</literal> parameter at the end.) For - instance, to use the NixOS 17.03 stable channel: + instance, to use the NixOS 19.03 stable channel: <screen> -# nix-channel --add https://nixos.org/channels/nixos-17.03 nixos +# nix-channel --add https://nixos.org/channels/nixos-19.03 nixos </screen> If you have a server, you may want to use the “small” channel instead: <screen> -# nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos +# nix-channel --add https://nixos.org/channels/nixos-19.03-small nixos </screen> And if you want to live on the bleeding edge: <screen> @@ -127,7 +127,7 @@ nixos https://nixos.org/channels/nixos-unstable current channel. (To see when the service runs, see <command>systemctl list-timers</command>.) You can also specify a channel explicitly, e.g. <programlisting> -<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-17.03; +<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-19.03; </programlisting> </para> </section> diff --git a/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml b/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml index 87e4f3dae869..7d6e04e0dd90 100644 --- a/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml +++ b/nixpkgs/nixos/doc/manual/man-nixos-build-vms.xml @@ -24,8 +24,14 @@ <arg> <option>--help</option> - </arg> - + </arg> + + <arg> + <option>--option</option> + <replaceable>name</replaceable> + <replaceable>value</replaceable> + </arg> + <arg choice="plain"> <replaceable>network.nix</replaceable> </arg> @@ -115,6 +121,18 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term> + <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable> + </term> + <listitem> + <para>Set the Nix configuration option + <replaceable>name</replaceable> to <replaceable>value</replaceable>. + This overrides settings in the Nix configuration file (see + <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). + </para> + </listitem> + </varlistentry> </variablelist> </refsection> </refentry> diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml index 7c94f6e9473e..e9c6cd7e9acb 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1903.xml @@ -31,33 +31,22 @@ </para> <note> <para> - <varname>services.xserver.desktopManager.pantheon</varname> default - enables lightdm as a display manager and using Pantheon's greeter. + By default, <varname>services.xserver.desktopManager.pantheon</varname> + enables LightDM as a display manager, as pantheon's screen locking + implementation relies on it. </para> <para> - This is because of limitations with the screenlocking implementation, - whereas the screenlocker would be non-functional without it. - </para> - <para> - Because of that it is recommended to retain this precaution, however if - you'd like to change this set: - </para> - <itemizedlist> - <listitem> - <para> - <option>services.xserver.displayManager.lightdm.enable</option> - </para> - </listitem> - <listitem> - <para> - <option>services.xserver.displayManager.lightdm.greeters.pantheon.enable</option> - </para> - </listitem> - </itemizedlist> - <para> - to <literal>false</literal> and enable your preferred display manager. + Because of that it is recommended to leave LightDM enabled. If you'd like + to disable it anyway, set + <option>services.xserver.displayManager.lightdm.enable</option> to + <literal>false</literal> and enable your preferred display manager. </para> </note> + <para> + Also note that Pantheon's LightDM greeter is not enabled by default, + because it has numerous issues in NixOS and isn't optimal for use here + yet. + </para> </listitem> <listitem> <para> @@ -534,6 +523,13 @@ Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option. </para> </listitem> + <listitem> + <para> + <literal>nodejs-6_x</literal> is end-of-life. + <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and + <literal>nodePackages_6_x</literal> are removed. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml b/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml index 2cfaec49c02e..2dc2dc41ff24 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-1909.xml @@ -35,11 +35,6 @@ The following new services were added since the last release: </para> - <itemizedlist> - <listitem> - <para /> - </listitem> - </itemizedlist> </section> <section xmlns="http://docbook.org/ns/docbook" @@ -72,6 +67,22 @@ accordingly. </para> </listitem> + <listitem> + <para> + The options <option>services.prometheus.alertmanager.user</option> and + <option>services.prometheus.alertmanager.group</option> have been removed + because the alertmanager service is now using systemd's <link + xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html"> + DynamicUser mechanism</link> which obviates these options. + </para> + </listitem> + <listitem> + <para> + The NetworkManager systemd unit was renamed back from network-manager.service to + NetworkManager.service for better compatibility with other applications expecting this name. + The same applies to ModemManager where modem-manager.service is now called ModemManager.service again. + </para> + </listitem> </itemizedlist> </section> @@ -109,6 +120,21 @@ Accelerated Video Playback</link> for better transcoding performance. </para> </listitem> + <listitem> + <para> + The following changes apply if the <literal>stateVersion</literal> is + changed to 19.09 or higher. For <literal>stateVersion = "19.03"</literal> + or lower the old behavior is preserved. + </para> + <itemizedlist> + <listitem> + <para> + <literal>solr.package</literal> defaults to + <literal>pkgs.solr_8</literal>. + </para> + </listitem> + </itemizedlist> + </listitem> </itemizedlist> </section> </section> diff --git a/nixpkgs/nixos/modules/config/no-x-libs.nix b/nixpkgs/nixos/modules/config/no-x-libs.nix index 9d2023477020..aad02a9ca4e3 100644 --- a/nixpkgs/nixos/modules/config/no-x-libs.nix +++ b/nixpkgs/nixos/modules/config/no-x-libs.nix @@ -34,7 +34,7 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; - pinentry = super.pinentry.override { gtk2 = null; qt = null; }; + pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt = null; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; })); }; diff --git a/nixpkgs/nixos/modules/config/system-path.nix b/nixpkgs/nixos/modules/config/system-path.nix index 7a65e44e828d..fae2fc740082 100644 --- a/nixpkgs/nixos/modules/config/system-path.nix +++ b/nixpkgs/nixos/modules/config/system-path.nix @@ -7,7 +7,7 @@ with lib; let - requiredPackages = map lib.lowPrio + requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg) [ config.nix.package pkgs.acl pkgs.attr diff --git a/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index 5d431df4b114..b9ab2053c41f 100644 --- a/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/pid1yakjasch4pwl63nzbj22z9zf0q26-nix-2.2"; - i686-linux = "/nix/store/qpkl0cxy0xh4h432lv2qsjrmhvx5x2vy-nix-2.2"; - aarch64-linux = "/nix/store/0jg7h94x986d8cskg6gcfza9x67spdbp-nix-2.2"; - x86_64-darwin = "/nix/store/a48whqkmxnsfhwbk6nay74iyc1cf0lr2-nix-2.2"; + x86_64-linux = "/nix/store/hbhdjn5ik3byg642d1m11k3k3s0kn3py-nix-2.2.2"; + i686-linux = "/nix/store/fz5cikwvj3n0a6zl44h6l2z3cin64mda-nix-2.2.2"; + aarch64-linux = "/nix/store/2gba4cyl4wvxzfbhmli90jy4n5aj0kjj-nix-2.2.2"; + x86_64-darwin = "/nix/store/87i4fp46jfw9yl8c7i9gx75m5yph7irl-nix-2.2.2"; } diff --git a/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh index 4e981c074a57..25106733087e 100644 --- a/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh @@ -9,49 +9,44 @@ showUsage() { # Parse valid argument options -PARAMS=`getopt -n $0 -o h -l no-out-link,show-trace,help -- "$@"` +nixBuildArgs=() +networkExpr= -if [ $? != 0 ] -then - showUsage - exit 1 -fi - -eval set -- "$PARAMS" - -# Evaluate valid options - -while [ "$1" != "--" ] -do +while [ $# -gt 0 ]; do case "$1" in - --no-out-link) - noOutLinkArg="--no-out-link" - ;; - --show-trace) - showTraceArg="--show-trace" - ;; - -h|--help) - showUsage - exit 0 - ;; + --no-out-link) + nixBuildArgs+=("--no-out-link") + ;; + --show-trace) + nixBuildArgs+=("--show-trace") + ;; + -h|--help) + showUsage + exit 0 + ;; + --option) + shift + nixBuildArgs+=("--option" "$1" "$2"); shift + ;; + *) + if [ ! -z "$networkExpr" ]; then + echo "Network expression already set!" + showUsage + exit 1 + fi + networkExpr="$(readlink -f $1)" + ;; esac - + shift done -shift - -# Validate the given options - -if [ "$1" = "" ] +if [ -z "$networkExpr" ] then echo "ERROR: A network expression must be specified!" >&2 exit 1 -else - networkExpr=$(readlink -f $1) fi # Build a network of VMs - nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \ - --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg + --argstr networkExpr $networkExpr "${nixBuildArgs[@]}" diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index bd8d00db872c..5012a3a303c9 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -255,6 +255,8 @@ ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix + ./services/desktops/deepin/dde-daemon.nix + ./services/desktops/deepin/deepin-menu.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/pantheon/contractor.nix @@ -265,8 +267,10 @@ ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix ./services/desktops/gnome3/chrome-gnome-shell.nix + ./services/desktops/gnome3/evince.nix ./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/file-roller.nix + ./services/desktops/gnome3/glib-networking.nix ./services/desktops/gnome3/gnome-disks.nix ./services/desktops/gnome3/gnome-documents.nix ./services/desktops/gnome3/gnome-keyring.nix @@ -488,6 +492,7 @@ ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/exporters.nix + ./services/monitoring/prometheus/pushgateway.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix @@ -672,6 +677,7 @@ ./services/networking/tinydns.nix ./services/networking/tftpd.nix ./services/networking/tox-bootstrapd.nix + ./services/networking/tox-node.nix ./services/networking/toxvpn.nix ./services/networking/tvheadend.nix ./services/networking/unbound.nix @@ -744,10 +750,12 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/codimd.nix + ./services/web-apps/documize.nix ./services/web-apps/frab.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/mattermost.nix + ./services/web-apps/miniflux.nix ./services/web-apps/nextcloud.nix ./services/web-apps/nexus.nix ./services/web-apps/pgpkeyserver-lite.nix diff --git a/nixpkgs/nixos/modules/programs/bash/bash.nix b/nixpkgs/nixos/modules/programs/bash/bash.nix index d53c6b318f1d..27b5f9e4b642 100644 --- a/nixpkgs/nixos/modules/programs/bash/bash.nix +++ b/nixpkgs/nixos/modules/programs/bash/bash.nix @@ -226,9 +226,7 @@ in environment.shells = [ "/run/current-system/sw/bin/bash" - "/var/run/current-system/sw/bin/bash" "/run/current-system/sw/bin/sh" - "/var/run/current-system/sw/bin/sh" "${pkgs.bashInteractive}/bin/bash" "${pkgs.bashInteractive}/bin/sh" ]; diff --git a/nixpkgs/nixos/modules/programs/fish.nix b/nixpkgs/nixos/modules/programs/fish.nix index bcb5a3f341b5..622d2f96fe41 100644 --- a/nixpkgs/nixos/modules/programs/fish.nix +++ b/nixpkgs/nixos/modules/programs/fish.nix @@ -232,7 +232,6 @@ in environment.shells = [ "/run/current-system/sw/bin/fish" - "/var/run/current-system/sw/bin/fish" "${pkgs.fish}/bin/fish" ]; diff --git a/nixpkgs/nixos/modules/programs/xonsh.nix b/nixpkgs/nixos/modules/programs/xonsh.nix index f967ca82ac8c..ceab9b5db931 100644 --- a/nixpkgs/nixos/modules/programs/xonsh.nix +++ b/nixpkgs/nixos/modules/programs/xonsh.nix @@ -50,7 +50,6 @@ in environment.shells = [ "/run/current-system/sw/bin/xonsh" - "/var/run/current-system/sw/bin/xonsh" "${pkgs.xonsh}/bin/xonsh" ]; diff --git a/nixpkgs/nixos/modules/programs/zsh/zsh.nix b/nixpkgs/nixos/modules/programs/zsh/zsh.nix index deb94922da80..b7117e5f90d7 100644 --- a/nixpkgs/nixos/modules/programs/zsh/zsh.nix +++ b/nixpkgs/nixos/modules/programs/zsh/zsh.nix @@ -230,7 +230,6 @@ in environment.shells = [ "/run/current-system/sw/bin/zsh" - "/var/run/current-system/sw/bin/zsh" "${pkgs.zsh}/bin/zsh" ]; diff --git a/nixpkgs/nixos/modules/rename.nix b/nixpkgs/nixos/modules/rename.nix index 325f92308402..f6c112d9cfab 100644 --- a/nixpkgs/nixos/modules/rename.nix +++ b/nixpkgs/nixos/modules/rename.nix @@ -45,6 +45,8 @@ with lib; (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.") (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.") (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.") + (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.") + (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.") (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) @@ -134,7 +136,7 @@ with lib; inetPort = [ "services" "postgrey" "inetPort" ]; in if value inetAddr == null - then { path = "/var/run/postgrey.sock"; } + then { path = "/run/postgrey.sock"; } else { addr = value inetAddr; port = value inetPort; } )) diff --git a/nixpkgs/nixos/modules/security/pam.nix b/nixpkgs/nixos/modules/security/pam.nix index 46ce274a2a9a..89e71c5136e4 100644 --- a/nixpkgs/nixos/modules/security/pam.nix +++ b/nixpkgs/nixos/modules/security/pam.nix @@ -410,6 +410,8 @@ let "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} ${optionalString config.services.samba.syncPasswordsByPam "password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"} + ${optionalString cfg.enableGnomeKeyring + "password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} # Session management. ${optionalString cfg.setEnvironment '' diff --git a/nixpkgs/nixos/modules/services/audio/ympd.nix b/nixpkgs/nixos/modules/services/audio/ympd.nix index d34c1c9d83cc..919b76622510 100644 --- a/nixpkgs/nixos/modules/services/audio/ympd.nix +++ b/nixpkgs/nixos/modules/services/audio/ympd.nix @@ -15,7 +15,7 @@ in { enable = mkEnableOption "ympd, the MPD Web GUI"; webPort = mkOption { - type = types.string; + type = types.either types.str types.port; # string for backwards compat default = "8080"; description = "The port where ympd's web interface will be available."; example = "ssl://8080:/path/to/ssl-private-key.pem"; @@ -49,7 +49,7 @@ in { systemd.services.ympd = { description = "Standalone MPD Web GUI written in C"; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${cfg.mpd.host} --port ${toString cfg.mpd.port} --webport ${cfg.webPort} --user nobody"; + serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${cfg.mpd.host} --port ${toString cfg.mpd.port} --webport ${toString cfg.webPort} --user nobody"; }; }; diff --git a/nixpkgs/nixos/modules/services/backup/bacula.nix b/nixpkgs/nixos/modules/services/backup/bacula.nix index 24cad6128260..41bda7893a75 100644 --- a/nixpkgs/nixos/modules/services/backup/bacula.nix +++ b/nixpkgs/nixos/modules/services/backup/bacula.nix @@ -15,7 +15,7 @@ let Name = "${fd_cfg.name}"; FDPort = ${toString fd_cfg.port}; WorkingDirectory = "${libDir}"; - Pid Directory = "/var/run"; + Pid Directory = "/run"; ${fd_cfg.extraClientConfig} } @@ -41,7 +41,7 @@ let Name = "${sd_cfg.name}"; SDPort = ${toString sd_cfg.port}; WorkingDirectory = "${libDir}"; - Pid Directory = "/var/run"; + Pid Directory = "/run"; ${sd_cfg.extraStorageConfig} } @@ -77,7 +77,7 @@ let Password = "${dir_cfg.password}"; DirPort = ${toString dir_cfg.port}; Working Directory = "${libDir}"; - Pid Directory = "/var/run/"; + Pid Directory = "/run/"; QueryFile = "${pkgs.bacula}/etc/query.sql"; ${dir_cfg.extraDirectorConfig} } diff --git a/nixpkgs/nixos/modules/services/databases/couchdb.nix b/nixpkgs/nixos/modules/services/databases/couchdb.nix index ca89b1198205..84d108d9c747 100644 --- a/nixpkgs/nixos/modules/services/databases/couchdb.nix +++ b/nixpkgs/nixos/modules/services/databases/couchdb.nix @@ -85,7 +85,7 @@ in { uriFile = mkOption { type = types.path; - default = "/var/run/couchdb/couchdb.uri"; + default = "/run/couchdb/couchdb.uri"; description = '' This file contains the full URI that can be used to access this instance of CouchDB. It is used to help discover the port CouchDB is diff --git a/nixpkgs/nixos/modules/services/databases/mongodb.nix b/nixpkgs/nixos/modules/services/databases/mongodb.nix index 4c46d9228e5f..3fe4af2f2619 100644 --- a/nixpkgs/nixos/modules/services/databases/mongodb.nix +++ b/nixpkgs/nixos/modules/services/databases/mongodb.nix @@ -65,7 +65,7 @@ in }; pidFile = mkOption { - default = "/var/run/mongodb.pid"; + default = "/run/mongodb.pid"; description = "Location of MongoDB pid file"; }; diff --git a/nixpkgs/nixos/modules/services/databases/openldap.nix b/nixpkgs/nixos/modules/services/databases/openldap.nix index bb658918cb0d..c101e7375af9 100644 --- a/nixpkgs/nixos/modules/services/databases/openldap.nix +++ b/nixpkgs/nixos/modules/services/databases/openldap.nix @@ -226,8 +226,8 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; preStart = '' - mkdir -p /var/run/slapd - chown -R "${cfg.user}:${cfg.group}" /var/run/slapd + mkdir -p /run/slapd + chown -R "${cfg.user}:${cfg.group}" /run/slapd ${optionalString (cfg.declarativeContents != null) '' rm -Rf "${cfg.dataDir}" ''} diff --git a/nixpkgs/nixos/modules/services/databases/redis.nix b/nixpkgs/nixos/modules/services/databases/redis.nix index cc7b51982d1d..c04cc1283b2e 100644 --- a/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/nixpkgs/nixos/modules/services/databases/redis.nix @@ -95,7 +95,7 @@ in type = with types; nullOr path; default = null; description = "The path to the socket to bind to."; - example = "/var/run/redis.sock"; + example = "/run/redis.sock"; }; logLevel = mkOption { diff --git a/nixpkgs/nixos/modules/services/databases/rethinkdb.nix b/nixpkgs/nixos/modules/services/databases/rethinkdb.nix index 789d9c851d64..4828e594b328 100644 --- a/nixpkgs/nixos/modules/services/databases/rethinkdb.nix +++ b/nixpkgs/nixos/modules/services/databases/rethinkdb.nix @@ -41,7 +41,7 @@ in }; pidpath = mkOption { - default = "/var/run/rethinkdb"; + default = "/run/rethinkdb"; description = "Location where each instance's pid file is located."; }; diff --git a/nixpkgs/nixos/modules/services/desktops/deepin/dde-daemon.nix b/nixpkgs/nixos/modules/services/desktops/deepin/dde-daemon.nix new file mode 100644 index 000000000000..057da4e2d7f2 --- /dev/null +++ b/nixpkgs/nixos/modules/services/desktops/deepin/dde-daemon.nix @@ -0,0 +1,41 @@ +# dde-daemon + +{ config, pkgs, lib, ... }: + +{ + + ###### interface + + options = { + + services.deepin.dde-daemon = { + + enable = lib.mkEnableOption + "A daemon for handling Deepin Desktop Environment session settings"; + + }; + + }; + + + ###### implementation + + config = lib.mkIf config.services.deepin.dde-daemon.enable { + + environment.systemPackages = [ pkgs.deepin.dde-daemon ]; + + services.dbus.packages = [ pkgs.deepin.dde-daemon ]; + + systemd.packages = [ pkgs.deepin.dde-daemon ]; + + users.groups.dde-daemon = { }; + + users.users.dde-daemon = { + description = "Deepin daemon user"; + group = "dde-daemon"; + isSystemUser = true; + }; + + }; + +} diff --git a/nixpkgs/nixos/modules/services/desktops/deepin/deepin-menu.nix b/nixpkgs/nixos/modules/services/desktops/deepin/deepin-menu.nix new file mode 100644 index 000000000000..23fe5a741c42 --- /dev/null +++ b/nixpkgs/nixos/modules/services/desktops/deepin/deepin-menu.nix @@ -0,0 +1,29 @@ +# deepin-menu + +{ config, pkgs, lib, ... }: + +{ + + ###### interface + + options = { + + services.deepin.deepin-menu = { + + enable = lib.mkEnableOption + "DBus service for unified menus in Deepin Desktop Environment"; + + }; + + }; + + + ###### implementation + + config = lib.mkIf config.services.deepin.deepin-menu.enable { + + services.dbus.packages = [ pkgs.deepin.deepin-menu ]; + + }; + +} diff --git a/nixpkgs/nixos/modules/services/desktops/gnome3/evince.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/evince.nix new file mode 100644 index 000000000000..5f040a16f067 --- /dev/null +++ b/nixpkgs/nixos/modules/services/desktops/gnome3/evince.nix @@ -0,0 +1,35 @@ +# Evince. + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.evince = { + + enable = mkEnableOption + "systemd and dbus services for Evince, the GNOME document viewer"; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.evince.enable { + + environment.systemPackages = [ pkgs.evince ]; + + services.dbus.packages = [ pkgs.evince ]; + + systemd.packages = [ pkgs.evince ]; + + }; + +} diff --git a/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix new file mode 100644 index 000000000000..186668d7d385 --- /dev/null +++ b/nixpkgs/nixos/modules/services/desktops/gnome3/glib-networking.nix @@ -0,0 +1,33 @@ +# GLib Networking + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.glib-networking = { + + enable = mkEnableOption "network extensions for GLib"; + + }; + + }; + + ###### implementation + + config = mkIf config.services.gnome3.glib-networking.enable { + + services.dbus.packages = [ pkgs.gnome3.glib-networking ]; + + systemd.packages = [ pkgs.gnome3.glib-networking ]; + + environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ]; + + }; + +} diff --git a/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index 5ea4350be5b4..4c350d8bb1c6 100644 --- a/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -35,6 +35,8 @@ with lib; services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ]; + security.pam.services.login.enableGnomeKeyring = true; + }; } diff --git a/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix b/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix index 81d4a1ae65bf..bffe7353b10e 100644 --- a/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix +++ b/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix @@ -57,6 +57,15 @@ in ''; }; + user = mkOption { + type = types.str; + default = "nobody"; + example = "root"; + description = '' + User account under which <command>triggerhappy</command> runs. + ''; + }; + bindings = mkOption { type = types.listOf (types.submodule bindingCfg); default = []; @@ -96,7 +105,7 @@ in after = [ "local-fs.target" ]; description = "Global hotkey daemon"; serviceConfig = { - ExecStart = "${pkgs.triggerhappy}/bin/thd --user nobody --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; + ExecStart = "${pkgs.triggerhappy}/bin/thd ${optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; }; }; diff --git a/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix b/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix index ab5f4c39e8c2..9599854352c9 100644 --- a/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix +++ b/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix @@ -48,8 +48,8 @@ with lib; requiredBy = [ "postfix.service" ]; serviceConfig = { Type = "forking"; - PIDFile = "/var/run/pfix-srsd.pid"; - ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /var/run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}"; + PIDFile = "/run/pfix-srsd.pid"; + ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}"; }; }; }; diff --git a/nixpkgs/nixos/modules/services/mail/postgrey.nix b/nixpkgs/nixos/modules/services/mail/postgrey.nix index 241f75eae279..8e2b9c5dbc56 100644 --- a/nixpkgs/nixos/modules/services/mail/postgrey.nix +++ b/nixpkgs/nixos/modules/services/mail/postgrey.nix @@ -29,7 +29,7 @@ with lib; let options = { path = mkOption { type = path; - default = "/var/run/postgrey.sock"; + default = "/run/postgrey.sock"; description = "Path of the unix socket"; }; @@ -53,7 +53,7 @@ in { socket = mkOption { type = socket; default = { - path = "/var/run/postgrey.sock"; + path = "/run/postgrey.sock"; mode = "0777"; }; example = { diff --git a/nixpkgs/nixos/modules/services/mail/roundcube.nix b/nixpkgs/nixos/modules/services/mail/roundcube.nix index 66b1c1e3e6f9..e8b2e11bf726 100644 --- a/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -141,27 +141,31 @@ in systemd.services.roundcube-setup = let pgSuperUser = config.services.postgresql.superUser; - in { - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - wantedBy = [ "multi-user.target" ]; - path = [ config.services.postgresql.package ]; - script = '' - mkdir -p /var/lib/roundcube - if [ ! -f /var/lib/roundcube/db-created ]; then - if [ "${cfg.database.host}" = "localhost" ]; then - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'"; - ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}"; + in mkMerge [ + (mkIf (cfg.database.host == "localhost") { + requires = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + path = [ config.services.postgresql.package ]; + }) + { + wantedBy = [ "multi-user.target" ]; + script = '' + mkdir -p /var/lib/roundcube + if [ ! -f /var/lib/roundcube/db-created ]; then + if [ "${cfg.database.host}" = "localhost" ]; then + ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'"; + ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}"; + fi + PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \ + -f ${cfg.package}/SQL/postgres.initial.sql \ + -h ${cfg.database.host} ${cfg.database.dbname} + touch /var/lib/roundcube/db-created fi - PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \ - -f ${cfg.package}/SQL/postgres.initial.sql \ - -h ${cfg.database.host} ${cfg.database.dbname} - touch /var/lib/roundcube/db-created - fi - ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh - ''; - serviceConfig.Type = "oneshot"; - }; + ${pkgs.php}/bin/php ${cfg.package}/bin/update.sh + ''; + serviceConfig.Type = "oneshot"; + } + ]; }; } diff --git a/nixpkgs/nixos/modules/services/mail/spamassassin.nix b/nixpkgs/nixos/modules/services/mail/spamassassin.nix index 0c11ea431368..1fe77ce5a0c7 100644 --- a/nixpkgs/nixos/modules/services/mail/spamassassin.nix +++ b/nixpkgs/nixos/modules/services/mail/spamassassin.nix @@ -174,7 +174,7 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --siteconfigpath=${spamdEnv} --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid"; + ExecStart = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --siteconfigpath=${spamdEnv} --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/run/spamd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; diff --git a/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix b/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix index 87999c3614fc..5e465926b832 100644 --- a/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixpkgs/nixos/modules/services/misc/matrix-synapse.nix @@ -30,7 +30,7 @@ ${optionalString (cfg.bind_host != null) '' bind_host: "${cfg.bind_host}" ''} server_name: "${cfg.server_name}" -pid_file: "/var/run/matrix-synapse.pid" +pid_file: "/run/matrix-synapse.pid" web_client: ${boolToString cfg.web_client} ${optionalString (cfg.public_baseurl != null) '' public_baseurl: "${cfg.public_baseurl}" diff --git a/nixpkgs/nixos/modules/services/misc/mbpfan.nix b/nixpkgs/nixos/modules/services/misc/mbpfan.nix index 50f6f80ad00c..e22d1ed61f99 100644 --- a/nixpkgs/nixos/modules/services/misc/mbpfan.nix +++ b/nixpkgs/nixos/modules/services/misc/mbpfan.nix @@ -101,7 +101,7 @@ in { Type = "simple"; ExecStart = "${cfg.package}/bin/mbpfan -f${verbose}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - PIDFile = "/var/run/mbpfan.pid"; + PIDFile = "/run/mbpfan.pid"; Restart = "always"; }; }; diff --git a/nixpkgs/nixos/modules/services/misc/spice-vdagentd.nix b/nixpkgs/nixos/modules/services/misc/spice-vdagentd.nix index f322ba4cbd58..2dd9fcf68ab0 100644 --- a/nixpkgs/nixos/modules/services/misc/spice-vdagentd.nix +++ b/nixpkgs/nixos/modules/services/misc/spice-vdagentd.nix @@ -19,7 +19,7 @@ in description = "spice-vdagent daemon"; wantedBy = [ "graphical.target" ]; preStart = '' - mkdir -p "/var/run/spice-vdagentd/" + mkdir -p "/run/spice-vdagentd/" ''; serviceConfig = { Type = "forking"; diff --git a/nixpkgs/nixos/modules/services/misc/svnserve.nix b/nixpkgs/nixos/modules/services/misc/svnserve.nix index 04a6cd7bfa9b..6292bc52b1e3 100644 --- a/nixpkgs/nixos/modules/services/misc/svnserve.nix +++ b/nixpkgs/nixos/modules/services/misc/svnserve.nix @@ -38,7 +38,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = "mkdir -p ${cfg.svnBaseDir}"; - script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid"; + script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/run/svnserve.pid"; }; }; } diff --git a/nixpkgs/nixos/modules/services/monitoring/nagios.nix b/nixpkgs/nixos/modules/services/monitoring/nagios.nix index e5496209f827..7f65236ed3d3 100644 --- a/nixpkgs/nixos/modules/services/monitoring/nagios.nix +++ b/nixpkgs/nixos/modules/services/monitoring/nagios.nix @@ -24,7 +24,7 @@ let status_file=${nagiosState}/status.dat object_cache_file=${nagiosState}/objects.cache temp_file=${nagiosState}/nagios.tmp - lock_file=/var/run/nagios.lock # Not used I think. + lock_file=/run/nagios.lock # Not used I think. state_retention_file=${nagiosState}/retention.dat query_socket=${nagiosState}/nagios.qh check_result_path=${nagiosState} diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix index 7d790b6b590b..11d85e9c4fc3 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -40,22 +40,6 @@ in { ''; }; - user = mkOption { - type = types.str; - default = "nobody"; - description = '' - User name under which Alertmanager shall be run. - ''; - }; - - group = mkOption { - type = types.str; - default = "nogroup"; - description = '' - Group under which Alertmanager shall be run. - ''; - }; - configuration = mkOption { type = types.nullOr types.attrs; default = null; @@ -151,17 +135,13 @@ in { systemd.services.alertmanager = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - script = '' - ${cfg.package}/bin/alertmanager \ - ${concatStringsSep " \\\n " cmdlineArgs} - ''; - serviceConfig = { - User = cfg.user; - Group = cfg.group; Restart = "always"; - PrivateTmp = true; + DynamicUser = true; WorkingDirectory = "/tmp"; + ExecStart = "${cfg.package}/bin/alertmanager" + + optionalString (length cmdlineArgs != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs); ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index cc703573d8cd..e7ac12c07d33 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -4,9 +4,24 @@ with lib; let cfg = config.services.prometheus; + cfg2 = config.services.prometheus2; promUser = "prometheus"; promGroup = "prometheus"; + stateDir = + if cfg.stateDir != null + then cfg.stateDir + else + if cfg.dataDir != null + then + # This assumes /var/lib/ is a prefix of cfg.dataDir. + # This is checked as an assertion below. + removePrefix stateDirBase cfg.dataDir + else "prometheus"; + stateDirBase = "/var/lib/"; + workingDir = stateDirBase + stateDir; + workingDir2 = stateDirBase + cfg2.stateDir; + # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; @@ -17,38 +32,96 @@ let promtool ${what} $out ''; + # a wrapper that verifies that the configuration is valid for + # prometheus 2 + prom2toolCheck = what: name: file: + pkgs.runCommand + "${name}-${replaceStrings [" "] [""] what}-checked" + { buildInputs = [ cfg2.package ]; } '' + ln -s ${file} $out + promtool ${what} $out + ''; + # Pretty-print JSON to a file writePrettyJSON = name: x: pkgs.runCommand name { preferLocalBuild = true; } '' echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out ''; - # This becomes the main config file + # This becomes the main config file for Prometheus 1 promConfig = { global = cfg.globalConfig; rule_files = map (promtoolCheck "check-rules" "rules") (cfg.ruleFiles ++ [ (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules)) ]); - scrape_configs = cfg.scrapeConfigs; + scrape_configs = filterEmpty cfg.scrapeConfigs; }; generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; prometheusYml = let - yml = if cfg.configText != null then + yml = if cfg.configText != null then pkgs.writeText "prometheus.yml" cfg.configText else generatedPrometheusYml; in promtoolCheck "check-config" "prometheus.yml" yml; cmdlineArgs = cfg.extraFlags ++ [ - "-storage.local.path=${cfg.dataDir}/metrics" + "-storage.local.path=${workingDir}/metrics" "-config.file=${prometheusYml}" "-web.listen-address=${cfg.listenAddress}" "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" - (optionalString (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}") - (optionalString (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}") - ]; + ] ++ + optional (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}" ++ + optional (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}"; + + # This becomes the main config file for Prometheus 2 + promConfig2 = { + global = cfg2.globalConfig; + rule_files = map (prom2toolCheck "check rules" "rules") (cfg2.ruleFiles ++ [ + (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg2.rules)) + ]); + scrape_configs = filterEmpty cfg2.scrapeConfigs; + alerting = optionalAttrs (cfg2.alertmanagerURL != []) { + alertmanagers = [{ + static_configs = [{ + targets = cfg2.alertmanagerURL; + }]; + }]; + }; + }; + + generatedPrometheus2Yml = writePrettyJSON "prometheus.yml" promConfig2; + + prometheus2Yml = let + yml = if cfg2.configText != null then + pkgs.writeText "prometheus.yml" cfg2.configText + else generatedPrometheus2Yml; + in prom2toolCheck "check config" "prometheus.yml" yml; + + cmdlineArgs2 = cfg2.extraFlags ++ [ + "--storage.tsdb.path=${workingDir2}/data/" + "--config.file=${prometheus2Yml}" + "--web.listen-address=${cfg2.listenAddress}" + "--alertmanager.notification-queue-capacity=${toString cfg2.alertmanagerNotificationQueueCapacity}" + "--alertmanager.timeout=${toString cfg2.alertmanagerTimeout}s" + ] ++ + optional (cfg2.webExternalUrl != null) "--web.external-url=${cfg2.webExternalUrl}"; + + filterEmpty = filterAttrsListRecursive (_n: v: !(v == null || v == [] || v == {})); + filterAttrsListRecursive = pred: x: + if isAttrs x then + listToAttrs ( + concatMap (name: + let v = x.${name}; in + if pred name v then [ + (nameValuePair name (filterAttrsListRecursive pred v)) + ] else [] + ) (attrNames x) + ) + else if isList x then + map (filterAttrsListRecursive pred) x + else x; promTypes.globalConfig = types.submodule { options = { @@ -179,6 +252,14 @@ let Optional http login credentials for metrics scraping. ''; }; + tls_config = mkOption { + type = types.nullOr promTypes.tls_config; + default = null; + apply = x: mapNullable _filter x; + description = '' + Configures the scrape request's TLS settings. + ''; + }; dns_sd_configs = mkOption { type = types.listOf promTypes.dns_sd_config; default = []; @@ -211,6 +292,14 @@ let List of labeled target groups for this job. ''; }; + ec2_sd_configs = mkOption { + type = types.listOf promTypes.ec2_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of EC2 service discovery configurations. + ''; + }; relabel_configs = mkOption { type = types.listOf promTypes.relabel_config; default = []; @@ -240,6 +329,96 @@ let }; }; + promTypes.ec2_sd_config = types.submodule { + options = { + region = mkOption { + type = types.str; + description = '' + The AWS Region. + ''; + }; + endpoint = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Custom endpoint to be used. + ''; + }; + access_key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The AWS API key id. If blank, the environment variable + <literal>AWS_ACCESS_KEY_ID</literal> is used. + ''; + }; + secret_key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The AWS API key secret. If blank, the environment variable + <literal>AWS_SECRET_ACCESS_KEY</literal> is used. + ''; + }; + profile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Named AWS profile used to connect to the API. + ''; + }; + role_arn = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + AWS Role ARN, an alternative to using AWS API keys. + ''; + }; + refresh_interval = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Refresh interval to re-read the instance list. + ''; + }; + port = mkOption { + type = types.int; + default = 80; + description = '' + The port to scrape metrics from. If using the public IP + address, this must instead be specified in the relabeling + rule. + ''; + }; + filters = mkOption { + type = types.nullOr (types.listOf promTypes.filter); + default = null; + description = '' + Filters can be used optionally to filter the instance list by other criteria. + ''; + }; + }; + }; + + promTypes.filter = types.submodule { + options = { + name = mkOption { + type = types.str; + description = '' + See <link xlink:href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html">this list</link> + for the available filters. + ''; + }; + value = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Value of the filter. + ''; + }; + }; + }; + promTypes.dns_sd_config = types.submodule { options = { names = mkOption { @@ -373,6 +552,47 @@ let }; }; + promTypes.tls_config = types.submodule { + options = { + ca_file = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + CA certificate to validate API server certificate with. + ''; + }; + cert_file = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Certificate file for client cert authentication to the server. + ''; + }; + key_file = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Key file for client cert authentication to the server. + ''; + }; + server_name = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + ServerName extension to indicate the name of the server. + http://tools.ietf.org/html/rfc4366#section-3.1 + ''; + }; + insecure_skip_verify = mkOption { + type = types.bool; + default = false; + description = '' + Disable validation of the server certificate. + ''; + }; + }; + }; + in { options = { services.prometheus = { @@ -403,10 +623,21 @@ in { }; dataDir = mkOption { - type = types.path; - default = "/var/lib/prometheus"; + type = types.nullOr types.path; + default = null; description = '' Directory to store Prometheus metrics data. + This option is deprecated, please use <option>services.prometheus.stateDir</option>. + ''; + }; + + stateDir = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Directory below <literal>${stateDirBase}</literal> to store Prometheus metrics data. + This directory will be created automatically using systemd's StateDirectory mechanism. + Defaults to <literal>prometheus</literal>. ''; }; @@ -497,30 +728,201 @@ in { ''; }; }; - }; + services.prometheus2 = { - config = mkIf cfg.enable { - users.groups.${promGroup}.gid = config.ids.gids.prometheus; - users.users.${promUser} = { - description = "Prometheus daemon user"; - uid = config.ids.uids.prometheus; - group = promGroup; - home = cfg.dataDir; - createHome = true; - }; - systemd.services.prometheus = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - script = '' - #!/bin/sh - exec ${cfg.package}/bin/prometheus \ - ${concatStringsSep " \\\n " cmdlineArgs} - ''; - serviceConfig = { - User = promUser; - Restart = "always"; - WorkingDirectory = cfg.dataDir; + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Prometheus 2 monitoring daemon. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.prometheus_2; + defaultText = "pkgs.prometheus_2"; + description = '' + The prometheus2 package that should be used. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0:9090"; + description = '' + Address to listen on for the web interface, API, and telemetry. + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "prometheus2"; + description = '' + Directory below <literal>${stateDirBase}</literal> to store Prometheus metrics data. + This directory will be created automatically using systemd's StateDirectory mechanism. + Defaults to <literal>prometheus2</literal>. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching Prometheus 2. + ''; + }; + + configText = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + If non-null, this option defines the text that is written to + prometheus.yml. If null, the contents of prometheus.yml is generated + from the structured config options. + ''; + }; + + globalConfig = mkOption { + type = promTypes.globalConfig; + default = {}; + apply = _filter; + description = '' + Parameters that are valid in all configuration contexts. They + also serve as defaults for other configuration sections + ''; + }; + + rules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Alerting and/or Recording rules to evaluate at runtime. + ''; + }; + + ruleFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Any additional rules files to include in this configuration. + ''; + }; + + scrapeConfigs = mkOption { + type = types.listOf promTypes.scrape_config; + default = []; + apply = x: map _filter x; + description = '' + A list of scrape configurations. + ''; + }; + + alertmanagerURL = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of Alertmanager URLs to send notifications to. + ''; + }; + + alertmanagerNotificationQueueCapacity = mkOption { + type = types.int; + default = 10000; + description = '' + The capacity of the queue for pending alert manager notifications. + ''; + }; + + alertmanagerTimeout = mkOption { + type = types.int; + default = 10; + description = '' + Alert manager HTTP API timeout (in seconds). + ''; + }; + + webExternalUrl = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://example.com/"; + description = '' + The URL under which Prometheus is externally reachable (for example, + if Prometheus is served via a reverse proxy). + ''; }; }; - }; + }; + + config = mkMerge [ + (mkIf (cfg.enable || cfg2.enable) { + users.groups.${promGroup}.gid = config.ids.gids.prometheus; + users.users.${promUser} = { + description = "Prometheus daemon user"; + uid = config.ids.uids.prometheus; + group = promGroup; + }; + }) + (mkIf cfg.enable { + warnings = + optional (cfg.dataDir != null) '' + The option services.prometheus.dataDir is deprecated, please use + services.prometheus.stateDir. + ''; + assertions = [ + { + assertion = !(cfg.dataDir != null && cfg.stateDir != null); + message = + "The options services.prometheus.dataDir and services.prometheus.stateDir" + + " can't both be set at the same time! It's recommended to only set the latter" + + " since the former is deprecated."; + } + { + assertion = cfg.dataDir != null -> hasPrefix stateDirBase cfg.dataDir; + message = + "The option services.prometheus.dataDir should have ${stateDirBase} as a prefix!"; + } + { + assertion = cfg.stateDir != null -> !hasPrefix "/" cfg.stateDir; + message = + "The option services.prometheus.stateDir shouldn't be an absolute directory." + + " It should be a directory relative to ${stateDirBase}."; + } + { + assertion = cfg2.stateDir != null -> !hasPrefix "/" cfg2.stateDir; + message = + "The option services.prometheus2.stateDir shouldn't be an absolute directory." + + " It should be a directory relative to ${stateDirBase}."; + } + ]; + systemd.services.prometheus = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/prometheus" + + optionalString (length cmdlineArgs != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs); + User = promUser; + Restart = "always"; + WorkingDirectory = workingDir; + StateDirectory = stateDir; + }; + }; + }) + (mkIf cfg2.enable { + systemd.services.prometheus2 = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${cfg2.package}/bin/prometheus" + + optionalString (length cmdlineArgs2 != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs2); + User = promUser; + Restart = "always"; + WorkingDirectory = workingDir2; + StateDirectory = cfg2.stateDir; + }; + }; + }) + ]; } diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix new file mode 100644 index 000000000000..f8fcc3eb97ef --- /dev/null +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix @@ -0,0 +1,166 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.pushgateway; + + cmdlineArgs = + opt "web.listen-address" cfg.web.listen-address + ++ opt "web.telemetry-path" cfg.web.telemetry-path + ++ opt "web.external-url" cfg.web.external-url + ++ opt "web.route-prefix" cfg.web.route-prefix + ++ optional cfg.persistMetrics ''--persistence.file="/var/lib/${cfg.stateDir}/metrics"'' + ++ opt "persistence.interval" cfg.persistence.interval + ++ opt "log.level" cfg.log.level + ++ opt "log.format" cfg.log.format + ++ cfg.extraFlags; + + opt = k : v : optional (v != null) ''--${k}="${v}"''; + +in { + options = { + services.prometheus.pushgateway = { + enable = mkEnableOption "Prometheus Pushgateway"; + + package = mkOption { + type = types.package; + default = pkgs.prometheus-pushgateway; + defaultText = "pkgs.prometheus-pushgateway"; + description = '' + Package that should be used for the prometheus pushgateway. + ''; + }; + + web.listen-address = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Address to listen on for the web interface, API and telemetry. + + <literal>null</literal> will default to <literal>:9091</literal>. + ''; + }; + + web.telemetry-path = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path under which to expose metrics. + + <literal>null</literal> will default to <literal>/metrics</literal>. + ''; + }; + + web.external-url = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The URL under which Pushgateway is externally reachable. + ''; + }; + + web.route-prefix = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Prefix for the internal routes of web endpoints. + + Defaults to the path of + <option>services.prometheus.pushgateway.web.external-url</option>. + ''; + }; + + persistence.interval = mkOption { + type = types.nullOr types.str; + default = null; + example = "10m"; + description = '' + The minimum interval at which to write out the persistence file. + + <literal>null</literal> will default to <literal>5m</literal>. + ''; + }; + + log.level = mkOption { + type = types.nullOr (types.enum ["debug" "info" "warn" "error" "fatal"]); + default = null; + description = '' + Only log messages with the given severity or above. + + <literal>null</literal> will default to <literal>info</literal>. + ''; + }; + + log.format = mkOption { + type = types.nullOr types.str; + default = null; + example = "logger:syslog?appname=bob&local=7"; + description = '' + Set the log target and format. + + <literal>null</literal> will default to <literal>logger:stderr</literal>. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the Pushgateway. + ''; + }; + + persistMetrics = mkOption { + type = types.bool; + default = false; + description = '' + Whether to persist metrics to a file. + + When enabled metrics will be saved to a file called + <literal>metrics</literal> in the directory + <literal>/var/lib/pushgateway</literal>. The directory below + <literal>/var/lib</literal> can be set using + <option>services.prometheus.pushgateway.stateDir</option>. + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "pushgateway"; + description = '' + Directory below <literal>/var/lib</literal> to store metrics. + + This directory will be created automatically using systemd's + StateDirectory mechanism when + <option>services.prometheus.pushgateway.persistMetrics</option> + is enabled. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !hasPrefix "/" cfg.stateDir; + message = + "The option services.prometheus.pushgateway.stateDir" + + " shouldn't be an absolute directory." + + " It should be a directory relative to /var/lib."; + } + ]; + systemd.services.pushgateway = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Restart = "always"; + DynamicUser = true; + ExecStart = "${cfg.package}/bin/pushgateway" + + optionalString (length cmdlineArgs != 0) (" \\\n " + + concatStringsSep " \\\n " cmdlineArgs); + StateDirectory = if cfg.persistMetrics then cfg.stateDir else null; + }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix index 426cf9bf86ef..0519e7c2ad6a 100644 --- a/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix @@ -9,7 +9,7 @@ let zabbix = cfg.package; - stateDir = "/var/run/zabbix"; + stateDir = "/run/zabbix"; logDir = "/var/log/zabbix"; diff --git a/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix index 5f9fc12832fc..fdeab6af4417 100644 --- a/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix @@ -7,7 +7,7 @@ let cfg = config.services.zabbixServer; - stateDir = "/var/run/zabbix"; + stateDir = "/run/zabbix"; logDir = "/var/log/zabbix"; diff --git a/nixpkgs/nixos/modules/services/networking/asterisk.nix b/nixpkgs/nixos/modules/services/networking/asterisk.nix index b8ec2b25a227..03a2544b9a7e 100644 --- a/nixpkgs/nixos/modules/services/networking/asterisk.nix +++ b/nixpkgs/nixos/modules/services/networking/asterisk.nix @@ -45,7 +45,7 @@ let astdatadir => /var/lib/asterisk astagidir => /var/lib/asterisk/agi-bin astspooldir => /var/spool/asterisk - astrundir => /var/run/asterisk + astrundir => /run/asterisk astlogdir => /var/log/asterisk astsbindir => ${cfg.package}/sbin ''; @@ -257,7 +257,7 @@ in ExecReload = ''${cfg.package}/bin/asterisk -x "core reload" ''; Type = "forking"; - PIDFile = "/var/run/asterisk/asterisk.pid"; + PIDFile = "/run/asterisk/asterisk.pid"; }; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix b/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix index 488d9877b5e0..4c91a0c415b6 100644 --- a/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix @@ -214,7 +214,7 @@ in systemd.sockets.avahi-daemon = { description = "Avahi mDNS/DNS-SD Stack Activation Socket"; - listenStreams = [ "/var/run/avahi-daemon/socket" ]; + listenStreams = [ "/run/avahi-daemon/socket" ]; wantedBy = [ "sockets.target" ]; }; @@ -229,7 +229,7 @@ in path = [ pkgs.coreutils pkgs.avahi ]; - preStart = "mkdir -p /var/run/avahi-daemon"; + preStart = "mkdir -p /run/avahi-daemon"; script = '' diff --git a/nixpkgs/nixos/modules/services/networking/bind.nix b/nixpkgs/nixos/modules/services/networking/bind.nix index abcd1ef6ff5d..98486cefd528 100644 --- a/nixpkgs/nixos/modules/services/networking/bind.nix +++ b/nixpkgs/nixos/modules/services/networking/bind.nix @@ -25,8 +25,8 @@ let blackhole { badnetworks; }; forward first; forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; - directory "/var/run/named"; - pid-file "/var/run/named/named.pid"; + directory "/run/named"; + pid-file "/run/named/named.pid"; ${cfg.extraOptions} }; @@ -187,8 +187,8 @@ in ${pkgs.bind.out}/sbin/rndc-confgen -r /dev/urandom -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null fi - ${pkgs.coreutils}/bin/mkdir -p /var/run/named - chown ${bindUser} /var/run/named + ${pkgs.coreutils}/bin/mkdir -p /run/named + chown ${bindUser} /run/named ''; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/networking/hostapd.nix b/nixpkgs/nixos/modules/services/networking/hostapd.nix index 9f74e4963296..3fbc08e90607 100644 --- a/nixpkgs/nixos/modules/services/networking/hostapd.nix +++ b/nixpkgs/nixos/modules/services/networking/hostapd.nix @@ -25,7 +25,7 @@ let logger_stdout=-1 logger_stdout_level=2 - ctrl_interface=/var/run/hostapd + ctrl_interface=/run/hostapd ctrl_interface_group=${cfg.group} ${if cfg.wpa then '' diff --git a/nixpkgs/nixos/modules/services/networking/htpdate.nix b/nixpkgs/nixos/modules/services/networking/htpdate.nix index f5d512c7cd5a..6954e5b060c4 100644 --- a/nixpkgs/nixos/modules/services/networking/htpdate.nix +++ b/nixpkgs/nixos/modules/services/networking/htpdate.nix @@ -62,7 +62,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; - PIDFile = "/var/run/htpdate.pid"; + PIDFile = "/run/htpdate.pid"; ExecStart = concatStringsSep " " [ "${htpdate}/bin/htpdate" "-D -u nobody" diff --git a/nixpkgs/nixos/modules/services/networking/hylafax/default.nix b/nixpkgs/nixos/modules/services/networking/hylafax/default.nix index 4c63b822d165..d8ffa3fc04d2 100644 --- a/nixpkgs/nixos/modules/services/networking/hylafax/default.nix +++ b/nixpkgs/nixos/modules/services/networking/hylafax/default.nix @@ -26,4 +26,6 @@ }]; }; + meta.maintainers = [ lib.maintainers.yarny ]; + } diff --git a/nixpkgs/nixos/modules/services/networking/hylafax/faxq-default.nix b/nixpkgs/nixos/modules/services/networking/hylafax/faxq-default.nix index a2630ce66b71..9b634650cf79 100644 --- a/nixpkgs/nixos/modules/services/networking/hylafax/faxq-default.nix +++ b/nixpkgs/nixos/modules/services/networking/hylafax/faxq-default.nix @@ -4,7 +4,7 @@ { - ModemGroup = [ ''"any:.*"'' ]; + ModemGroup = [ ''"any:0:.*"'' ]; ServerTracing = "0x78701"; SessionTracing = "0x78701"; UUCPLockDir = "/var/lock"; diff --git a/nixpkgs/nixos/modules/services/networking/iodine.nix b/nixpkgs/nixos/modules/services/networking/iodine.nix index 58ad0df4ff20..344f84374bbd 100644 --- a/nixpkgs/nixos/modules/services/networking/iodine.nix +++ b/nixpkgs/nixos/modules/services/networking/iodine.nix @@ -63,7 +63,7 @@ in passwordFile = mkOption { type = types.str; default = ""; - description = "File that containts password"; + description = "File that contains password"; }; }; })); @@ -100,7 +100,7 @@ in passwordFile = mkOption { type = types.str; default = ""; - description = "File that containts password"; + description = "File that contains password"; }; }; @@ -120,7 +120,7 @@ in description = "iodine client - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server}"; + script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}"; serviceConfig = { RestartSec = "30s"; Restart = "always"; @@ -136,7 +136,7 @@ in description = "iodine, ip over dns server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "-P $(cat \"${cfg.server.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}"; + script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}"; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/ircd-hybrid/ircd.conf b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/ircd.conf index bb22832dbdb2..17ef203840af 100644 --- a/nixpkgs/nixos/modules/services/networking/ircd-hybrid/ircd.conf +++ b/nixpkgs/nixos/modules/services/networking/ircd-hybrid/ircd.conf @@ -987,7 +987,7 @@ general { * egdpool_path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7 * which automatically finds the path. */ -# egdpool_path = "/var/run/egd-pool"; +# egdpool_path = "/run/egd-pool"; /* diff --git a/nixpkgs/nixos/modules/services/networking/lldpd.nix b/nixpkgs/nixos/modules/services/networking/lldpd.nix index dec30cc92f6a..d5de9c45d84b 100644 --- a/nixpkgs/nixos/modules/services/networking/lldpd.nix +++ b/nixpkgs/nixos/modules/services/networking/lldpd.nix @@ -23,7 +23,7 @@ in users.users._lldpd = { description = "lldpd user"; group = "_lldpd"; - home = "/var/run/lldpd"; + home = "/run/lldpd"; isSystemUser = true; }; users.groups._lldpd = {}; diff --git a/nixpkgs/nixos/modules/services/networking/miniupnpd.nix b/nixpkgs/nixos/modules/services/networking/miniupnpd.nix index ab714a6ac75e..c095d9948546 100644 --- a/nixpkgs/nixos/modules/services/networking/miniupnpd.nix +++ b/nixpkgs/nixos/modules/services/networking/miniupnpd.nix @@ -71,7 +71,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.miniupnpd}/bin/miniupnpd -f ${configFile}"; - PIDFile = "/var/run/miniupnpd.pid"; + PIDFile = "/run/miniupnpd.pid"; Type = "forking"; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/nixpkgs/nixos/modules/services/networking/networkmanager.nix index d372dfd8f412..5e5544471818 100644 --- a/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -466,7 +466,7 @@ in { systemd.packages = cfg.packages; - systemd.services."network-manager" = { + systemd.services."NetworkManager" = { wantedBy = [ "network.target" ]; restartTriggers = [ configFile ]; @@ -478,9 +478,9 @@ in { }; systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled { - wantedBy = [ "network-manager.service" ]; - before = [ "network-manager.service" ]; - partOf = [ "network-manager.service" ]; + wantedBy = [ "NetworkManager.service" ]; + before = [ "NetworkManager.service" ]; + partOf = [ "NetworkManager.service" ]; script = concatStrings (mapAttrsToList (n: d: '' mkdir -p "/run/NetworkManager/hostsdirs/${n}" chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}" diff --git a/nixpkgs/nixos/modules/services/networking/ocserv.nix b/nixpkgs/nixos/modules/services/networking/ocserv.nix index 61473a9fabf9..dc26ffeafeef 100644 --- a/nixpkgs/nixos/modules/services/networking/ocserv.nix +++ b/nixpkgs/nixos/modules/services/networking/ocserv.nix @@ -31,7 +31,7 @@ in udp-port = 443 run-as-user = nobody run-as-group = nogroup - socket-file = /var/run/ocserv-socket + socket-file = /run/ocserv-socket server-cert = certs/server-cert.pem server-key = certs/server-key.pem keepalive = 32400 @@ -50,7 +50,7 @@ in rekey-time = 172800 rekey-method = ssl use-occtl = true - pid-file = /var/run/ocserv.pid + pid-file = /run/ocserv.pid device = vpns predictable-ips = true default-domain = example.com @@ -90,8 +90,8 @@ in serviceConfig = { PrivateTmp = true; - PIDFile = "/var/run/ocserv.pid"; - ExecStart = "${pkgs.ocserv}/bin/ocserv --foreground --pid-file /var/run/ocesrv.pid --config /etc/ocserv/ocserv.conf"; + PIDFile = "/run/ocserv.pid"; + ExecStart = "${pkgs.ocserv}/bin/ocserv --foreground --pid-file /run/ocesrv.pid --config /etc/ocserv/ocserv.conf"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/racoon.nix b/nixpkgs/nixos/modules/services/networking/racoon.nix index 86e13d1ea0d6..328f4cb1497f 100644 --- a/nixpkgs/nixos/modules/services/networking/racoon.nix +++ b/nixpkgs/nixos/modules/services/networking/racoon.nix @@ -32,12 +32,12 @@ in { else cfg.configPath }"; ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config"; - PIDFile = "/var/run/racoon.pid"; + PIDFile = "/run/racoon.pid"; Type = "forking"; Restart = "always"; }; preStart = '' - rm /var/run/racoon.pid || true + rm /run/racoon.pid || true mkdir -p /var/racoon ''; }; diff --git a/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index b9b5d40c4574..cbb305cd3825 100644 --- a/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -431,8 +431,6 @@ in services.openssh.extraConfig = mkOrder 0 '' - Protocol 2 - UsePAM yes AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} diff --git a/nixpkgs/nixos/modules/services/networking/strongswan.nix b/nixpkgs/nixos/modules/services/networking/strongswan.nix index 707d24b9220f..41b69039ba7a 100644 --- a/nixpkgs/nixos/modules/services/networking/strongswan.nix +++ b/nixpkgs/nixos/modules/services/networking/strongswan.nix @@ -54,7 +54,7 @@ in enable = mkEnableOption "strongSwan"; secrets = mkOption { - type = types.listOf types.path; + type = types.listOf types.str; default = []; example = [ "/run/keys/ipsec-foo.secret" ]; description = '' diff --git a/nixpkgs/nixos/modules/services/networking/supplicant.nix b/nixpkgs/nixos/modules/services/networking/supplicant.nix index 3c4321ab9e9d..35c1e649e2e1 100644 --- a/nixpkgs/nixos/modules/services/networking/supplicant.nix +++ b/nixpkgs/nixos/modules/services/networking/supplicant.nix @@ -132,7 +132,7 @@ in extraCmdArgs = mkOption { type = types.str; default = ""; - example = "-e/var/run/wpa_supplicant/entropy.bin"; + example = "-e/run/wpa_supplicant/entropy.bin"; description = "Command line arguments to add when executing <literal>wpa_supplicant</literal>."; }; @@ -164,7 +164,7 @@ in socketDir = mkOption { type = types.str; - default = "/var/run/wpa_supplicant"; + default = "/run/wpa_supplicant"; description = "Directory of sockets for controlling wpa_supplicant."; }; diff --git a/nixpkgs/nixos/modules/services/networking/tox-node.nix b/nixpkgs/nixos/modules/services/networking/tox-node.nix new file mode 100644 index 000000000000..c24e7fd12850 --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/tox-node.nix @@ -0,0 +1,95 @@ +{ lib, pkgs, config, ... }: + +with lib; + +let + pkg = pkgs.tox-node; + cfg = config.services.tox-node; + homeDir = "/var/lib/tox-node"; + + configFile = let + # fetchurl should be switched to getting this file from tox-node.src once + # the dpkg directory is in a release + src = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/tox-rs/tox-node/master/dpkg/config.yml"; + sha256 = "1431wzpzm786mcvyzk1rp7ar418n45dr75hdggxvlm7pkpam31xa"; + }; + confJSON = pkgs.writeText "config.json" ( + builtins.toJSON { + log-type = cfg.logType; + keys-file = cfg.keysFile; + udp-address = cfg.udpAddress; + tcp-addresses = cfg.tcpAddresses; + tcp-connections-limit = cfg.tcpConnectionLimit; + lan-discovery = cfg.lanDiscovery; + threads = cfg.threads; + motd = cfg.motd; + } + ); + in with pkgs; runCommand "config.yml" {} '' + ${remarshal}/bin/remarshal -if yaml -of json ${src} -o src.json + ${jq}/bin/jq -s '(.[0] | with_entries( select(.key == "bootstrap-nodes"))) * .[1]' src.json ${confJSON} > $out + ''; + +in { + options.services.tox-node = { + enable = mkEnableOption "Tox Node service"; + + logType = mkOption { + type = types.enum [ "Stderr" "Stdout" "Syslog" "None" ]; + default = "Stderr"; + description = "Logging implementation."; + }; + keysFile = mkOption { + type = types.str; + default = "${homeDir}/keys"; + description = "Path to the file where DHT keys are stored."; + }; + udpAddress = mkOption { + type = types.str; + default = "0.0.0.0:33445"; + description = "UDP address to run DHT node."; + }; + tcpAddresses = mkOption { + type = types.listOf types.str; + default = [ "0.0.0.0:33445" ]; + description = "TCP addresses to run TCP relay."; + }; + tcpConnectionLimit = mkOption { + type = types.int; + default = 8192; + description = "Maximum number of active TCP connections relay can hold"; + }; + lanDiscovery = mkOption { + type = types.bool; + default = true; + description = "Enable local network discovery."; + }; + threads = mkOption { + type = types.int; + default = 1; + description = "Number of threads for execution"; + }; + motd = mkOption { + type = types.str; + default = "Hi from tox-rs! I'm up {{uptime}}. TCP: incoming {{tcp_packets_in}}, outgoing {{tcp_packets_out}}, UDP: incoming {{udp_packets_in}}, outgoing {{udp_packets_out}}"; + description = "Message of the day"; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.tox-node = { + description = "Tox Node"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${pkg}/bin/tox-node config ${configFile}"; + StateDirectory = "tox-node"; + DynamicUser = true; + Restart = "always"; + }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index cdfe98aa0341..0bd9edf4a41c 100644 --- a/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -6,7 +6,7 @@ let cfg = config.networking.wireless; configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" '' ${optionalString cfg.userControlled.enable '' - ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group} + ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group} update_config=1''} ${cfg.extraConfig} ${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let diff --git a/nixpkgs/nixos/modules/services/networking/xrdp.nix b/nixpkgs/nixos/modules/services/networking/xrdp.nix index cc18f6d0064c..b7dd1c5d99dd 100644 --- a/nixpkgs/nixos/modules/services/networking/xrdp.nix +++ b/nixpkgs/nixos/modules/services/networking/xrdp.nix @@ -17,7 +17,7 @@ let chmod +x $out/startwm.sh substituteInPlace $out/xrdp.ini \ - --replace "#rsakeys_ini=" "rsakeys_ini=/var/run/xrdp/rsakeys.ini" \ + --replace "#rsakeys_ini=" "rsakeys_ini=/run/xrdp/rsakeys.ini" \ --replace "certificate=" "certificate=${cfg.sslCert}" \ --replace "key_file=" "key_file=${cfg.sslKey}" \ --replace LogFile=xrdp.log LogFile=/dev/null \ @@ -132,9 +132,9 @@ in chown root:xrdp ${cfg.sslKey} ${cfg.sslCert} chmod 440 ${cfg.sslKey} ${cfg.sslCert} fi - if [ ! -s /var/run/xrdp/rsakeys.ini ]; then - mkdir -p /var/run/xrdp - ${cfg.package}/bin/xrdp-keygen xrdp /var/run/xrdp/rsakeys.ini + if [ ! -s /run/xrdp/rsakeys.ini ]; then + mkdir -p /run/xrdp + ${cfg.package}/bin/xrdp-keygen xrdp /run/xrdp/rsakeys.ini fi ''; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/networking/znc/default.nix b/nixpkgs/nixos/modules/services/networking/znc/default.nix index bce5b15a19ec..1ad8855b86db 100644 --- a/nixpkgs/nixos/modules/services/networking/znc/default.nix +++ b/nixpkgs/nixos/modules/services/networking/znc/default.nix @@ -151,7 +151,7 @@ in ''; description = '' Configuration for ZNC, see - <literal>https://wiki.znc.in/Configuration</literal> for details. The + <link xlink:href="https://wiki.znc.in/Configuration"/> for details. The Nix value declared here will be translated directly to the xml-like format ZNC expects. This is much more flexible than the legacy options under <option>services.znc.confOptions.*</option>, but also can't do diff --git a/nixpkgs/nixos/modules/services/printing/cupsd.nix b/nixpkgs/nixos/modules/services/printing/cupsd.nix index 854c76cc0a16..9e9bdedff126 100644 --- a/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -74,7 +74,7 @@ let ${concatMapStrings (addr: '' Listen ${addr} '') cfg.listenAddresses} - Listen /var/run/cups/cups.sock + Listen /run/cups/cups.sock SetEnv PATH /var/lib/cups/path/lib/cups/filter:/var/lib/cups/path/bin diff --git a/nixpkgs/nixos/modules/services/scheduling/fcron.nix b/nixpkgs/nixos/modules/services/scheduling/fcron.nix index ae3828977753..f77b3bcd5921 100644 --- a/nixpkgs/nixos/modules/services/scheduling/fcron.nix +++ b/nixpkgs/nixos/modules/services/scheduling/fcron.nix @@ -100,8 +100,8 @@ in in pkgs.writeText "fcron.conf" '' fcrontabs = /var/spool/fcron - pidfile = /var/run/fcron.pid - fifofile = /var/run/fcron.fifo + pidfile = /run/fcron.pid + fifofile = /run/fcron.fifo fcronallow = /etc/fcron.allow fcrondeny = /etc/fcron.deny shell = /bin/sh diff --git a/nixpkgs/nixos/modules/services/search/kibana.nix b/nixpkgs/nixos/modules/services/search/kibana.nix index 3539b3ddb4f1..ba58630a467a 100644 --- a/nixpkgs/nixos/modules/services/search/kibana.nix +++ b/nixpkgs/nixos/modules/services/search/kibana.nix @@ -5,6 +5,9 @@ with lib; let cfg = config.services.kibana; + ge7 = builtins.compareVersions cfg.package.version "7" >= 0; + lt6_6 = builtins.compareVersions cfg.package.version "6.6" < 0; + cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( (filterAttrsRecursive (n: v: v != null) ({ server.host = cfg.listenAddress; @@ -16,6 +19,7 @@ let kibana.defaultAppId = cfg.defaultAppId; elasticsearch.url = cfg.elasticsearch.url; + elasticsearch.hosts = cfg.elasticsearch.hosts; elasticsearch.username = cfg.elasticsearch.username; elasticsearch.password = cfg.elasticsearch.password; @@ -67,9 +71,30 @@ in { elasticsearch = { url = mkOption { - description = "Elasticsearch url"; - default = "http://localhost:9200"; - type = types.str; + description = '' + Elasticsearch url. + + Defaults to <literal>"http://localhost:9200"</literal>. + + Don't set this when using Kibana >= 7.0.0 because it will result in a + configuration error. Use <option>services.kibana.elasticsearch.hosts</option> + instead. + ''; + default = null; + type = types.nullOr types.str; + }; + + hosts = mkOption { + description = '' + The URLs of the Elasticsearch instances to use for all your queries. + All nodes listed here must be on the same cluster. + + Defaults to <literal>[ "http://localhost:9200" ]</literal>. + + This option is only valid when using kibana >= 6.6. + ''; + default = null; + type = types.nullOr (types.listOf types.str); }; username = mkOption { @@ -143,6 +168,19 @@ in { }; config = mkIf (cfg.enable) { + assertions = [ + { + assertion = ge7 -> cfg.elasticsearch.url == null; + message = + "The option services.kibana.elasticsearch.url has been removed when using kibana >= 7.0.0. " + + "Please use option services.kibana.elasticsearch.hosts instead."; + } + { + assertion = lt6_6 -> cfg.elasticsearch.hosts == null; + message = + "The option services.kibana.elasticsearch.hosts is only valid for kibana >= 6.6."; + } + ]; systemd.services.kibana = { description = "Kibana Service"; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/search/solr.nix b/nixpkgs/nixos/modules/services/search/solr.nix index 7200c40e89f7..6659cc8a2d1e 100644 --- a/nixpkgs/nixos/modules/services/search/solr.nix +++ b/nixpkgs/nixos/modules/services/search/solr.nix @@ -13,11 +13,19 @@ in services.solr = { enable = mkEnableOption "Enables the solr service."; + # default to the 8.x series not forcing major version upgrade of those on the 7.x series package = mkOption { type = types.package; - default = pkgs.solr; + default = if versionAtLeast config.system.stateVersion "19.09" + then pkgs.solr_8 + else pkgs.solr_7 + ; defaultText = "pkgs.solr"; - description = "Which Solr package to use."; + description = '' + Which Solr package to use. This defaults to version 7.x if + <literal>system.stateVersion < 19.09</literal> and version 8.x + otherwise. + ''; }; port = mkOption { diff --git a/nixpkgs/nixos/modules/services/security/hologram-agent.nix b/nixpkgs/nixos/modules/services/security/hologram-agent.nix index 39ed506f7617..a5087b0a99b4 100644 --- a/nixpkgs/nixos/modules/services/security/hologram-agent.nix +++ b/nixpkgs/nixos/modules/services/security/hologram-agent.nix @@ -45,7 +45,7 @@ in { wantedBy = [ "multi-user.target" ]; requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; preStart = '' - /run/current-system/sw/bin/rm -fv /var/run/hologram.sock + /run/current-system/sw/bin/rm -fv /run/hologram.sock ''; serviceConfig = { ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; diff --git a/nixpkgs/nixos/modules/services/web-apps/codimd.nix b/nixpkgs/nixos/modules/services/web-apps/codimd.nix index 56e1de17e3c3..ee2fc2b9d857 100644 --- a/nixpkgs/nixos/modules/services/web-apps/codimd.nix +++ b/nixpkgs/nixos/modules/services/web-apps/codimd.nix @@ -67,7 +67,7 @@ in path = mkOption { type = types.nullOr types.str; default = null; - example = "/var/run/codimd.sock"; + example = "/run/codimd.sock"; description = '' Specify where a UNIX domain socket should be placed. ''; diff --git a/nixpkgs/nixos/modules/services/web-apps/documize.nix b/nixpkgs/nixos/modules/services/web-apps/documize.nix new file mode 100644 index 000000000000..206617b0e5ac --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/documize.nix @@ -0,0 +1,67 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + + cfg = config.services.documize; + +in + + { + options.services.documize = { + enable = mkEnableOption "Documize Wiki"; + + offline = mkEnableOption "Documize offline mode"; + + package = mkOption { + default = pkgs.documize-community; + type = types.package; + description = '' + Which package to use for documize. + ''; + }; + + db = mkOption { + type = types.str; + example = "host=localhost port=5432 sslmode=disable user=admin password=secret dbname=documize"; + description = '' + The DB connection string to use for the database. + ''; + }; + + dbtype = mkOption { + type = types.enum [ "postgresql" "percona" "mariadb" "mysql" ]; + description = '' + Which database to use for storage. + ''; + }; + + port = mkOption { + type = types.port; + example = 3000; + description = '' + Which TCP port to serve. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.documize-server = { + wantedBy = [ "multi-user.target" ]; + + script = '' + ${cfg.package}/bin/documize \ + -db "${cfg.db}" \ + -dbtype ${cfg.dbtype} \ + -port ${toString cfg.port} \ + -offline ${if cfg.offline then "1" else "0"} + ''; + + serviceConfig = { + Restart = "always"; + DynamicUser = "yes"; + }; + }; + }; + } diff --git a/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/nixpkgs/nixos/modules/services/web-apps/miniflux.nix new file mode 100644 index 000000000000..1d60004e574d --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -0,0 +1,97 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.miniflux; + + dbUser = "miniflux"; + dbPassword = "miniflux"; + dbHost = "localhost"; + dbName = "miniflux"; + + defaultCredentials = pkgs.writeText "miniflux-admin-credentials" '' + ADMIN_USERNAME=admin + ADMIN_PASSWORD=password + ''; + + pgsu = "${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser}"; + pgbin = "${config.services.postgresql.package}/bin"; + preStart = pkgs.writeScript "miniflux-pre-start" '' + #!${pkgs.runtimeShell} + db_exists() { + [ "$(${pgsu} ${pgbin}/psql -Atc "select 1 from pg_database where datname='$1'")" == "1" ] + } + if ! db_exists "${dbName}"; then + ${pgsu} ${pgbin}/psql postgres -c "CREATE ROLE ${dbUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${dbPassword}'" + ${pgsu} ${pgbin}/createdb --owner "${dbUser}" "${dbName}" + ${pgsu} ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" + fi + ''; +in + +{ + options = { + services.miniflux = { + enable = mkEnableOption "miniflux"; + + config = mkOption { + type = types.attrsOf types.str; + example = literalExample '' + { + CLEANUP_FREQUENCY = "48"; + LISTEN_ADDR = "localhost:8080"; + } + ''; + description = '' + Configuration for Miniflux, refer to + <link xlink:href="http://docs.miniflux.app/en/latest/configuration.html"/> + for documentation on the supported values. + ''; + }; + + adminCredentialsFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing the ADMIN_USERNAME, default is "admin", and + ADMIN_PASSWORD (length >= 6), default is "password"; in the format of + an EnvironmentFile=, as described by systemd.exec(5). + ''; + example = "/etc/nixos/miniflux-admin-credentials"; + }; + }; + }; + + config = mkIf cfg.enable { + + services.miniflux.config = { + LISTEN_ADDR = mkDefault "localhost:8080"; + DATABASE_URL = "postgresql://${dbUser}:${dbPassword}@${dbHost}/${dbName}?sslmode=disable"; + RUN_MIGRATIONS = "1"; + CREATE_ADMIN = "1"; + }; + + services.postgresql.enable = true; + + systemd.services.miniflux = { + description = "Miniflux service"; + wantedBy = [ "multi-user.target" ]; + requires = [ "postgresql.service" ]; + after = [ "network.target" "postgresql.service" ]; + + serviceConfig = { + ExecStart = "${pkgs.miniflux}/bin/miniflux"; + ExecStartPre = "+${preStart}"; + DynamicUser = true; + RuntimeDirectory = "miniflux"; + RuntimeDirectoryMode = "0700"; + EnvironmentFile = if isNull cfg.adminCredentialsFile + then defaultCredentials + else cfg.adminCredentialsFile; + }; + + environment = cfg.config; + }; + environment.systemPackages = [ pkgs.miniflux ]; + }; +} diff --git a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index eedcccac723c..d0e45e1c12a5 100644 --- a/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -32,7 +32,7 @@ let cd ${pkgs.nextcloud} exec /run/wrappers/bin/sudo -u nextcloud \ NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" \ - ${config.services.phpfpm.phpPackage}/bin/php \ + ${phpPackage}/bin/php \ -c ${pkgs.writeText "php.ini" phpOptionsStr}\ occ $* ''; @@ -360,7 +360,7 @@ in { environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; - serviceConfig.ExecStart = "${pkgs.php}/bin/php -f ${pkgs.nextcloud}/cron.php"; + serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php"; }; }; diff --git a/nixpkgs/nixos/modules/services/web-apps/restya-board.nix b/nixpkgs/nixos/modules/services/web-apps/restya-board.nix index b064eae248ed..15fd943a0826 100644 --- a/nixpkgs/nixos/modules/services/web-apps/restya-board.nix +++ b/nixpkgs/nixos/modules/services/web-apps/restya-board.nix @@ -13,7 +13,7 @@ let runDir = "/run/restya-board"; poolName = "restya-board"; - phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; + phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; in diff --git a/nixpkgs/nixos/modules/services/web-apps/selfoss.nix b/nixpkgs/nixos/modules/services/web-apps/selfoss.nix index 7b0ce8a8d03f..cd0f743a5fb8 100644 --- a/nixpkgs/nixos/modules/services/web-apps/selfoss.nix +++ b/nixpkgs/nixos/modules/services/web-apps/selfoss.nix @@ -4,7 +4,7 @@ let cfg = config.services.selfoss; poolName = "selfoss_pool"; - phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; + phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; dataDir = "/var/lib/selfoss"; diff --git a/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix b/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix index f7a3daa5fdd5..08297c7275a4 100644 --- a/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix @@ -15,7 +15,7 @@ let else cfg.database.port; poolName = "tt-rss"; - phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; + phpfpmSocketName = "/run/phpfpm/${poolName}.sock"; tt-rss-config = pkgs.writeText "config.php" '' <?php diff --git a/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix index 1eac5be2f8d3..8f00f81b078c 100644 --- a/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -705,10 +705,7 @@ in path = [ httpd pkgs.coreutils pkgs.gnugrep ] - ++ # Needed for PHP's mail() function. !!! Probably the - # ssmtp module should export the path to sendmail in - # some way. - optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp + ++ optional enablePHP pkgs.system-sendmail # Needed for PHP's mail() function. ++ concatMap (svc: svc.extraServerPath) allSubservices; environment = diff --git a/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix b/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix index 4e7082c67690..f9b1a8b6ccce 100644 --- a/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix +++ b/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix @@ -22,7 +22,7 @@ in { User: root # If available, "nobody" is much more secure for Group:. Group: root - Pid_File: /var/run/mighty.pid + Pid_File: /run/mighty.pid Logging: Yes # Yes or No Log_File: /var/log/mighty # The directory must be writable by User: Log_File_Size: 16777216 # bytes diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix index ea01749349de..3d748d4308b7 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -126,8 +126,10 @@ in { services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; + services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; services.gnome3.file-roller.enable = mkDefault true; + services.gnome3.glib-networking.enable = true; services.gnome3.gnome-disks.enable = mkDefault true; services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-keyring.enable = true; @@ -160,7 +162,11 @@ in { # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; + fonts.fonts = [ + pkgs.dejavu_fonts pkgs.cantarell-fonts + pkgs.source-sans-pro + pkgs.source-code-pro # Default monospace font in 3.32 + ]; services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ] ++ map @@ -200,7 +206,6 @@ in { services.xserver.updateDbusEnvironment = true; environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" - "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath ++ (pkgs.gnome3.removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix index 3ce49b9d2bf8..65a7b9c628e5 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -20,7 +20,7 @@ in services.xserver.desktopManager.session = [{ name = "kodi"; start = '' - ${pkgs.kodi}/bin/kodi --lircdev /var/run/lirc/lircd --standalone & + ${pkgs.kodi}/bin/kodi --lircdev /run/lirc/lircd --standalone & waitPID=$! ''; }]; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index d0278271409a..e1eeb32aa1a0 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -73,8 +73,14 @@ in # Ensure lightdm is used when Pantheon is enabled # Without it screen locking will be nonfunctional because of the use of lightlocker + + warnings = optional (config.services.xserver.displayManager.lightdm.enable != true) + '' + Using Pantheon without LightDM as a displayManager will break screenlocking from the UI. + ''; + services.xserver.displayManager.lightdm.enable = mkDefault true; - services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true; + services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true; # If not set manually Pantheon session cannot be started # Known issue of https://github.com/NixOS/nixpkgs/pull/43992 @@ -116,9 +122,11 @@ in # pantheon has pantheon-agent-geoclue2 services.geoclue2.enableDemoAgent = false; services.gnome3.at-spi2-core.enable = true; + services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; services.gnome3.file-roller.enable = mkDefault true; # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully + services.gnome3.glib-networking.enable = true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-settings-daemon.package = pkgs.pantheon.elementary-settings-daemon; @@ -146,7 +154,6 @@ in environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules" - "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; @@ -162,7 +169,6 @@ in gnome3.geary gnome3.epiphany gnome3.gnome-font-viewer - evince ] ++ pantheon.apps) config.environment.pantheon.excludePackages) ++ (with pkgs; [ diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 226fee7491c1..3edf7c8d9cab 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -208,76 +208,25 @@ in session optional pam_permit.so ''; - gdm.text = '' - auth requisite pam_nologin.so - auth required pam_env.so envfile=${config.system.build.pamEnvironment} - - auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so - auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth - ${optionalString config.security.pam.enableEcryptfs - "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} - - ${optionalString (! config.security.pam.enableEcryptfs) - "auth required pam_deny.so"} - - account sufficient pam_unix.so - - password requisite pam_unix.so nullok sha512 - ${optionalString config.security.pam.enableEcryptfs - "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - - session required pam_env.so envfile=${config.system.build.pamEnvironment} - session required pam_unix.so - ${optionalString config.security.pam.enableEcryptfs - "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - session required pam_loginuid.so - session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start - ''; - gdm-password.text = '' - auth requisite pam_nologin.so - auth required pam_env.so envfile=${config.system.build.pamEnvironment} - - auth required pam_succeed_if.so uid >= 1000 quiet - auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so - auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth - ${optionalString config.security.pam.enableEcryptfs - "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} - ${optionalString (! config.security.pam.enableEcryptfs) - "auth required pam_deny.so"} - - account sufficient pam_unix.so - - password requisite pam_unix.so nullok sha512 - ${optionalString config.security.pam.enableEcryptfs - "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - - session required pam_env.so envfile=${config.system.build.pamEnvironment} - session required pam_unix.so - ${optionalString config.security.pam.enableEcryptfs - "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - session required pam_loginuid.so - session optional ${pkgs.systemd}/lib/security/pam_systemd.so - session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start + auth substack login + account include login + password substack login + session include login ''; gdm-autologin.text = '' - auth requisite pam_nologin.so + auth requisite pam_nologin.so - auth required pam_succeed_if.so uid >= 1000 quiet - auth required pam_permit.so + auth required pam_succeed_if.so uid >= 1000 quiet + auth required pam_permit.so - account sufficient pam_unix.so + account sufficient pam_unix.so - password requisite pam_unix.so nullok sha512 + password requisite pam_unix.so nullok sha512 - session optional pam_keyinit.so revoke - session required pam_env.so envfile=${config.system.build.pamEnvironment} - session required pam_unix.so - session required pam_loginuid.so - session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional pam_keyinit.so revoke + session include login ''; }; diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 05011b999f2b..bfba174144a1 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -33,6 +33,13 @@ in config = mkIf (ldmcfg.enable && cfg.enable) { + warnings = [ + '' + The Pantheon greeter is suboptimal in NixOS and can possibly put you in + a situation where you cannot start a session when switching desktopManagers. + '' + ]; + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; services.xserver.displayManager.lightdm.greeter = mkDefault { diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix b/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix index a4b57cfdab64..40a1680da537 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix @@ -221,7 +221,7 @@ in services.xserver.displayManager.job.execCmd = '' ${optionalString (cfg.pulseaudio) - "export PULSE_COOKIE=/var/run/pulse/.config/pulse/cookie"} + "export PULSE_COOKIE=/run/pulse/.config/pulse/cookie"} exec ${pkgs.xpra}/bin/xpra start \ --daemon=off \ --log-dir=/var/log \ @@ -233,7 +233,7 @@ in --mdns=no \ --pulseaudio=no \ ${optionalString (cfg.pulseaudio) "--sound-source=pulse"} \ - --socket-dirs=/var/run/xpra \ + --socket-dirs=/run/xpra \ --xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \ ${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \ --auth=${cfg.auth} \ diff --git a/nixpkgs/nixos/modules/system/boot/kernel.nix b/nixpkgs/nixos/modules/system/boot/kernel.nix index 8ea05ed14687..ab919099d112 100644 --- a/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -5,7 +5,7 @@ with lib; let inherit (config.boot) kernelPatches; - inherit (config.boot.kernel) features; + inherit (config.boot.kernel) features randstructSeed; inherit (config.boot.kernelPackages) kernel; kernelModulesConf = pkgs.writeText "nixos.conf" @@ -38,6 +38,7 @@ in default = pkgs.linuxPackages; apply = kernelPackages: kernelPackages.extend (self: super: { kernel = super.kernel.override { + inherit randstructSeed; kernelPatches = super.kernel.kernelPatches ++ kernelPatches; features = lib.recursiveUpdate super.kernel.features features; }; @@ -67,6 +68,19 @@ in description = "A list of additional patches to apply to the kernel."; }; + boot.kernel.randstructSeed = mkOption { + type = types.str; + default = ""; + example = "my secret seed"; + description = '' + Provides a custom seed for the <varname>RANDSTRUCT</varname> security + option of the Linux kernel. Note that <varname>RANDSTRUCT</varname> is + only enabled in NixOS hardened kernels. Using a custom seed requires + building the kernel and dependent packages locally, since this + customization happens at build time. + ''; + }; + boot.kernelParams = mkOption { type = types.listOf types.str; default = [ ]; @@ -298,7 +312,7 @@ in # !!! Should this really be needed? (isYes "MODULES") (isYes "BINFMT_ELF") - ]; + ] ++ (optional (randstructSeed != "") (isYes "GCC_PLUGIN_RANDSTRUCT")); # nixpkgs kernels are assumed to have all required features assertions = if config.boot.kernelPackages.kernel ? features then [] else diff --git a/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index d3cf8b29bb46..99aa7759c954 100644 --- a/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -61,7 +61,7 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber extraEntriesBeforeNixOS extraPrepareConfig extraInitrd configurationLimit copyKernels - default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; + default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios gfxpayloadEfi gfxpayloadBios; path = with pkgs; makeBinPath ( [ coreutils gnused gnugrep findutils diffutils btrfs-progs utillinux mdadm ] ++ optional (cfg.efiSupport && (cfg.version == 2)) efibootmgr @@ -393,6 +393,24 @@ in ''; }; + gfxpayloadEfi = mkOption { + default = "keep"; + example = "text"; + type = types.str; + description = '' + The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI. + ''; + }; + + gfxpayloadBios = mkOption { + default = "text"; + example = "keep"; + type = types.str; + description = '' + The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS. + ''; + }; + configurationLimit = mkOption { default = 100; example = 120; diff --git a/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl index bda6a3136407..a36b3c180eb4 100644 --- a/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -67,6 +67,8 @@ my $efiInstallAsRemovable = get("efiInstallAsRemovable"); my $efiSysMountPoint = get("efiSysMountPoint"); my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeBios = get("gfxmodeBios"); +my $gfxpayloadEfi = get("gfxpayloadEfi"); +my $gfxpayloadBios = get("gfxpayloadBios"); my $bootloaderId = get("bootloaderId"); my $forceInstall = get("forceInstall"); my $font = get("font"); @@ -293,10 +295,10 @@ else { insmod gfxterm if [ \"\${grub_platform}\" = \"efi\" ]; then set gfxmode=$gfxmodeEfi - set gfxpayload=keep + set gfxpayload=$gfxpayloadEfi else set gfxmode=$gfxmodeBios - set gfxpayload=text + set gfxpayload=$gfxpayloadBios fi terminal_output gfxterm fi diff --git a/nixpkgs/nixos/modules/system/boot/stage-1.nix b/nixpkgs/nixos/modules/system/boot/stage-1.nix index 9984a97bbdd2..8702abd3df83 100644 --- a/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -11,7 +11,9 @@ let udev = config.systemd.package; - modulesTree = config.system.modulesTree; + kernel-name = config.boot.kernelPackages.kernel.name or "kernel"; + + modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; }; firmware = config.hardware.firmware; @@ -290,6 +292,7 @@ let # The closure of the init script of boot stage 1 is what we put in # the initial RAM disk. initialRamdisk = pkgs.makeInitrd { + name = "initrd-${kernel-name}"; inherit (config.boot.initrd) compressor prepend; contents = diff --git a/nixpkgs/nixos/modules/virtualisation/docker.nix b/nixpkgs/nixos/modules/virtualisation/docker.nix index 4ee84c5268e6..ba04dfd57942 100644 --- a/nixpkgs/nixos/modules/virtualisation/docker.nix +++ b/nixpkgs/nixos/modules/virtualisation/docker.nix @@ -31,7 +31,7 @@ in listenOptions = mkOption { type = types.listOf types.str; - default = ["/var/run/docker.sock"]; + default = ["/run/docker.sock"]; description = '' A list of unix and tcp docker should listen to. The format follows diff --git a/nixpkgs/nixos/modules/virtualisation/openvswitch.nix b/nixpkgs/nixos/modules/virtualisation/openvswitch.nix index bb8b9172f23f..47e07e7432cb 100644 --- a/nixpkgs/nixos/modules/virtualisation/openvswitch.nix +++ b/nixpkgs/nixos/modules/virtualisation/openvswitch.nix @@ -49,7 +49,7 @@ in { config = mkIf cfg.enable (let # Where the communication sockets live - runDir = "/var/run/openvswitch"; + runDir = "/run/openvswitch"; # The path to the an initialized version of the database db = pkgs.stdenv.mkDerivation { @@ -99,13 +99,13 @@ in { --certificate=db:Open_vSwitch,SSL,certificate \ --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ --unixctl=ovsdb.ctl.sock \ - --pidfile=/var/run/openvswitch/ovsdb.pid \ + --pidfile=/run/openvswitch/ovsdb.pid \ --detach \ /var/db/openvswitch/conf.db ''; Restart = "always"; RestartSec = 3; - PIDFile = "/var/run/openvswitch/ovsdb.pid"; + PIDFile = "/run/openvswitch/ovsdb.pid"; # Use service type 'forking' to correctly determine when ovsdb-server is ready. Type = "forking"; }; @@ -123,10 +123,10 @@ in { serviceConfig = { ExecStart = '' ${cfg.package}/bin/ovs-vswitchd \ - --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ + --pidfile=/run/openvswitch/ovs-vswitchd.pid \ --detach ''; - PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; + PIDFile = "/run/openvswitch/ovs-vswitchd.pid"; # Use service type 'forking' to correctly determine when vswitchd is ready. Type = "forking"; }; @@ -152,11 +152,11 @@ in { ExecStart = '' ${cfg.package}/bin/ovs-monitor-ipsec \ --root-prefix ${runDir}/ipsec \ - --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ + --pidfile /run/openvswitch/ovs-monitor-ipsec.pid \ --monitor --detach \ - unix:/var/run/openvswitch/db.sock + unix:/run/openvswitch/db.sock ''; - PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; + PIDFile = "/run/openvswitch/ovs-monitor-ipsec.pid"; # Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready. Type = "forking"; }; @@ -167,7 +167,7 @@ in { ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey ln -fs ${pkgs.writeScript "racoon-restart" '' #!${pkgs.runtimeShell} - /var/run/current-system/sw/bin/systemctl $1 racoon + /run/current-system/sw/bin/systemctl $1 racoon ''} ${runDir}/ipsec/etc/init.d/racoon ''; }; diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index b366f019f6e0..8b27ff808e6b 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -65,6 +65,7 @@ in docker-registry = handleTest ./docker-registry.nix {}; docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {}; docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; + documize = handleTest ./documize.nix {}; dovecot = handleTest ./dovecot.nix {}; # ec2-config doesn't work in a sandbox as the simulated ec2 instance needs network access #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; @@ -137,6 +138,7 @@ in matrix-synapse = handleTest ./matrix-synapse.nix {}; memcached = handleTest ./memcached.nix {}; mesos = handleTest ./mesos.nix {}; + miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; misc = handleTest ./misc.nix {}; mongodb = handleTest ./mongodb.nix {}; @@ -193,6 +195,7 @@ in predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing = handleTest ./printing.nix {}; prometheus = handleTest ./prometheus.nix {}; + prometheus2 = handleTest ./prometheus-2.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./prosody.nix {}; proxy = handleTest ./proxy.nix {}; diff --git a/nixpkgs/nixos/tests/common/letsencrypt/default.nix b/nixpkgs/nixos/tests/common/letsencrypt/default.nix index 73aac51a0126..8fe59bf4e70c 100644 --- a/nixpkgs/nixos/tests/common/letsencrypt/default.nix +++ b/nixpkgs/nixos/tests/common/letsencrypt/default.nix @@ -381,7 +381,7 @@ in { enableACME = false; sslCertificate = siteCertFile; sslCertificateKey = siteKeyFile; - locations.${tosPath}.extraConfig = "alias ${tosFile};"; + locations."= ${tosPath}".alias = tosFile; }; systemd.services = { diff --git a/nixpkgs/nixos/tests/documize.nix b/nixpkgs/nixos/tests/documize.nix new file mode 100644 index 000000000000..8b852a4f7795 --- /dev/null +++ b/nixpkgs/nixos/tests/documize.nix @@ -0,0 +1,58 @@ +import ./make-test.nix ({ pkgs, lib, ...} : { + name = "documize"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.jq ]; + + services.documize = { + enable = true; + port = 3000; + dbtype = "postgresql"; + db = "host=localhost port=5432 sslmode=disable user=documize password=documize dbname=documize"; + }; + + systemd.services.documize-server = { + after = [ "postgresql.service" ]; + requires = [ "postgresql.service" ]; + }; + + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "psql-init" '' + CREATE ROLE documize WITH LOGIN PASSWORD 'documize'; + CREATE DATABASE documize WITH OWNER documize; + ''; + }; + }; + + testScript = '' + startAll; + + $machine->waitForUnit("documize-server.service"); + $machine->waitForOpenPort(3000); + + my $dbhash = $machine->succeed("curl -f localhost:3000 " + . " | grep 'property=\"dbhash' " + . " | grep -Po 'content=\"\\K[^\"]*'" + ); + + chomp($dbhash); + + $machine->succeed("curl -X POST " + . "--data 'dbname=documize' " + . "--data 'dbhash=$dbhash' " + . "--data 'title=NixOS' " + . "--data 'message=Docs' " + . "--data 'firstname=John' " + . "--data 'lastname=Doe' " + . "--data 'email=john.doe\@nixos.org' " + . "--data 'password=verysafe' " + . "-f localhost:3000/api/setup" + ); + + $machine->succeed('test "$(curl -f localhost:3000/api/public/meta | jq ".title" | xargs echo)" = "NixOS"'); + ''; +}) diff --git a/nixpkgs/nixos/tests/elk.nix b/nixpkgs/nixos/tests/elk.nix index e7ae023f3ff2..3b3fbd73dd5f 100644 --- a/nixpkgs/nixos/tests/elk.nix +++ b/nixpkgs/nixos/tests/elk.nix @@ -2,6 +2,8 @@ config ? {}, pkgs ? import ../.. { inherit system config; }, enableUnfree ? false + # To run the test on the unfree ELK use the folllowing command: + # NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true }: with import ../lib/testing.nix { inherit system pkgs; }; @@ -10,7 +12,9 @@ with pkgs.lib; let esUrl = "http://localhost:9200"; - mkElkTest = name : elk : makeTest { + mkElkTest = name : elk : + let elasticsearchGe7 = builtins.compareVersions elk.elasticsearch.version "7" >= 0; + in makeTest { inherit name; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco offline basvandijk ]; @@ -67,11 +71,11 @@ let kibana = { enable = true; package = elk.kibana; - elasticsearch.url = esUrl; }; elasticsearch-curator = { - enable = true; + # The current version of curator (5.6) doesn't support elasticsearch >= 7.0.0. + enable = !elasticsearchGe7; actionYAML = '' --- actions: @@ -124,7 +128,7 @@ let # See if logstash messages arive in elasticsearch. $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); - + '' + optionalString (!elasticsearchGe7) '' # Test elasticsearch-curator. $one->systemctl("stop logstash"); $one->systemctl("start elasticsearch-curator"); @@ -149,4 +153,16 @@ in mapAttrs mkElkTest { logstash = pkgs.logstash6-oss; kibana = pkgs.kibana6-oss; }; + "ELK-7" = + if enableUnfree + then { + elasticsearch = pkgs.elasticsearch7; + logstash = pkgs.logstash7; + kibana = pkgs.kibana7; + } + else { + elasticsearch = pkgs.elasticsearch7-oss; + logstash = pkgs.logstash7-oss; + kibana = pkgs.kibana7-oss; + }; } diff --git a/nixpkgs/nixos/tests/miniflux.nix b/nixpkgs/nixos/tests/miniflux.nix new file mode 100644 index 000000000000..19ab4803a1d3 --- /dev/null +++ b/nixpkgs/nixos/tests/miniflux.nix @@ -0,0 +1,52 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +let + port = 3142; + username = "alice"; + password = "correcthorsebatterystaple"; + defaultPort = 8080; + defaultUsername = "admin"; + defaultPassword = "password"; +in +with lib; +{ + name = "miniflux"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bricewge ]; + + nodes = { + default = + { ... }: + { + services.miniflux.enable = true; + }; + + customized = + { ... }: + { + services.miniflux = { + enable = true; + config = { + CLEANUP_FREQUENCY = "48"; + LISTEN_ADDR = "localhost:${toString port}"; + }; + adminCredentialsFile = pkgs.writeText "admin-credentials" '' + ADMIN_USERNAME=${username} + ADMIN_PASSWORD=${password} + ''; + }; + }; + }; + testScript = '' + startAll; + + $default->waitForUnit('miniflux.service'); + $default->waitForOpenPort(${toString defaultPort}); + $default->succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep -q OK"); + $default->succeed("curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep -q '\"is_admin\":true'"); + + $customized->waitForUnit('miniflux.service'); + $customized->waitForOpenPort(${toString port}); + $customized->succeed("curl --fail 'http://localhost:${toString port}/healthcheck' | grep -q OK"); + $customized->succeed("curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep -q '\"is_admin\":true'"); + ''; +}) diff --git a/nixpkgs/nixos/tests/nghttpx.nix b/nixpkgs/nixos/tests/nghttpx.nix index 433562b97191..d41fa01aa9a8 100644 --- a/nixpkgs/nixos/tests/nghttpx.nix +++ b/nixpkgs/nixos/tests/nghttpx.nix @@ -1,5 +1,5 @@ let - nginxRoot = "/var/run/nginx"; + nginxRoot = "/run/nginx"; in import ./make-test.nix ({...}: { name = "nghttpx"; diff --git a/nixpkgs/nixos/tests/nginx.nix b/nixpkgs/nixos/tests/nginx.nix index 32b113649237..a4d14986a146 100644 --- a/nixpkgs/nixos/tests/nginx.nix +++ b/nixpkgs/nixos/tests/nginx.nix @@ -28,6 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.nginx.virtualHosts."0.my.test" = { extraConfig = '' access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat; + location /favicon.ico { allow all; access_log off; log_not_found off; } ''; }; }; diff --git a/nixpkgs/nixos/tests/osquery.nix b/nixpkgs/nixos/tests/osquery.nix index 281dbcff6643..d95871ffafc6 100644 --- a/nixpkgs/nixos/tests/osquery.nix +++ b/nixpkgs/nixos/tests/osquery.nix @@ -11,7 +11,7 @@ with lib; machine = { services.osquery.enable = true; services.osquery.loggerPath = "/var/log/osquery/logs"; - services.osquery.pidfile = "/var/run/osqueryd.pid"; + services.osquery.pidfile = "/run/osqueryd.pid"; }; testScript = '' @@ -23,6 +23,6 @@ with lib; "echo 'SELECT value FROM osquery_flags WHERE name = \"logger_path\";' | osqueryi | grep /var/log/osquery/logs" ); - $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /var/run/osqueryd.pid"); + $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /run/osqueryd.pid"); ''; }) diff --git a/nixpkgs/nixos/tests/printing.nix b/nixpkgs/nixos/tests/printing.nix index f009a7c706ee..e8702c1ffbf1 100644 --- a/nixpkgs/nixos/tests/printing.nix +++ b/nixpkgs/nixos/tests/printing.nix @@ -42,7 +42,7 @@ import ./make-test.nix ({pkgs, ... }: { # check local encrypted connections work without error $client->succeed("lpstat -E -r") =~ /scheduler is running/ or die; # Test that UNIX socket is used for connections. - $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; + $client->succeed("lpstat -H") =~ "/run/cups/cups.sock" or die; # Test that HTTP server is available too. $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); diff --git a/nixpkgs/nixos/tests/prometheus-2.nix b/nixpkgs/nixos/tests/prometheus-2.nix new file mode 100644 index 000000000000..d7035d49ad4d --- /dev/null +++ b/nixpkgs/nixos/tests/prometheus-2.nix @@ -0,0 +1,67 @@ +import ./make-test.nix { + name = "prometheus-2"; + + nodes = { + one = { pkgs, ... }: { + environment.systemPackages = [ pkgs.jq ]; + services.prometheus2 = { + enable = true; + scrapeConfigs = [ + { + job_name = "prometheus"; + static_configs = [ + { + targets = [ "127.0.0.1:9090" ]; + labels = { instance = "localhost"; }; + } + ]; + } + { + job_name = "pushgateway"; + scrape_interval = "1s"; + static_configs = [ + { + targets = [ "127.0.0.1:9091" ]; + } + ]; + } + ]; + rules = [ + '' + groups: + - name: test + rules: + - record: testrule + expr: count(up{job="prometheus"}) + '' + ]; + }; + services.prometheus.pushgateway = { + enable = true; + persistMetrics = true; + persistence.interval = "1s"; + stateDir = "prometheus-pushgateway"; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("prometheus2.service"); + $one->waitForOpenPort(9090); + $one->succeed("curl -s http://127.0.0.1:9090/metrics"); + + # Let's test if pushing a metric to the pushgateway succeeds + # and whether that metric gets ingested by prometheus. + $one->waitForUnit("pushgateway.service"); + $one->succeed( + "echo 'some_metric 3.14' | " . + "curl --data-binary \@- http://127.0.0.1:9091/metrics/job/some_job"); + $one->waitUntilSucceeds( + "curl -sf 'http://127.0.0.1:9090/api/v1/query?query=some_metric' " . + "| jq '.data.result[0].value[1]' | grep '\"3.14\"'"); + + # Let's test if the pushgateway persists metrics to the configured location. + $one->waitUntilSucceeds("test -e /var/lib/prometheus-pushgateway/metrics"); + ''; +} diff --git a/nixpkgs/nixos/tests/solr.nix b/nixpkgs/nixos/tests/solr.nix index 9ba3863411ea..2108e851bc59 100644 --- a/nixpkgs/nixos/tests/solr.nix +++ b/nixpkgs/nixos/tests/solr.nix @@ -1,47 +1,65 @@ -import ./make-test.nix ({ pkgs, lib, ... }: -{ - name = "solr"; - meta.maintainers = [ lib.maintainers.aanderse ]; +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing.nix { inherit system pkgs; }; +with pkgs.lib; - machine = - { config, pkgs, ... }: - { - # Ensure the virtual machine has enough memory for Solr to avoid the following error: - # - # OpenJDK 64-Bit Server VM warning: - # INFO: os::commit_memory(0x00000000e8000000, 402653184, 0) - # failed; error='Cannot allocate memory' (errno=12) - # - # There is insufficient memory for the Java Runtime Environment to continue. - # Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory. - virtualisation.memorySize = 2000; +let + solrTest = package: makeTest { + machine = + { config, pkgs, ... }: + { + # Ensure the virtual machine has enough memory for Solr to avoid the following error: + # + # OpenJDK 64-Bit Server VM warning: + # INFO: os::commit_memory(0x00000000e8000000, 402653184, 0) + # failed; error='Cannot allocate memory' (errno=12) + # + # There is insufficient memory for the Java Runtime Environment to continue. + # Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory. + virtualisation.memorySize = 2000; - services.solr.enable = true; - }; + services.solr.enable = true; + services.solr.package = package; + }; - testScript = '' - startAll; + testScript = '' + startAll; - $machine->waitForUnit('solr.service'); - $machine->waitForOpenPort('8983'); - $machine->succeed('curl --fail http://localhost:8983/solr/'); + $machine->waitForUnit('solr.service'); + $machine->waitForOpenPort('8983'); + $machine->succeed('curl --fail http://localhost:8983/solr/'); + + # adapted from pkgs.solr/examples/films/README.txt + $machine->succeed('sudo -u solr solr create -c films'); + $machine->succeed(q(curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{ + "add-field" : { + "name":"name", + "type":"text_general", + "multiValued":false, + "stored":true + }, + "add-field" : { + "name":"initial_release_date", + "type":"pdate", + "stored":true + } + }')) =~ /"status":0/ or die; + $machine->succeed('sudo -u solr post -c films ${pkgs.solr}/example/films/films.json'); + $machine->succeed('curl http://localhost:8983/solr/films/query?q=name:batman') =~ /"name":"Batman Begins"/ or die; + ''; + }; +in +{ + solr_7 = solrTest pkgs.solr_7 // { + name = "solr_7"; + meta.maintainers = [ lib.maintainers.aanderse ]; + }; - # adapted from pkgs.solr/examples/films/README.txt - $machine->succeed('sudo -u solr solr create -c films'); - $machine->succeed(q(curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{ - "add-field" : { - "name":"name", - "type":"text_general", - "multiValued":false, - "stored":true - }, - "add-field" : { - "name":"initial_release_date", - "type":"pdate", - "stored":true - } - }')) =~ /"status":0/ or die; - $machine->succeed('sudo -u solr post -c films ${pkgs.solr}/example/films/films.json'); - $machine->succeed('curl http://localhost:8983/solr/films/query?q=name:batman') =~ /"name":"Batman Begins"/ or die; - ''; -}) + solr_8 = solrTest pkgs.solr_8 // { + name = "solr_8"; + meta.maintainers = [ lib.maintainers.aanderse ]; + }; +} diff --git a/nixpkgs/pkgs/applications/altcoins/aeon/default.nix b/nixpkgs/pkgs/applications/altcoins/aeon/default.nix index 42717d3a2667..5a09641c70d1 100644 --- a/nixpkgs/pkgs/applications/altcoins/aeon/default.nix +++ b/nixpkgs/pkgs/applications/altcoins/aeon/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.12.8.0"; + version = "0.12.9.0"; in stdenv.mkDerivation { name = "aeon-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { repo = "aeon"; rev = "v${version}-aeon"; fetchSubmodules = true; - sha256 = "1qmlz820mjs0b60d7i90lxcwwxmsdy6swq67v6n8mbb79zmcx8ii"; + sha256 = "194nxf8c8ihkmdsxyhkhrxc2xiinipifk0ng1rmxiiyr2gjgxzga"; }; nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ]; diff --git a/nixpkgs/pkgs/applications/altcoins/default.nix b/nixpkgs/pkgs/applications/altcoins/default.nix index c7a81b6b11fd..b6a47b2828c3 100644 --- a/nixpkgs/pkgs/applications/altcoins/default.nix +++ b/nixpkgs/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }: +{ callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: rec { @@ -75,6 +75,9 @@ rec { namecoin = callPackage ./namecoin.nix { withGui = true; }; namecoind = callPackage ./namecoin.nix { withGui = false; }; + pivx = libsForQt59.callPackage ./pivx.nix { withGui = true; }; + pivxd = callPackage ./pivx.nix { withGui = false; }; + ethabi = callPackage ./ethabi.nix { }; stellar-core = callPackage ./stellar-core.nix { }; diff --git a/nixpkgs/pkgs/applications/altcoins/ethabi.nix b/nixpkgs/pkgs/applications/altcoins/ethabi.nix index d0bc700eb70f..10cf19ccb39e 100644 --- a/nixpkgs/pkgs/applications/altcoins/ethabi.nix +++ b/nixpkgs/pkgs/applications/altcoins/ethabi.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ethabi-${version}"; - version = "4.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "ethabi"; rev = "v${version}"; - sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p"; + sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4"; }; - cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz"; + cargoSha256 = "0ckj5s5fr7xdqpnn4m9zwa1w71g6wwqqvax6f4xkijxdcx83n6c2"; cargoBuildFlags = ["--features cli"]; diff --git a/nixpkgs/pkgs/applications/altcoins/go-ethereum.nix b/nixpkgs/pkgs/applications/altcoins/go-ethereum.nix index 85dfacb20952..22697af2092f 100644 --- a/nixpkgs/pkgs/applications/altcoins/go-ethereum.nix +++ b/nixpkgs/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.22"; + version = "1.8.26"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "0ag9qxrf7n0qkccaf6v4jaysivpxvsy5zfzar3mcm65223pqy375"; + sha256 = "0i7shrwix5j8l5i0ap5pzhninwyk2kvm1pax27pnnjlpam8577i4"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/altcoins/pivx.nix b/nixpkgs/pkgs/applications/altcoins/pivx.nix new file mode 100644 index 000000000000..995b8deccd95 --- /dev/null +++ b/nixpkgs/pkgs/applications/altcoins/pivx.nix @@ -0,0 +1,54 @@ +{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook +, openssl, db48, boost, zlib, miniupnpc, gmp +, qrencode, glib, protobuf, yasm, libevent +, utillinux, qtbase ? null, qttools ? null +, enableUpnp ? false +, disableWallet ? false +, disableDaemon ? false +, withGui ? false }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "pivx-${version}"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "PIVX-Project"; + repo= "PIVX"; + rev = "v${version}"; + sha256 = "1sym6254vhq8qqpxq9qhy10m5167v7x93kqaj1gixc1vwwbxyazy"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] + ++ optionals withGui [ qtbase qttools qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] + ++ optional enableUpnp "--enable-upnp-default" + ++ optional disableWallet "--disable-wallet" + ++ optional disableDaemon "--disable-daemon" + ++ optionals withGui [ "--with-gui=yes" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; + + enableParallelBuilding = true; + doChecks = true; + postBuild = '' + mkdir -p $out/share/applications $out/share/icons + cp contrib/debian/pivx-qt.desktop $out/share/applications/ + cp share/pixmaps/*128.png $out/share/icons/ + ''; + + meta = with stdenv.lib; { + description = "An open source crypto-currency focused on fast private transactions"; + longDescription = '' + PIVX is an MIT licensed, open source, blockchain-based cryptocurrency with + ultra fast transactions, low fees, high network decentralization, and + Zero Knowledge cryptography proofs for industry-leading transaction anonymity. + ''; + license = licenses.mit; + homepage = https://www.dash.org; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/ardour/default.nix b/nixpkgs/pkgs/applications/audio/ardour/default.nix index 1bb1e404b5c4..30a4e052d77c 100644 --- a/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patchShebangs ./tools/ ''; - configureFlags = [ + wafConfigureFlags = [ "--optimize" "--docs" "--with-backends=jack,alsa,dummy" diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 7a80fecab718..125c0f7a7536 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { production, performance and DJing, with a focus on flexible editing tools and a super-fast workflow. ''; - homepage = http://www.bitwig.com/; + homepage = https://www.bitwig.com/; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus mrVanDalo ]; diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/default.nix b/nixpkgs/pkgs/applications/audio/deadbeef/default.nix index 0212560cd03b..a6ca5b3639da 100644 --- a/nixpkgs/pkgs/applications/audio/deadbeef/default.nix +++ b/nixpkgs/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,10 @@ -{ config, stdenv, fetchurl, intltool, pkgconfig, jansson +{ config, stdenv, fetchFromGitHub +, autoconf +, automake +, libtool +, intltool +, pkgconfig +, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null @@ -9,7 +15,7 @@ , wavSupport ? true, libsndfile ? null , cdaSupport ? true, libcdio ? null, libcddb ? null , aacSupport ? true, faad2 ? null -, midiSupport ? false, wildmidi ? null +, opusSupport ? true, opusfile ? null , wavpackSupport ? false, wavpack ? null , ffmpegSupport ? false, ffmpeg ? null , apeSupport ? true, yasm ? null @@ -37,6 +43,7 @@ assert flacSupport -> flac != null; assert wavSupport -> libsndfile != null; assert cdaSupport -> (libcdio != null && libcddb != null); assert aacSupport -> faad2 != null; +assert opusSupport -> opusfile != null; assert zipSupport -> libzip != null; assert ffmpegSupport -> ffmpeg != null; assert apeSupport -> yasm != null; @@ -47,19 +54,27 @@ assert alsaSupport -> alsaLib != null; assert pulseSupport -> libpulseaudio != null; assert resamplerSupport -> libsamplerate != null; assert overloadSupport -> zlib != null; -assert midiSupport -> wildmidi != null; assert wavpackSupport -> wavpack != null; assert remoteSupport -> curl != null; stdenv.mkDerivation rec { - name = "deadbeef-${version}"; - version = "0.7.2"; + pname = "deadbeef"; + version = "1.8.0"; - src = fetchurl { - url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2"; - sha256 = "1168hgr1nf27pf24n1rlfh1kx1wiscwhpbhqw0rprwy203gsnqwa"; + src = fetchFromGitHub { + owner = "DeaDBeeF-Player"; + repo = "deadbeef"; + rev = version; + sha256 = "126i5qlkpv7pvi1mmc9y0jhqs6jjspsj7j615n2ddvsb2jsps81c"; }; + patches = [ + # Fix broken symbol name + # https://github.com/NixOS/nixpkgs/pull/59187#issuecomment-480977993 + # will be fixed in deadbeef 1.8.1 + ./fix-wildmidi.patch + ]; + buildInputs = with stdenv.lib; [ jansson ] ++ optional gtk2Support gtk2 ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] @@ -69,6 +84,7 @@ stdenv.mkDerivation rec { ++ optional wavSupport libsndfile ++ optionals cdaSupport [ libcdio libcddb ] ++ optional aacSupport faad2 + ++ optional opusSupport opusfile ++ optional zipSupport libzip ++ optional ffmpegSupport ffmpeg ++ optional apeSupport yasm @@ -79,16 +95,24 @@ stdenv.mkDerivation rec { ++ optional pulseSupport libpulseaudio ++ optional resamplerSupport libsamplerate ++ optional overloadSupport zlib - ++ optional midiSupport wildmidi ++ optional wavpackSupport wavpack ++ optional remoteSupport curl ; - nativeBuildInputs = with stdenv.lib; [ intltool pkgconfig ] - ++ optional gtk3Support wrapGAppsHook; + nativeBuildInputs = [ + autoconf + automake + intltool + libtool + pkgconfig + ] ++ stdenv.lib.optional gtk3Support wrapGAppsHook; enableParallelBuilding = true; + preConfigure = '' + ./autogen.sh + ''; + meta = with stdenv.lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = http://deadbeef.sourceforge.net/; diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/fix-wildmidi.patch b/nixpkgs/pkgs/applications/audio/deadbeef/fix-wildmidi.patch new file mode 100644 index 000000000000..c37308459bb7 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/deadbeef/fix-wildmidi.patch @@ -0,0 +1,19 @@ +--- a/plugins/wildmidi/src/wildmidi_lib.c ++++ b/plugins/wildmidi/src/wildmidi_lib.c +@@ -394,11 +394,11 @@ free_gauss (void) { + } + } + +-unsigned long int delay_size[4][2]; +-signed long int a[5][2]; +-signed long int b[5][2]; +-signed long int gain_in[4]; +-signed long int gain_out[4]; ++static unsigned long int delay_size[4][2]; ++static signed long int a[5][2]; ++static signed long int b[5][2]; ++static signed long int gain_in[4]; ++static signed long int gain_out[4]; + + void init_lowpass (void) { + float c = 0; diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 4e2e75953f35..4d5367087c10 100644 --- a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "deadbeef-mpris2-plugin-${version}"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1j631z34rwxf6wdjpsf8c2f1saq6qas1qmkgsg63m6zzpwqyizw0"; + sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/opus.nix b/nixpkgs/pkgs/applications/audio/deadbeef/plugins/opus.nix deleted file mode 100644 index 55db00c15bf6..000000000000 --- a/nixpkgs/pkgs/applications/audio/deadbeef/plugins/opus.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromBitbucket, opusfile, libopus, libogg, openssl, deadbeef }: - -stdenv.mkDerivation rec { - name = "deadbeef-opus-plugin-${version}"; - version = "0.8"; - - src = fetchFromBitbucket { - owner = "Lithopsian"; - repo = "deadbeef-opus"; - rev = "v${version}"; - sha256 = "057rgsw4563gs63k05s7zsdc0n4djxwlbyqabf7c88f23z35ryyi"; - }; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - NIX_CFLAGS_COMPILE = [ - "-I${opusfile}/include/opus" - ]; - - buildInputs = [ deadbeef opusfile libopus libogg openssl ]; - - meta = with stdenv.lib; { - description = "Ogg Opus decoder plugin for the DeaDBeeF music player"; - homepage = https://bitbucket.org/Lithopsian/deadbeef-opus; - license = licenses.gpl2; # There are three files, each licensed under different license: zlib, gpl2Plus and lgpl2 - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix index 49ecf670f324..0bffa6a07555 100644 --- a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1azzwqgrrr4zr509sib2jvigfvz5bkwnx82chdadxdwfarai8586"; + sha256 = "0d0kskr9pzdckw7sz4djjkkkgz1fa83zrq5my6qlxn68wqdj6800"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/nixpkgs/pkgs/applications/audio/flacon/default.nix b/nixpkgs/pkgs/applications/audio/flacon/default.nix index 1c5eaba78b27..a97b539e02a8 100644 --- a/nixpkgs/pkgs/applications/audio/flacon/default.nix +++ b/nixpkgs/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "flacon-${version}"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "18m077z1hqjg10chy5rgajd9q1wnrcxhiidivgjcdchc9q5d4b08"; + sha256 = "0vmbwpfjq66qv3zp7mss3hsxy6dxjybqfm7k2xyc0w181qclg1ya"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index f0fbc0bbe5c5..192670280cc6 100644 --- a/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -11,8 +11,8 @@ let sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; }; "2" = { - fluidsynthVersion = "2.0.3"; - sha256 = "00f6bhw4ddrinb5flvg5y53rcvnf4km23a6nbvnswmpq13568v78"; + fluidsynthVersion = "2.0.4"; + sha256 = "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0"; }; }; in diff --git a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index c8db1ac6d10a..670641fae75c 100644 --- a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3 +{ stdenv, fetchurl, fetchpatch, fetchFromGitLab, meson, ninja, gettext, cargo, rustc, python3, rustPlatform, pkgconfig, gnome3 , glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }: # TODO: build from git for easier updates @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0g2rk3w251fp5jwbxs5ya1adv8nsgdqjy1vmfg8qqab6qyndhbrc"; }; + patches = [ + # podcasts-data would fail to build because it errors on warnings + (fetchpatch { + url = "https://gitlab.gnome.org/World/podcasts/commit/7dc1b25ee7fc59a188312d31b1fa00c3110ae63e.patch"; + sha256 = "03ibbh1snk1391vnni529agqs14lzg5g0axjgpf3gn8dwwh1yvd5"; + }) + ]; + # src = fetchFromGitLab { # domain = "gitlab.gnome.org"; # owner = "World"; diff --git a/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/nixpkgs/pkgs/applications/audio/gpodder/default.nix index 9a3ad5e0bc3e..79631156513e 100644 --- a/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -5,16 +5,20 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.7"; + version = "3.10.8"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0sx9rj6dpvd2xz7lak2yi0zlgr3lp2ng1fw23s39la9ly4g1835j"; + sha256 = "0sx5z9qjl76fi0m8vmars0yasfaq6znq434d8zjwla22k5wflmwm"; }; + patches = [ + ./disable-autoupdate.patch + ]; + postPatch = with stdenv.lib; '' sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder ''; diff --git a/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch new file mode 100644 index 000000000000..8f77518d03e5 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/gpodder/disable-autoupdate.patch @@ -0,0 +1,55 @@ +--- a/share/gpodder/ui/gtk/menus.ui ++++ b/share/gpodder/ui/gtk/menus.ui +@@ -13,10 +13,6 @@ + <attribute name="action">app.gotoMygpo</attribute> + <attribute name="label" translatable="yes">Go to gpodder.net</attribute> + </item> +- <item> +- <attribute name="action">app.checkForUpdates</attribute> +- <attribute name="label" translatable="yes">Software updates</attribute> +- </item> + </section> + <section> + <item> +@@ -201,4 +197,4 @@ + </submenu> + </menu> + </interface> +-<!-- :noTabs=true:tabSize=2:indentSize=2: --> +\ No newline at end of file ++<!-- :noTabs=true:tabSize=2:indentSize=2: --> +--- a/src/gpodder/config.py ++++ b/src/gpodder/config.py +@@ -91,13 +91,6 @@ + 'retries': 3, # number of retries when downloads time out + }, + +- # Software updates from gpodder.org +- 'software_update': { +- 'check_on_startup': True, # check for updates on start +- 'last_check': 0, # unix timestamp of last update check +- 'interval': 5, # interval (in days) to check for updates +- }, +- + 'ui': { + # Settings for the Command-Line Interface + 'cli': { +--- a/src/gpodder/gtkui/main.py ++++ b/src/gpodder/gtkui/main.py +@@ -224,7 +224,7 @@ + util.idle_add(self.subscribe_to_url, self.options.subscribe) + elif not self.channels: + self.on_itemUpdate_activate() +- elif self.config.software_update.check_on_startup: ++ elif False and self.config.software_update.check_on_startup: + # Check for software updates from gpodder.org + diff = time.time() - self.config.software_update.last_check + if diff > (60 * 60 * 24) * self.config.software_update.interval: +@@ -3288,6 +3288,7 @@ + If silent=False, a message will be shown even if no updates are + available (set silent=False when the check is manually triggered). + """ ++ return + try: + up_to_date, version, released, days = util.get_update_info() + except Exception as e: diff --git a/nixpkgs/pkgs/applications/audio/guitarix/default.nix b/nixpkgs/pkgs/applications/audio/guitarix/default.nix index bc4c18aab085..9df4308131eb 100644 --- a/nixpkgs/pkgs/applications/audio/guitarix/default.nix +++ b/nixpkgs/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.37.3"; + version = "0.38.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac"; + sha256 = "0bw7xnrx062nwb1bfj9x660h7069ncmz77szcs8icpqxrvhs7z80"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 wafHook ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { zita-resampler curl ]; - configureFlags = [ + wafConfigureFlags = [ "--shared-lib" "--no-desktop-update" "--enable-nls" diff --git a/nixpkgs/pkgs/applications/audio/kid3/default.nix b/nixpkgs/pkgs/applications/audio/kid3/default.nix index 522ffa2a5338..b4406dab70eb 100644 --- a/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/nixpkgs/pkgs/applications/audio/kid3/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "1bj4kq9hklgfp81rbxcjzbxmdgxjqksx7cqnw3m9dc0pnns5jx0x"; + sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8"; }; buildInputs = with stdenv.lib; diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 3b850a27327b..565c0b315226 100644 --- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0.3"; + version = "1.0.5"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1gjxcwl467h7011j9v4zy1j0fjlz480ibvk4akr6xwjg894jykbx"; + sha256 = "1p6glzvbbha3cvq462ymbn1q58skclfk469kk28cr1hlsf5x2pry"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index 2e70bebc88d2..d798a2bed535 100644 --- a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { - Delay Compensator Stereo - Verzögerungsausgleicher Stereo - Delay Compensator x2 Stereo - Verzögerungsausgleicher x2 Stereo ''; - homepage = http://lsp-plug.in; + homepage = https://lsp-plug.in; maintainers = with maintainers; [ magnetophon ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix b/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix index 79edfdef5040..81db133ff9ab 100644 --- a/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix +++ b/nixpkgs/pkgs/applications/audio/ltc-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ltc-tools-${version}"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "x42"; repo = "ltc-tools"; rev = "v${version}"; - sha256 = "1a7r99mwc7p5j5y453mrgph67wlznd674v4k2pfmlvc91s6lh44y"; + sha256 = "0vp25b970r1hv5ndzs4di63rgwnl31jfaj3jz5dka276kx34q4al"; }; buildInputs = [ pkgconfig libltc libsndfile jack2 ]; diff --git a/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/nixpkgs/pkgs/applications/audio/mixxx/default.nix index 4c84fb3c3f77..8d8d8d854754 100644 --- a/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -1,33 +1,33 @@ { stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis -, opusfile -, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite -, taglib, upower, vampSDK +, libGLU, libxcb, lilv, lv2, opusfile +, pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg +, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK }: stdenv.mkDerivation rec { name = "mixxx-${version}"; - version = "2.1.5"; + version = "2.2.0"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr"; + sha256 = "1rp2nyhz2j695k5kk0m94x30akwrlr9jgs0n4pi4snnvjpwmbfp9"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile - libusb1 libvorbis opusfile pkgconfig portaudio portmidi protobuf qt4 - rubberband scons sqlite taglib upower vampSDK + libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg + qtx11extras rubberband scons sqlite taglib upower vampSDK ]; sconsFlags = [ "build=release" - "qtdir=${qt4}" + "qtdir=${qtbase}" "faad=1" "opus=1" ]; diff --git a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index 7089f4dba920..67fe983c26fd 100644 --- a/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.33"; + version = "0.34"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1ymnxb85v2pc0qpk0yz5gdxayc0ialk82ba521lgdw66li7fr4as"; + sha256 = "0ffby37qdg251c1w0vl6rmd13akbydnf12468z4vrl0ybwfd7fc4"; }; buildInputs = [ glib ncurses mpd_clientlib boost ]; diff --git a/nixpkgs/pkgs/applications/audio/pianobar/default.nix b/nixpkgs/pkgs/applications/audio/pianobar/default.nix index 60cd2567f625..40e45a76b4bf 100644 --- a/nixpkgs/pkgs/applications/audio/pianobar/default.nix +++ b/nixpkgs/pkgs/applications/audio/pianobar/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg, curl }: stdenv.mkDerivation rec { - name = "pianobar-2018.06.22"; + name = "pianobar-2019.02.14"; src = fetchurl { url = "http://6xq.net/projects/pianobar/${name}.tar.bz2"; - sha256 = "1hnlif62vsxgh8j9mcibxwj4gybpgqc11ba729kflpvvi9qmfqwl"; + sha256 = "07z21vmlqpmvb3294r384iqbx972rwcx6chrdlkfv4hlnc9h7gf0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/puddletag/default.nix b/nixpkgs/pkgs/applications/audio/puddletag/default.nix index 915d7fcbd98b..3a6cd298557f 100644 --- a/nixpkgs/pkgs/applications/audio/puddletag/default.nix +++ b/nixpkgs/pkgs/applications/audio/puddletag/default.nix @@ -28,8 +28,8 @@ python2Packages.buildPythonApplication rec { dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { - homepage = https://puddletag.net; description = "An audio tag editor similar to the Windows program, Mp3tag"; + homepage = https://docs.puddletag.net; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index b82dad05c31b..8a0762d5176b 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -7,6 +7,7 @@ , patchelf , fdk_aac , libtool +, ldacbt , cmake , bluez , dbus @@ -23,14 +24,13 @@ let in stdenv.mkDerivation rec { name = "pulseaudio-modules-bt-${version}"; - version = "unstable-2019-03-15"; + version = "1.1.99"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; - rev = "0b397c26eb4fd5dc611bd3e2baa79776de646856"; - sha256 = "09q0xh9iz0crik6xpln9lijirf62aljxa1jrds1i1zgflyfidd0z"; - fetchSubmodules = true; + rev = "v${version}"; + sha256 = "0x670xbd62r3fs9a8pa5p4ppvxn6m64hvlrqa702gvikcvyrmwcg"; }; patches = [ @@ -48,6 +48,7 @@ in stdenv.mkDerivation rec { ffmpeg_4 fdk_aac libtool + ldacbt bluez dbus sbc @@ -67,7 +68,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ + --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done ''; diff --git a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index ff38d4b16f50..0cbb022eb201 100644 --- a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -47,13 +47,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.5.5"; + version = "4.5.9"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0ll85c9xll2i42r1bdgbnxi5mc5jq2vxgp179jj2iq7wczq5psj1"; + sha256 = "19pqi9wix359hdrslzmi9sz0dzz03pdwqvdyzw3i5rdny01skdfw"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix index eafde7957a21..089fffdc0e83 100644 --- a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix +++ b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.5"; + version = "0.5.6"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1rzzqa39a6llr52vjkjr0a86nc776kmr5xs52qqga8ms9697psz5"; + sha256 = "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/qmidinet/default.nix b/nixpkgs/pkgs/applications/audio/qmidinet/default.nix index 37677cc211cc..21bcd158f7ae 100644 --- a/nixpkgs/pkgs/applications/audio/qmidinet/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.5.2"; + version = "0.5.3"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "0y2w3rymvc35r291sp2qaxn36wjwvxzk2iaw9y30q9fqc0vlpdns"; + sha256 = "0li6iz1anm8pzz7j12yrfyxlyslsfsksmz0kk0iapa4yx3kifn10"; }; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/applications/audio/qsampler/default.nix b/nixpkgs/pkgs/applications/audio/qsampler/default.nix index 69bf41e1e4fb..aef0d013e9fe 100644 --- a/nixpkgs/pkgs/applications/audio/qsampler/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "02xazvz8iaksglbgq3jhw4fq3f5pdcq9sss79jxs082md0mry17d"; + sha256 = "1hk0j63zzdyji5dd89spbyw79i74n28zjryyy0a4gsaq0m7j2dry"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 603ca8b36405..b146513d7350 100644 --- a/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "08x7znvbwi9miavcarymi7dsv8njmxzwzma20dbmz8j2aswm53w5"; + sha256 = "0h4hhja8qbyzd6v24flw9wr4mwl03nplryx1gyrppn7sg13l1sx6"; }; nativeBuildInputs = [ autoconf pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/nixpkgs/pkgs/applications/audio/qtractor/default.nix index 59bbceac7050..703ce5c5cf90 100644 --- a/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1zsikhqj5xzhw2x3b6pqlmcwz3hxx07lbbif8v3m3j41snzjic22"; + sha256 = "06sa4wl8zr0k8dnjiil0gjwnhrkq95h50xv56ih1y8jgyzxchaxp"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index 8e2b096672c1..8e04b51753d7 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.965"; + version = "5.973"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "05fn7r3v4qcb1b31g8layzvqilrwdr0s8yskr61yvbhx2dnjp9iw"; + sha256 = "02ymi2rn29zrb71krx43nrpfldhkcvwry4gz228apff2hb2lmqdx"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix index 2162ddd79815..24b342a26a92 100644 --- a/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix +++ b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix @@ -17,24 +17,15 @@ }: let pname = "rhythmbox"; - version = "3.4.2"; + version = "3.4.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2"; + sha256 = "1yx3n7p9vmv23jsv98fxwq95n78awdxqm8idhyhxx2d6vk4w1hgx"; }; - patches = [ - # build with GStreamer 1.14 https://bugzilla.gnome.org/show_bug.cgi?id=788706 - (fetchurl { - name = "fmradio-Fix-build-with-GStreamer-master.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=361178; - sha256 = "1h09mimlglj9hcmc3pfp0d6c277mqh2khwv9fryk43pkv3904d2w"; - }) - ]; - nativeBuildInputs = [ pkgconfig intltool perl perlPackages.XMLParser diff --git a/nixpkgs/pkgs/applications/audio/samplv1/default.nix b/nixpkgs/pkgs/applications/audio/samplv1/default.nix index cba85aacfbb8..1a1315394602 100644 --- a/nixpkgs/pkgs/applications/audio/samplv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "0402rdr46za21w34m7ajzbwiiqcd1h0da3b0ldsr2z5g2mrkzxv8"; + sha256 = "16a5xix9pn0gl3fr6bv6zl1l9vrzgvy1q7xd8yxzfr3vi5s8x4z9"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/nixpkgs/pkgs/applications/audio/snd/default.nix b/nixpkgs/pkgs/applications/audio/snd/default.nix index 8534d871c662..e749bb928076 100644 --- a/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.8"; + name = "snd-19.2"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "16p6cmxl8y58wa19k1z6i66qsqaz7rld4850b0sprbxjjb6cqhf7"; + sha256 = "1a6ls2hyvggss12idca22hq5vsq4jw2xkwrx22dx29i9926gdr6h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/spotify/update.sh b/nixpkgs/pkgs/applications/audio/spotify/update.sh index 0e19ca1920b4..a8836214f2fc 100755 --- a/nixpkgs/pkgs/applications/audio/spotify/update.sh +++ b/nixpkgs/pkgs/applications/audio/spotify/update.sh @@ -29,10 +29,10 @@ spotify_nix="$nixpkgs/pkgs/applications/audio/spotify/default.nix" # create bash array from snap info snap_info=($( - curl -H 'X-Ubuntu-Series: 16' \ - "https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=$channel" \ - | jq --raw-output \ - '.revision,.download_sha512,.version,.last_updated' + curl -s -H 'X-Ubuntu-Series: 16' \ + "https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=$channel" \ + | jq --raw-output \ + '.revision,.download_sha512,.version,.last_updated' )) # "revision" is the actual version identifier on snapcraft, the "version" is @@ -50,8 +50,8 @@ echo "Latest $channel release is $upstream_version from $last_updated." # current_nix_version=$( - grep 'version\s*=' "$spotify_nix" \ - | sed -Ene 's/.*"(.*)".*/\1/p' + grep 'version\s*=' "$spotify_nix" \ + | sed -Ene 's/.*"(.*)".*/\1/p' ) echo "Current nix version: $current_nix_version" @@ -61,36 +61,28 @@ echo "Current nix version: $current_nix_version" # if [[ "$current_nix_version" = "$upstream_version" ]]; then - echo "Spotify is already up ot date" - exit 0 + echo "Spotify is already up-to-date" + exit 0 fi echo "Updating from ${current_nix_version} to ${upstream_version}, released on ${last_updated}" # search-and-replace revision, hash and version sed --regexp-extended \ - -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ - -e 's/sha512\s*=\s*"[^"]*"\s*;/sha512 = "'"${sha512}"'";/' \ - -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \ - -i "$spotify_nix" + -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ + -e 's/sha512\s*=\s*"[^"]*"\s*;/sha512 = "'"${sha512}"'";/' \ + -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \ + -i "$spotify_nix" # # try to build the updated version # if ! nix-build -A spotify "$nixpkgs"; then - echo "The updated spotify failed to build." - exit 1 + echo "The updated spotify failed to build." + exit 1 fi -# -# give instructions for upstreaming -# - +# Commit changes git add "$spotify_nix" -# show changes for review -git status -echo 'Please review and test the changes (./result/bin/spotify).' -echo 'Then stage the changes with `git add` and commit with:' -# prepare commit message -echo "git commit -m 'spotify: $current_nix_version -> $upstream_version'" +git commit -m "spotify: ${current_nix_version} -> ${upstream_version}" diff --git a/nixpkgs/pkgs/applications/audio/sunvox/default.nix b/nixpkgs/pkgs/applications/audio/sunvox/default.nix index 47b0bf2e736c..957ee50ca7ad 100644 --- a/nixpkgs/pkgs/applications/audio/sunvox/default.nix +++ b/nixpkgs/pkgs/applications/audio/sunvox/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "SunVox-${version}"; - version = "1.9.3b"; + version = "1.9.4c"; src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "0k74rcq7niw4p17vj3zp9lpgi932896dmzqv4ln43g0pz7l18c8b"; + sha256 = "19c1a4e28459e31e1a19986f219d4caa4eb2cb5bc9f6aa994abdbb2ebf6ac4ac"; }; buildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/applications/audio/synthv1/default.nix b/nixpkgs/pkgs/applications/audio/synthv1/default.nix index 0918cf42830b..485796946990 100644 --- a/nixpkgs/pkgs/applications/audio/synthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1b9w4cml3cmcg09kh852cahas6l9ks8wl3gzp1az8rzxz4229yg1"; + sha256 = "1hcngk7mxfrqf8v3r759x3wd0p02nc3q83j8m3k58p408y3mx7nr"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/nixpkgs/pkgs/applications/audio/transcribe/default.nix index 9a76f2d15c73..29021e870afc 100644 --- a/nixpkgs/pkgs/applications/audio/transcribe/default.nix +++ b/nixpkgs/pkgs/applications/audio/transcribe/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; + broken = true; }; } diff --git a/nixpkgs/pkgs/applications/audio/traverso/default.nix b/nixpkgs/pkgs/applications/audio/traverso/default.nix index 9729b136d905..0c432acf4afe 100644 --- a/nixpkgs/pkgs/applications/audio/traverso/default.nix +++ b/nixpkgs/pkgs/applications/audio/traverso/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { name = "traverso-${version}"; - version = "0.49.5"; + version = "0.49.6"; src = fetchurl { - url = "http://traverso-daw.org/traverso-0.49.5.tar.gz"; - sha256 = "169dsqrf807ciavrd82d3iil0xy0r3i1js08xshcrn80ws9hv63m"; + url = "http://traverso-daw.org/traverso-0.49.6.tar.gz"; + sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/audio/vocal/default.nix b/nixpkgs/pkgs/applications/audio/vocal/default.nix index 49e11aee0a12..21522f948736 100644 --- a/nixpkgs/pkgs/applications/audio/vocal/default.nix +++ b/nixpkgs/pkgs/applications/audio/vocal/default.nix @@ -1,41 +1,59 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk -, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, cmake +, ninja +, pkgconfig +, pantheon +, gtk3 +, glib +, libxml2 +, webkitgtk +, clutter-gtk +, clutter-gst +, libunity +, libnotify +, sqlite +, gst_all_1 +, libsoup +, json-glib +, libgee +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "vocal"; - version = "2.3.0"; - - name = "${pname}-${version}"; + version = "2.4.0"; src = fetchFromGitHub { owner = "needle-and-thread"; repo = pname; rev = version; - sha256 = "1wkkyai14in4yk3q4qq23wk3l49px2xi8z819y3glna236qsq6qp"; + sha256 = "09g9692rckdwh1i5krqgfwdx4p67b1q5834cnxahxzpq4p08rf5w"; }; nativeBuildInputs = [ cmake - gobject-introspection libxml2 ninja - pkgconfig pantheon.vala + pkgconfig wrapGAppsHook ]; buildInputs = with gst_all_1; [ clutter-gst clutter-gtk - pantheon.elementary-icon-theme - gnome3.libgee - pantheon.granite + glib gst-plugins-base gst-plugins-good gstreamer + gtk3 json-glib + libgee libnotify libunity + pantheon.elementary-icon-theme + pantheon.granite sqlite webkitgtk ]; diff --git a/nixpkgs/pkgs/applications/display-managers/sddm/default.nix b/nixpkgs/pkgs/applications/display-managers/sddm/default.nix index 3de4067f55d5..b5d32493003d 100644 --- a/nixpkgs/pkgs/applications/display-managers/sddm/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/sddm/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.18.0"; + version = "0.18.1"; in mkDerivation rec { name = "sddm-${version}"; @@ -13,7 +13,7 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq"; + sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq"; }; patches = [ @@ -41,11 +41,11 @@ in mkDerivation rec { # not supported anyway. "-DUID_MIN=1000" "-DUID_MAX=29999" - ]; - preConfigure = '' - export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" - ''; + "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}" + "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" + "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system" + ]; postInstall = '' # remove empty scripts diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index e5e5e179b890..80d84bcd2fd4 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -18,21 +18,11 @@ let sha256Hash = "1v4apc73jdhavhzj8j46mzh15rw08w1hd9y9ykarj3b5q7i2vyq1"; }; latestVersion = { # canary & dev - version = "3.5.0.9"; # "Android Studio 3.5 Canary 10" - build = "191.5416148"; - sha256Hash = "03d2x6bqasw417dxc7b8y65rral73xm2ci512gprmsvwy42k3mqi"; + version = "3.5.0.10"; # "Android Studio 3.5 Canary 11" + build = "191.5455988"; + sha256Hash = "1g24a8fwnrfzdf093wdmqly3mzjddk5ndgi51qj98amn7kclsdpf"; }; in rec { - # Old alias (TODO @primeos: Remove after 19.03 is branched off): - preview = throw '' - The attributes "android-studio-preview" and "androidStudioPackages.preview" - are now deprecated and will be removed soon, please use - "androidStudioPackages.beta" instead. This attribute corresponds to the - beta channel, if you want the latest release you can use - "androidStudioPackages.dev" or "androidStudioPackages.canary" instead - (currently, there is no difference between both channels). - ''; - # Attributes are named by their corresponding release channels stable = mkStudio (stableVersion // { diff --git a/nixpkgs/pkgs/applications/editors/brackets/default.nix b/nixpkgs/pkgs/applications/editors/brackets/default.nix index 1065564f7b4c..ce9f10f39c41 100644 --- a/nixpkgs/pkgs/applications/editors/brackets/default.nix +++ b/nixpkgs/pkgs/applications/editors/brackets/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, systemd, dbus }: +, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: with stdenv.lib; let bracketsLibs = makeLibraryPath [ - gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd + gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat ]; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 2fd8add173d6..2c560ba599f3 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -19,10 +19,10 @@ elpaBuild { pname = "ack"; ename = "ack"; - version = "1.5"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ack-1.5.tar"; - sha256 = "0sljshiy44z27idy0rxjs2fx4smlm4v607wic7md1vihp6qp4l9r"; + url = "https://elpa.gnu.org/packages/ack-1.8.tar"; + sha256 = "1d4218km7j1bx1fsna29j3gi3k2ak2fzbk1gyki327pnnlma6bav"; }; packageRequires = []; meta = { @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-6.0.1.tar"; - sha256 = "12ryblyqnhqibaffibs7qq3xq9rf5d4y9dishq82pbbh9y8s17hj"; + url = "https://elpa.gnu.org/packages/ada-mode-6.1.0.tar"; + sha256 = "1qa4kjv5xxlj50fghg5516cxn8ckv8vlyarcab2isxjnnxnb6g7s"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -54,10 +54,10 @@ elpaBuild { pname = "ada-ref-man"; ename = "ada-ref-man"; - version = "2012.3"; + version = "2012.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-ref-man-2012.3.tar"; - sha256 = "0w88xw51jb85nmqbi3i9kj9kx2fa6zlazk3x7afll7njc6g4105z"; + url = "https://elpa.gnu.org/packages/ada-ref-man-2012.5.tar"; + sha256 = "0n7izqc44i3l6fxbzkq9gwwlcf04rr9g1whrk8biz84jhbyh23x8"; }; packageRequires = []; meta = { @@ -204,16 +204,16 @@ license = lib.licenses.free; }; }) {}; - auctex = callPackage ({ elpaBuild, fetchurl, lib }: + auctex = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "auctex"; ename = "auctex"; - version = "12.1.1"; + version = "12.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.1.1.tar"; - sha256 = "10l96569dy9pfp8bm64pndhk1skg65kqhsyllwfa0zvb7mjkm70l"; + url = "https://elpa.gnu.org/packages/auctex-12.1.2.tar"; + sha256 = "1yibg2anpmyr2a27wm4xqjsvsi9km2jzb56bf7cwyj8dnjfsd11n"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/auctex.html"; license = lib.licenses.free; @@ -324,6 +324,25 @@ license = lib.licenses.free; }; }) {}; + buffer-expose = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "buffer-expose"; + ename = "buffer-expose"; + version = "0.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/buffer-expose-0.4.1.el"; + sha256 = "05b1mhcv3860g93a7myqqrhmb9gpp19b4bcxhmdbmf4m0f7p9fw4"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buffer-expose.html"; + license = lib.licenses.free; + }; + }) {}; bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "bug-hunter"; @@ -429,6 +448,21 @@ license = lib.licenses.free; }; }) {}; + clipboard-collector = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "clipboard-collector"; + ename = "clipboard-collector"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/clipboard-collector-0.2.el"; + sha256 = "19scspkxgm3b1jkv10jy6nw9gv1q6sfjys09l37mvsva3djxa1dl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/clipboard-collector.html"; + license = lib.licenses.free; + }; + }) {}; cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "cobol-mode"; @@ -621,10 +655,10 @@ elpaBuild { pname = "darkroom"; ename = "darkroom"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/darkroom-0.1.el"; - sha256 = "0fif8fm1h7x7g16949shfnaik5f5488clsvkf8bi5izpqp3vi6ak"; + url = "https://elpa.gnu.org/packages/darkroom-0.2.el"; + sha256 = "1a528brhz4vckhp77n2c1phkyqdliykpj9kzk3f834f4rwnb5mp0"; }; packageRequires = [ cl-lib ]; meta = { @@ -664,18 +698,19 @@ }) {}; debbugs = callPackage ({ cl-lib ? null , elpaBuild + , emacs , fetchurl , lib , soap-client }: elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.16.tar"; - sha256 = "0y3bq803c7820h15g66d1648skxfhlfa2v6vincj6xk5ssp44s9p"; + url = "https://elpa.gnu.org/packages/debbugs-0.17.tar"; + sha256 = "0zclh2nxj5p10n214sxyxy3ca07l5s9p5spk0xp1smr6nzn0w7gb"; }; - packageRequires = [ cl-lib soap-client ]; + packageRequires = [ cl-lib emacs soap-client ]; meta = { homepage = "https://elpa.gnu.org/packages/debbugs.html"; license = lib.licenses.free; @@ -715,10 +750,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.5.tar"; - sha256 = "1vxc7z7c2qs0mx7l5sa4sybi5qbzv0s79flj74p1ynw8dl3qxg3d"; + url = "https://elpa.gnu.org/packages/diff-hl-1.8.6.tar"; + sha256 = "02hvi5jxv2anf62lw878bdz6xk7xjhjd5q85pqihmadbpj6i6pfq"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -745,10 +780,10 @@ elpaBuild { pname = "dired-du"; ename = "dired-du"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-du-0.5.1.tar"; - sha256 = "1091scnrjh0a4gja4z6jxic6ghy1yryv46qk9c76pmh50cpw6766"; + url = "https://elpa.gnu.org/packages/dired-du-0.5.2.tar"; + sha256 = "0vhph7vcicsiq28b10h3b4dvnhckcy4gccpdgsad5j7pwa5k26m1"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -756,6 +791,36 @@ license = lib.licenses.free; }; }) {}; + dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dired-git-info"; + ename = "dired-git-info"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-git-info-0.2.el"; + sha256 = "1pxn6kmgnynil13gp3m0y8hhkvciy3dcd55psj70pkrj50555dqx"; + }; + 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"; + ename = "disk-usage"; + version = "1.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/disk-usage-1.3.1.el"; + sha256 = "1jkwlg7w4090a7byfjh30mjz1libls8n71pphmn3973hqwaclnr7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/disk-usage.html"; + license = lib.licenses.free; + }; + }) {}; dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "dismal"; @@ -835,10 +900,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.2"; + version = "0.6.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.2.tar"; - sha256 = "1b37962mvm80vk5sdk9kfvvxsxn83z5z6zvm20m9997ggl5dv4dz"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.6.tar"; + sha256 = "1jgx099z9xg47v698qjbk5q70bakfw7zxaj25z4jz1mq64fvk6b5"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -900,10 +965,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.3.tar"; - sha256 = "0hndqabxvrq4ak5kx2xlds5pkayi2bfd1f1xk8aidzk5i70f7yry"; + url = "https://elpa.gnu.org/packages/eglot-1.4.tar"; + sha256 = "1f2p08ly17jcjyh8bif5zhmzhx3z5y9z20v6z24z939bqk8c1pdq"; }; packageRequires = [ emacs flymake jsonrpc ]; meta = { @@ -920,10 +985,10 @@ elpaBuild { pname = "el-search"; ename = "el-search"; - version = "1.8.8"; + version = "1.11.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.8.8.tar"; - sha256 = "1yv91vzpxn29rr8rkrihcbf26pafnxj25j7g38rss9qigswjkpnk"; + url = "https://elpa.gnu.org/packages/el-search-1.11.4.tar"; + sha256 = "152kx9s72h94n6nsrn84cmfb264cdw61ny5fn0n3fa581ipy34nm"; }; packageRequires = [ cl-print emacs stream ]; meta = { @@ -1037,10 +1102,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.21"; + version = "0.22.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.21.tar"; - sha256 = "07ng1pgsnc3isfsyzh2gfc7391p9il8lb5xqf1z6yqn20w7k6xzj"; + url = "https://elpa.gnu.org/packages/exwm-0.22.1.tar"; + sha256 = "1ggb8vgxxml8c5bvamv9jgz80gs6h9xirjgphq8gwkywwd5xyiq4"; }; packageRequires = [ xelb ]; meta = { @@ -1097,10 +1162,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.0.3.el"; - sha256 = "1algny2zhcl4vc7kp5czcqvxzpgqfjnz2rnkv26r0ylxig3s98v7"; + url = "https://elpa.gnu.org/packages/flymake-1.0.5.el"; + sha256 = "1zxzad84gcbdfh3pp606sspy8zkgxvngbzbimc2cam4pjcmwfx1y"; }; packageRequires = [ emacs ]; meta = { @@ -1112,10 +1177,10 @@ elpaBuild { pname = "fountain-mode"; ename = "fountain-mode"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fountain-mode-2.6.1.el"; - sha256 = "0p0h28cmryhsgrp2ghk28i1xkfz4gvdwaa38galn4jksn9dh0dyb"; + url = "https://elpa.gnu.org/packages/fountain-mode-2.6.2.el"; + sha256 = "0ysxk9ap919scg2zz0psw8hk1dj35ys9p0havswsjzm46k43xd6z"; }; packageRequires = [ emacs ]; meta = { @@ -1138,6 +1203,21 @@ license = lib.licenses.free; }; }) {}; + frog-menu = callPackage ({ avy, elpaBuild, emacs, fetchurl, lib, posframe }: + elpaBuild { + pname = "frog-menu"; + ename = "frog-menu"; + version = "0.2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/frog-menu-0.2.2.el"; + sha256 = "0kv31p42gmi01xalbvwksk10l28ascdr214bmv1z22dipv0zm30i"; + }; + packageRequires = [ avy emacs posframe ]; + meta = { + homepage = "https://elpa.gnu.org/packages/frog-menu.html"; + license = lib.licenses.free; + }; + }) {}; fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "fsm"; @@ -1278,6 +1358,41 @@ license = lib.licenses.free; }; }) {}; + greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "greader"; + ename = "greader"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/greader-0.1.tar"; + sha256 = "0mwhmidzv9vnmx6xls8pq4ra4m0f4yg677xgv34ivv34vsgg1mhb"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/greader.html"; + license = lib.licenses.free; + }; + }) {}; + guess-language = callPackage ({ advice + , cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "guess-language"; + ename = "guess-language"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el"; + sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz"; + }; + packageRequires = [ advice cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/guess-language.html"; + license = lib.licenses.free; + }; + }) {}; heap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "heap"; @@ -1430,14 +1545,29 @@ 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; + }; + }) {}; javaimp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "javaimp"; ename = "javaimp"; - version = "0.6"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/javaimp-0.6.tar"; - sha256 = "015kchx6brsjk7q6lz9y44a18n5imapd95czx50hqdscjczmj2ff"; + url = "https://elpa.gnu.org/packages/javaimp-0.6.1.tar"; + sha256 = "1piaj3sgw6a05g9dhkbrn5n490w01z1rxa7axh3vg1xqbs6rv7lw"; }; packageRequires = []; meta = { @@ -1464,10 +1594,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20180301"; + version = "20190219"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20180301.tar"; - sha256 = "0kcs70iygbpaxs094q6agsjs56sz03jy4fwk178f9hr93x95pynx"; + url = "https://elpa.gnu.org/packages/js2-mode-20190219.tar"; + sha256 = "0jgqs7cwykw5ihdq9wp5qc05y6br9gsyfiylqhjq43z59673chcc"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1655,6 +1785,21 @@ license = lib.licenses.free; }; }) {}; + map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "map"; + ename = "map"; + version = "2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/map-2.0.el"; + sha256 = "1djygpvk1qgldg9my0lh8n2z1n6acz3y5ws7sv2w08hvxdlxz857"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/map.html"; + license = lib.licenses.free; + }; + }) {}; markchars = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "markchars"; @@ -1908,10 +2053,10 @@ elpaBuild { pname = "nlinum"; ename = "nlinum"; - version = "1.8.1"; + version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nlinum-1.8.1.el"; - sha256 = "0fx560yfjy6nqgs1d3fiv0h46i8q3r592clsia7nihkriah7rlwf"; + url = "https://elpa.gnu.org/packages/nlinum-1.9.el"; + sha256 = "03zqlz58fvh4cpfl43h7py2fpnc7m37f1ys8zhrc511ccq9cwkdn"; }; packageRequires = []; meta = { @@ -1979,6 +2124,21 @@ license = lib.licenses.free; }; }) {}; + objed = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "objed"; + ename = "objed"; + version = "0.8.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/objed-0.8.1.tar"; + sha256 = "06jfvz7avh28p1ghyd1aik5lz8k9fnv1fcxh9npm1iyvh810y5zj"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/objed.html"; + license = lib.licenses.free; + }; + }) {}; omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "omn-mode"; @@ -2013,10 +2173,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.2"; + version = "9.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.2.tar"; - sha256 = "14ydwh2r360fpi6v2g9rgf0zazy2ddq1pcdxvzn73h65glnnclz9"; + url = "https://elpa.gnu.org/packages/org-9.2.3.tar"; + sha256 = "0hqy4lns9q5p0l1ylgmlckqprn9sbasszhznanmv0rsh0gzhsbyw"; }; packageRequires = []; meta = { @@ -2028,10 +2188,10 @@ elpaBuild { pname = "org-edna"; ename = "org-edna"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-edna-1.0.1.tar"; - sha256 = "0xzyzx3pq1q6d66qcqx38pgxzn160y9yrzpy0ka8ap5xsm7ngn7m"; + url = "https://elpa.gnu.org/packages/org-edna-1.0.2.tar"; + sha256 = "005pmnqr41s2w72gahq9bf4l5kw601i19ypiqfnb8aq0f4acjr3d"; }; packageRequires = [ emacs org seq ]; meta = { @@ -2129,6 +2289,21 @@ 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; + }; + }) {}; pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "pinentry"; @@ -2163,10 +2338,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.4.2.el"; - sha256 = "1h8vvxvsg41vc1nnglqjs2q0k1yzfsn72skga9s76qa3zxmx6kds"; + url = "https://elpa.gnu.org/packages/posframe-0.4.3.el"; + sha256 = "06q0p4qim6lha2xr9fxaspbzw01xn01ik9gxlld6hdhh19b65cmi"; }; packageRequires = [ emacs ]; meta = { @@ -2337,6 +2512,21 @@ license = lib.licenses.free; }; }) {}; + relint = callPackage ({ elpaBuild, fetchurl, lib, xr }: + elpaBuild { + pname = "relint"; + ename = "relint"; + version = "1.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/relint-1.6.el"; + sha256 = "17nyy3zqpqgs22lrrpdm0k56xnhj5l3y2y3lnmhcqw63xksgbsyk"; + }; + packageRequires = [ xr ]; + meta = { + homepage = "https://elpa.gnu.org/packages/relint.html"; + license = lib.licenses.free; + }; + }) {}; rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "rich-minority"; @@ -2508,16 +2698,16 @@ license = lib.licenses.free; }; }) {}; - sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + sokoban = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "sokoban"; ename = "sokoban"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sokoban-1.4.6.tar"; - sha256 = "112cl1l36zn5q9cw81rxi96zflf7ddp3by1h7fsz48yjfidpfbzn"; + url = "https://elpa.gnu.org/packages/sokoban-1.4.8.tar"; + sha256 = "1w3vrkg239x1saqka21zbl380fxqmbz3lr7820spxd8p5w9v55pn"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/sokoban.html"; license = lib.licenses.free; @@ -2877,6 +3067,24 @@ license = lib.licenses.free; }; }) {}; + visual-filename-abbrev = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "visual-filename-abbrev"; + ename = "visual-filename-abbrev"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.0.el"; + sha256 = "086cmyv08jd3qadjrd14b7c932i8msxjdvxxa36pyac18d3i50kj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html"; + license = lib.licenses.free; + }; + }) {}; visual-fill = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "visual-fill"; @@ -2967,6 +3175,21 @@ license = lib.licenses.free; }; }) {}; + webfeeder = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "webfeeder"; + ename = "webfeeder"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/webfeeder-1.0.0.tar"; + sha256 = "06y5vxw9m6pmbrzb8v2i3w9dnhgqxz06vyx1knmgi9cczlrj4a64"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/webfeeder.html"; + license = lib.licenses.free; + }; + }) {}; websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "websocket"; @@ -3016,10 +3239,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-2.0.1.tar"; - sha256 = "1h0g6y33jrafcabgyi7j700hpv4p56v84c2mlqb334k1g9rq3709"; + url = "https://elpa.gnu.org/packages/wisi-2.1.0.tar"; + sha256 = "143xfdr7agyc52wz9zsx67rvvnjs4rlj7j3cbdhvs6wyl7whyg38"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -3046,10 +3269,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.7.el"; - sha256 = "0jpy3zzbyb16vqa9l6m45crzlypwvscvs76h8lci7kvp91kq954r"; + url = "https://elpa.gnu.org/packages/xclip-1.8.el"; + sha256 = "1ymc9dhpwbh92ad7w64p8xlrjdws5c9h90h47ckh6479h8r697xg"; }; packageRequires = []; meta = { @@ -3061,10 +3284,10 @@ elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.16.tar"; - sha256 = "03wsr1jr7f7zfd80h864rd4makwh4widdnj1kjv2xyjwdgap9rl8"; + url = "https://elpa.gnu.org/packages/xelb-0.17.tar"; + sha256 = "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml"; }; packageRequires = [ cl-generic emacs ]; meta = { @@ -3087,6 +3310,21 @@ license = lib.licenses.free; }; }) {}; + xr = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "xr"; + ename = "xr"; + version = "1.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xr-1.10.tar"; + sha256 = "16p68rj5h609pnbp7y0jiiq1zkbksh4qqi1q8yby3ldj5x9sfpwc"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/xr.html"; + license = lib.licenses.free; + }; + }) {}; yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; @@ -3124,10 +3362,10 @@ elpaBuild { pname = "zones"; ename = "zones"; - version = "2018.11.21"; + version = "2018.12.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/zones-2018.11.21.el"; - sha256 = "0s68mnynjd08gyga7xdnb0zy3irsxl1jryidpcrkzg821vfrk11i"; + url = "https://elpa.gnu.org/packages/zones-2018.12.28.el"; + sha256 = "1jd7wy5w96xppdlcl4dzq4wqhr2x6f4hzjps9f4kz256l4ia6hm0"; }; packageRequires = []; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 26f4b791cc02..b9f1ab53baa9 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -45,6 +45,7 @@ self: stream = markBroken super.stream; # requires emacs-25 cl-lib = null; # builtin tle = null; # builtin + advice = null; # builtin }; elpaPackages = super // overrides; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 636e24464f87..10910539d035 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -34,12 +34,12 @@ melpaBuild { pname = "_0xc"; ename = "0xc"; - version = "20170125.1953"; + version = "20190218.1717"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "0xc"; - rev = "31890af88234e4e098f1c340a5990515b934c7f7"; - sha256 = "1yp3wm0h6rkzxw950fnhw310npn56s9vl294sw8nyij85s2hw5qk"; + rev = "167e93ce863381a58988655927042514d984ad49"; + sha256 = "0msx29il7c01njlc4pwxs3f3qcvyakgjcivxaa287jibf67yg0ph"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc"; @@ -216,12 +216,12 @@ melpaBuild { pname = "abl-mode"; ename = "abl-mode"; - version = "20181031.130"; + version = "20190403.204"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; - rev = "b4c65b5a60a83200fe06f6caa77073316e5a4228"; - sha256 = "1farkn2zap0aww3nfrby4hkp7a2442sqn5g77w1krsxl9wf71fc3"; + rev = "44b7d946bc3a693f5a931c4a62c0a67d42e8d4dc"; + sha256 = "070c408bq5pliq0xbd1861l6db4sbfpnj3r6aknbqh2vb7l4yimb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; @@ -234,6 +234,35 @@ license = lib.licenses.free; }; }) {}; + abs-mode = callPackage ({ emacs + , erlang + , fetchFromGitHub + , fetchurl + , flymake ? null + , lib + , maude-mode + , melpaBuild }: + melpaBuild { + pname = "abs-mode"; + ename = "abs-mode"; + version = "20190326.1002"; + src = fetchFromGitHub { + owner = "abstools"; + repo = "abs-mode"; + rev = "a9a512992f681669dc59fe9ca86f12b9688b5454"; + sha256 = "0v6d7cxnj4mil7c7y4m1csiznl6rmzxg9snwhhv6wdqfw112kn8j"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aabccc4061e7764069796e12ee9688b67651cf70/recipes/abs-mode"; + sha256 = "148y99iaxcnjaacw017chwq0sq05ywgy5jx1lhp9ly7innrl9i1k"; + name = "recipe"; + }; + packageRequires = [ emacs erlang flymake maude-mode ]; + meta = { + homepage = "https://melpa.org/#/abs-mode"; + license = lib.licenses.free; + }; + }) {}; abyss-theme = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -408,12 +437,12 @@ melpaBuild { pname = "ac-dcd"; ename = "ac-dcd"; - version = "20170323.601"; + version = "20190326.1245"; src = fetchFromGitHub { owner = "atilaneves"; repo = "ac-dcd"; - rev = "1614aa624252e3445b0392c8a9b7197084f3e422"; - sha256 = "02slswlcjh1rjc9hglvbizhvwp57xcnbhs8cmlcayw0yjwp6mnvb"; + rev = "143be7d67eeb03929f01fc04ee79db8f18f35604"; + sha256 = "1xms02m8r5n2glzrw6kp5jdnqkar46g8kpq46sg5m1x61q9ny9iq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd"; @@ -895,12 +924,12 @@ melpaBuild { pname = "ac-php"; ename = "ac-php"; - version = "20171201.134"; + version = "20190406.716"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "f489da3ceb04ff6efd9da5c5f56d71f49966e1d4"; - sha256 = "081v4srqzzwd8v07z013m756qrxll5fpzwf8km0686nc5gcg6q9l"; + rev = "bd5aa196a4ece8fd5f606fdbf0b27a61d5dbd4dd"; + sha256 = "1apbsa63rvnf0jczrpvn9jxvgam8sn2lhzlxapn9b6pwgivlps4x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -914,7 +943,6 @@ }; }) {}; ac-php-core = callPackage ({ dash - , emacs , f , fetchFromGitHub , fetchurl @@ -922,24 +950,23 @@ , melpaBuild , php-mode , popup - , s - , xcscope }: + , s }: melpaBuild { pname = "ac-php-core"; ename = "ac-php-core"; - version = "20181225.2341"; + version = "20190406.1615"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "e270e65338d5e57d0df4e167d39cd7c11537f385"; - sha256 = "16ahvzqlbla7qid7xq0s6g1s8pfxxixvjq7vh0v2w5c1rvqc2vb7"; + rev = "998313d7ebb775261b64a5347697d4926c75d3f1"; + sha256 = "1lin8lsgmb31vn2rcry1bpmjgrwz4cjccdn7vyf96klw5a49a4wg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn"; name = "recipe"; }; - packageRequires = [ dash emacs f php-mode popup s xcscope ]; + packageRequires = [ dash f php-mode popup s ]; meta = { homepage = "https://melpa.org/#/ac-php-core"; license = lib.licenses.free; @@ -1280,12 +1307,12 @@ melpaBuild { pname = "ace-link"; ename = "ace-link"; - version = "20181210.654"; + version = "20190406.1944"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "19dd9c3363c6ff03b7f710a85b8fbbd646cc06ec"; - sha256 = "1yf2kw6q209ckfb5ckfy87pbsx1wa74ypig7dml15dccnivrjv5c"; + rev = "30937c6fe1ffe016dc0387f3060f67eb8b5d229a"; + sha256 = "09l9zzs2bskf1mmlykjcqpw4vgnlxmq9qf0d78m1ngq7c9ymlnqw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1308,12 +1335,12 @@ melpaBuild { pname = "ace-mc"; ename = "ace-mc"; - version = "20160408.1737"; + version = "20190205.2349"; src = fetchFromGitHub { owner = "mm--"; repo = "ace-mc"; - rev = "b106bf6a6c78c3e026fbe9a99a34d6239adce4fd"; - sha256 = "1zgmqgh5dff914dw7i8s142znd849gv4xh86f8q8agx5r7almx14"; + rev = "6877880efd99e177e4e9116a364576def3da391b"; + sha256 = "180licc7w5b6f42ifwvllbnmf3aq8cbr8jhkbk37lzick4sv10d2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62e3a5f23ce219b16081cb0bba9fc4699e11fafa/recipes/ace-mc"; @@ -1335,12 +1362,12 @@ melpaBuild { pname = "ace-pinyin"; ename = "ace-pinyin"; - version = "20170430.2326"; + version = "20190122.2002"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-pinyin"; - rev = "a9df88c1e6a32a4f4895acbb8c45383693c494c1"; - sha256 = "18xi669c15k0m1wb7x231ch1kzqgpi4nm54c42ajrkfq7l8kxq8w"; + rev = "4915b2413359d85002918e322dbc90c4984b4277"; + sha256 = "1yv3445p6w10wj310ffla2ghh81fynwgmxpsfkwgbcsbcjx9hmsl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ace-pinyin"; @@ -1388,12 +1415,12 @@ melpaBuild { pname = "ace-window"; ename = "ace-window"; - version = "20181220.646"; + version = "20190326.242"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "2e3b9562b52e3ce2def3adf32f5ec8fe77f573d6"; - sha256 = "148wsl1qs42lp748g9rvs6wxm9hrs0dy41rramqn56qkpx82fyhr"; + rev = "301c762f2fe36737ada479d9037776b1ec3741e3"; + sha256 = "1d8jnpb6kxvv5rfmprgfpfv3vs537pwj0y1g597yx6xdl0ilan3m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1752,12 +1779,12 @@ melpaBuild { pname = "aggressive-indent"; ename = "aggressive-indent"; - version = "20181017.1936"; + version = "20190218.1531"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "cc8da01e32684e1b75d2901400e6723b2c2d42f8"; - sha256 = "1ypsqlyka6cc8rvdmhnf62ix26hr20vlsc477g1wwd64ygvys79s"; + rev = "3803f24020ef0a656dc5345713c4964073aec9a8"; + sha256 = "0dbg4lmzq0r7pvqx0wqxdcnmqz76nk9sdbwg276cmflqj9m0q7z1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1828,12 +1855,12 @@ melpaBuild { pname = "ahk-mode"; ename = "ahk-mode"; - version = "20181113.438"; + version = "20190322.2323"; src = fetchFromGitHub { owner = "ralesi"; repo = "ahk-mode"; - rev = "fde5be2cd4a0a48dc876031fb25be82892f700e0"; - sha256 = "1fr7wc9avk5z07s5jf2bry1wx5kmcr85hmn2m54wj7ryv5gm30d9"; + rev = "66e02a3b44d672787b1f13a30008801a9efca65b"; + sha256 = "15x1hwar0i89y2vbjrfp7d0b2fj48zqribfm4323k1fc18hbzrb7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/ahk-mode"; @@ -1936,12 +1963,12 @@ melpaBuild { pname = "alan-mode"; ename = "alan-mode"; - version = "20181213.652"; + version = "20190406.2255"; src = fetchFromGitHub { owner = "M-industries"; repo = "AlanForEmacs"; - rev = "d2cf2d80df55b0689ac13f1ad2c707987741ae37"; - sha256 = "07xl4mvjyjcvlyqcziqzrxn8dm8gs01a44qn0x3fmmk8icm8im4a"; + rev = "a5a705b64230bb14ad1d19bcc0613e3261e8cbe5"; + sha256 = "1jhsrb26fpm9yykp974rx77ika76zq3gq7pcjgixw4d4ga737d95"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e52314db81dad3517ab400099b032260c3e3e6f/recipes/alan-mode"; @@ -1963,12 +1990,12 @@ melpaBuild { pname = "alarm-clock"; ename = "alarm-clock"; - version = "20181121.348"; + version = "20190211.2107"; src = fetchFromGitHub { owner = "wlemuel"; repo = "alarm-clock"; - rev = "925c39b2fc1bd782c43d387831a42c37b4173c9e"; - sha256 = "0hj92gwnlafj2bv8wlz56sp7hr4wiwfl1dh509wmssl4j3h3p5wp"; + rev = "d5706ace823f75136107c09c6dad79df7c3b290e"; + sha256 = "1jaagkzfdn9z1plw7ky7gabp45gv0a0gap2a55is1i9cyy83kzmw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440fe05fa0d10d54e9c52e2e54e71a1321325376/recipes/alarm-clock"; @@ -2046,12 +2073,12 @@ melpaBuild { pname = "alect-themes"; ename = "alect-themes"; - version = "20181220.1135"; + version = "20190203.1312"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "0c4c26331c7c8349f9751d23d62df8758a693f94"; - sha256 = "0ravnjn0jijai3wdl2fx2p9i48hk5i3ddbhrmv1fi0bgazxr590g"; + rev = "588eb9ef66c319705a4d94003eacd90ad9de29c2"; + sha256 = "16ycqbd8g1gv8y5qk0j1q2ka4lfbgqpcdfa0mshjmfnw0kjvyshc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -2074,12 +2101,12 @@ melpaBuild { pname = "alert"; ename = "alert"; - version = "20181022.1042"; + version = "20190227.918"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "9f329be87820474925f29b52a1131084c8ea95b9"; - sha256 = "0lc0p5cl4hfrzw1z2ghb11k1lvljn5m08jw5fmgwgxv667kwh49r"; + rev = "a53e39e2fcd14fd0c04db9b27776831f04593b7f"; + sha256 = "1zlnp0hg6sc3n252ca6kgnfyhxgv1b389h4qszp31jg6fwp3jgpm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -2179,12 +2206,12 @@ melpaBuild { pname = "all-the-icons"; ename = "all-the-icons"; - version = "20180125.757"; + version = "20190320.1109"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "52d1f2d36468146c93aaf11399f581401a233306"; - sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"; + rev = "f996fafa5b2ea072d0ad1df9cd98acc75820f530"; + sha256 = "0yc07xppgv78l56v7qwqp4sf3p44znkv5l0vlvwg8x1dciksxgqw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -2262,12 +2289,12 @@ melpaBuild { pname = "all-the-icons-ivy"; ename = "all-the-icons-ivy"; - version = "20180826.1316"; + version = "20190114.49"; src = fetchFromGitHub { owner = "asok"; repo = "all-the-icons-ivy"; - rev = "7baba16410e78ca3c7a564c3731baa75b2e8d93a"; - sha256 = "0whd8ywsy88g5y068n1z7s3d6yh62jgylf03rg1rp1mf6x6j2m16"; + rev = "5d9c6bd5e6484398dd596663d0afe4be730f6f9f"; + sha256 = "1d5jw9afpcs8g274fxd6zapxdg5wy096xv99y7r9ykbkfbfl6wz5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy"; @@ -2322,6 +2349,34 @@ license = lib.licenses.free; }; }) {}; + ammonite-term-repl = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , scala-mode }: + melpaBuild { + pname = "ammonite-term-repl"; + ename = "ammonite-term-repl"; + version = "20190228.2316"; + src = fetchFromGitHub { + owner = "zwild"; + repo = "ammonite-term-repl"; + rev = "c5c1f6e2491282983cf55573b48a3e8de06aaae5"; + sha256 = "061qvm6jqydsv7bgwcbaxh1d8ck3nab1szlql0ass1hsak6g028i"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a/recipes/ammonite-term-repl"; + sha256 = "004cvhyh4afgpb31m1q31g98x8c9m6lmsb5fzc4a1r5pb4p3iimp"; + name = "recipe"; + }; + packageRequires = [ emacs s scala-mode ]; + meta = { + homepage = "https://melpa.org/#/ammonite-term-repl"; + license = lib.licenses.free; + }; + }) {}; ample-regexps = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -2436,12 +2491,12 @@ melpaBuild { pname = "anaconda-mode"; ename = "anaconda-mode"; - version = "20181209.2016"; + version = "20190111.724"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "0f8e86f723c2ef172947a94735c970065788f39b"; - sha256 = "0cf0dqsk9mf9gn0a9f38c75x13jr5mkdqyqccv2qs2z54q2yfydl"; + rev = "af1b59d25044901b2db1612ff284fc7b4a7756e3"; + sha256 = "1jxr4gq4vwybb50pwnfkgmhdxaqlvr029vfa5hagd8d9n5ahpypa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2486,12 +2541,12 @@ melpaBuild { pname = "android-mode"; ename = "android-mode"; - version = "20181016.9"; + version = "20190109.214"; src = fetchFromGitHub { owner = "remvee"; repo = "android-mode"; - rev = "f8cabafaa266b56fcf4b3c6942b3ae062735251a"; - sha256 = "0npx54w565mkxkgkpv02dgmfc44i1256p0w331pf3nfxq145xh27"; + rev = "d60c88bfbd2dc5122bd2fde7dc11ec1e6848a5db"; + sha256 = "1hd7wxp8f67cnbyjs4bv9x18nvzn16qjy4pi7bkbcymfpwj33r38"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; @@ -2803,12 +2858,12 @@ melpaBuild { pname = "ansible-vault"; ename = "ansible-vault"; - version = "20181116.906"; + version = "20190126.1136"; src = fetchFromGitHub { owner = "zellio"; repo = "ansible-vault-mode"; - rev = "d16389f44a4e76a12c789fe65df20692c7113685"; - sha256 = "1gppgqsnn5qfhjzfkdy5br5p0k3f7v5mpigcmzzqmjniz49l0015"; + rev = "4fe490f524b79748c9f23026bb88d8f516b4ef40"; + sha256 = "17kbjlssxa9b2fcp8vf2xs2k5y6jgpw277mj2gbv173b0i7v1fjd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; @@ -2954,12 +3009,12 @@ melpaBuild { pname = "anzu"; ename = "anzu"; - version = "20161017.907"; + version = "20190303.901"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-anzu"; - rev = "799f26ee0e3ce598b36983f4dce539f47739e656"; - sha256 = "1rpdw0vxss071kb995xyihdx21dv18d9cn666jvsy43g49fb803p"; + rev = "592f8ee6d0b1bc543943b36a30063c2d1aac4b22"; + sha256 = "123zbnl36vi0gkffd6m6mkskhmjmm0am23j45w1mbmfyq03r1d8b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anzu"; @@ -3029,12 +3084,12 @@ melpaBuild { pname = "apel"; ename = "apel"; - version = "20170122.1458"; + version = "20190407.356"; src = fetchFromGitHub { owner = "wanderlust"; repo = "apel"; - rev = "339eb28ffae3165255a79de9b1fd362f43cd37c3"; - sha256 = "1f0zxydh2pkwbjx5bh1bzl3r5g50vqg18azvqkvv9r0nn42hkhmi"; + rev = "d146ddbf8818e81d3577d5eee7825d377bec0c73"; + sha256 = "04ic76gzn3m4rnmm2xjc72vrxazxjvsjabd3lbxvwj6c1fb11fnw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apel"; @@ -3181,12 +3236,12 @@ melpaBuild { pname = "apropospriate-theme"; ename = "apropospriate-theme"; - version = "20181220.1306"; + version = "20190403.1132"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "140284fdf2f235d0b899857b3ef5b5be49c19f7c"; - sha256 = "092632myvpsndbr2psvm3slsb0farpzn4icdwnl3p2xfl3fdpmyl"; + rev = "ad27279e7bf883aa7bedec21593d5453bc3963c3"; + sha256 = "1gww774v82nc74hqlclcd0i2ajciha81vh0r7j126a4wv7zxwdns"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -3224,6 +3279,32 @@ license = lib.licenses.free; }; }) {}; + arc-dark-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "arc-dark-theme"; + ename = "arc-dark-theme"; + version = "20190314.932"; + src = fetchFromGitHub { + owner = "cfraz89"; + repo = "arc-dark-theme"; + rev = "ee17dcca35dd0304145efc468b3f25af6907a59d"; + sha256 = "0cfj5c6rz68095wxs8m733lwc5ymbgi5v82drxhjqcascvrdr1v1"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c9060669b262f0588643bd8758edac578834bc/recipes/arc-dark-theme"; + sha256 = "0a61kxdyzm6gf8gf8fniqz5mqkxk24k8hpxww3996v9mqs1bn05s"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/arc-dark-theme"; + license = lib.licenses.free; + }; + }) {}; arch-packer = callPackage ({ async , dash , emacs @@ -3318,7 +3399,7 @@ src = fetchFromGitHub { owner = "stardiviner"; repo = "arduino-mode"; - rev = "e39cb1c02acb6676aea35f93fbd0d86badce6a38"; + rev = "8805fe64ea6aba51dacb0d8c9e8e2ca2cac3ccf9"; sha256 = "1sg6n4ys5lq2m7q876qi88r11c08y05ggyv9r85ahins2pbgbv95"; }; recipe = fetchurl { @@ -3650,12 +3731,12 @@ melpaBuild { pname = "atom-one-dark-theme"; ename = "atom-one-dark-theme"; - version = "20181010.648"; + version = "20190107.821"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "8cba629dce7a2c53c690337915fdcaa80b4af769"; - sha256 = "1ajfw5mr6mm5qmxlmw09k8i4cpx6jchgxrpmrgnk17h04r5fznmk"; + rev = "8714ebcb8f35a4a07fa98666eee2727f860da53a"; + sha256 = "1z2w3szxwvgzqlg8zbdaw3jancyg421zawcgc317dyx7dryrpb5j"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3708,12 +3789,12 @@ melpaBuild { pname = "attrap"; ename = "attrap"; - version = "20181216.1024"; + version = "20190207.610"; src = fetchFromGitHub { owner = "jyp"; repo = "attrap"; - rev = "62494c4bf0be556e827b23b14b48f09c8990ae3a"; - sha256 = "095qsj0h8cig9mbhlfjbh4i55lngs02vkgnv1jbyiphhz53f2k11"; + rev = "3b092bb8f6755a97e6ecb7623b9d2dde58beba4a"; + sha256 = "05d32980saji8ja1pcv65l0s3dq7w0n5hpikbf246hciy1x067pp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap"; @@ -3865,12 +3946,12 @@ melpaBuild { pname = "auth-source-pass"; ename = "auth-source-pass"; - version = "20181106.548"; + version = "20190113.2049"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "63c0631896b2f2ed6b359e026c6a7949932aa0bf"; - sha256 = "1hf9106fdkmr9kzpykbx8s0krnpgjv2w42c4ly1yxw9d5dg0kkb6"; + rev = "e572c7a5a63710ddd2f979a83a4e16d248dc65c6"; + sha256 = "1127rdyyl77yvr6gb2daa11hfbz145iw5bm6dwzd1f82qyfa58iv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e268441634a6e58a00e577d6e2292fa226c11b8/recipes/auth-source-pass"; @@ -4679,12 +4760,12 @@ melpaBuild { pname = "auto-yasnippet"; ename = "auto-yasnippet"; - version = "20181124.838"; + version = "20190326.258"; src = fetchFromGitHub { owner = "abo-abo"; repo = "auto-yasnippet"; - rev = "c2485ef58a77f0f90755275d2bc2054b6194337f"; - sha256 = "0dc6nrxayifv1h6ag1bwzaz7y47mi5zyf4qsy9yxnzig4a9jkjlr"; + rev = "2f755e20d61d7d9098e00dd01f4b6d096bdf1a88"; + sha256 = "1vf5mc19siak82fgx29n18ni7fnfc2b1k32jdssk0irk9zcjir06"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d33c0aee6a5d27217bbae28fc8f448c3badc8a4b/recipes/auto-yasnippet"; @@ -4832,12 +4913,12 @@ melpaBuild { pname = "autotest"; ename = "autotest"; - version = "20180323.1542"; + version = "20190331.1530"; src = fetchFromGitHub { owner = "zenspider"; repo = "elisp"; - rev = "24ee17ae5023362758f0762bf711d5e470dcfe73"; - sha256 = "10al1r0fs6bpz4mfikyb9rm0zgpg56n12y0mv4kz856sdbzgllcv"; + rev = "b59013510006294b5e7623522f620d5cbac95cf3"; + sha256 = "06ij30gvpf7244xsdv14qdb86nqqahfrr20gafla764w6r1il62z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7/recipes/autotest"; @@ -4988,12 +5069,12 @@ melpaBuild { pname = "avy"; ename = "avy"; - version = "20181126.905"; + version = "20190404.155"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "24b51374bef91cb24ec5993217187bf616fcb663"; - sha256 = "1164vklckc3rq22yp7z82m4z9ad2jlqxdd1f4rim0gmdj4j6wzym"; + rev = "4d52b5cb7e1c565ca8dfe9c47b54330fd1a395bc"; + sha256 = "13226jg9ndlnlvy73847rinn8wpx94jw42cj3pp84qplys9zfr2y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -5178,11 +5259,11 @@ melpaBuild { pname = "axiom-environment"; ename = "axiom-environment"; - version = "20180823.255"; + version = "20190323.1224"; src = fetchgit { url = "https://bitbucket.org/pdo/axiom-environment"; - rev = "5d6b2cd12f639c11b032185c4c5fe4f5bba15b08"; - sha256 = "1pgz24snvjii7ajha2hqqv59pjygzr60i76r4cyy0abvjxpc4xg5"; + rev = "e3444570fa081410171a089f6c118ea6627e5d48"; + sha256 = "04j18cxr5il5fmdk4habsyys2z47gbldjsfnwzy2xpb316bc5m66"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/axiom-environment"; @@ -5497,12 +5578,12 @@ melpaBuild { pname = "bap-mode"; ename = "bap-mode"; - version = "20180802.610"; + version = "20190401.846"; src = fetchFromGitHub { owner = "fkie-cad"; repo = "bap-mode"; - rev = "dde47d417473d7c8e9f78e930c35edda31def2d6"; - sha256 = "02083b66syd5lx3v5hw5ffkanqqg8jiimcnfam5pcxga2rfi1dpi"; + rev = "5e0570a4d70003aea451232358c0adb2d1a813fc"; + sha256 = "0vb8r4xar2fz5yxfsx7ss9k0vd72dypz8lgavypkb1kvvizv0h5b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b1b5885a9d5e3bda38bc8a2f987bffd9353cc0/recipes/bap-mode"; @@ -5573,12 +5654,12 @@ melpaBuild { pname = "base16-theme"; ename = "base16-theme"; - version = "20181213.1042"; + version = "20190329.1706"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "8e7cb5005fa429b8d55c7d464deff02abe70a446"; - sha256 = "091fw1vg0rgppcdsv7zvqjrlk71q2inx3dr1rh700b9kgx33hg78"; + rev = "053c9da5ad0ecbac5652bcfbf3b5d1badb9ab272"; + sha256 = "1nhirkx4ww9spqxkvdwbsf6lhj6a4ln5r0q6fjr2pdxnx7d02skp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -5748,6 +5829,7 @@ }; }) {}; bbcode-mode = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -5755,19 +5837,19 @@ melpaBuild { pname = "bbcode-mode"; ename = "bbcode-mode"; - version = "20180505.227"; + version = "20190304.1322"; src = fetchFromGitHub { owner = "lassik"; - repo = "bbcode-mode"; - rev = "ee30d43f9029e0919a06be0dde0ed16f201647c1"; - sha256 = "046rdjpsm0lmkyaiv3y59hab3m8mdcj4asz5n06vb83a5xibm68s"; + repo = "emacs-bbcode-mode"; + rev = "e16619c80ea21154b4a4ccc2e13d0077e97c9caf"; + sha256 = "0l7jygskxmbckf3xhbjzgwzkrj2m6z1n3i2l7qc9ii4i3mhpx0ai"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode"; - sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57c307eecfc0fccfdc525ce6ff63a69ff3b78874/recipes/bbcode-mode"; + sha256 = "0rrhvwb4hrg2sbjbpgdghcgrc6gwpq3vax28r5mlacn5w5x31qjb"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/bbcode-mode"; license = lib.licenses.free; @@ -5780,11 +5862,11 @@ melpaBuild { pname = "bbdb"; ename = "bbdb"; - version = "20180906.2011"; + version = "20190317.1353"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "1a6ad82b11c7059f6a19fba575146cc31c6ffa8b"; - sha256 = "0x1f1c91py5wp0npay7xv3f3qcdaak1imr2h6xpwg611mr07848r"; + rev = "e702668eb55fad2952f677cfc82898518d627bb3"; + sha256 = "167br6hfb2xshwjnbzhxzf9z09w3lficvc2kbxskgk8qjkm53hqa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -5991,12 +6073,12 @@ melpaBuild { pname = "beacon"; ename = "beacon"; - version = "20181008.650"; + version = "20190104.1131"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "07a2e9566be2a0b8f59b8ac8668448f1e250a400"; - sha256 = "1r7v4yip67rwvi75i6z0al95yjyqjk3f29fsm5kblvg9zivfbp9g"; + rev = "bde78180c678b233c94321394f46a81dc6dce1da"; + sha256 = "19m90jjbsjzhzf7phlg79l8d2kxgrqnrrg1ipa3sf7vzxxkmsdld"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; @@ -6167,12 +6249,12 @@ melpaBuild { pname = "better-defaults"; ename = "better-defaults"; - version = "20170613.2104"; + version = "20190224.1016"; src = fetchFromGitHub { owner = "technomancy"; repo = "better-defaults"; - rev = "12d9e6dbf24a8a3369b19650d74471b17b27f78d"; - sha256 = "1rx3p6syp6axnxbscg0l73yihgwdq7bdnkcrvfikz79yflxrsnmq"; + rev = "0937ac9a813632c48d114cf959768cda9676db3a"; + sha256 = "0zwixak4aysj6hckg7h7qj6ha6n7fb9v66drfpgjcg4ylg500anr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults"; @@ -6262,6 +6344,33 @@ license = lib.licenses.free; }; }) {}; + bibclean-format = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , reformatter }: + melpaBuild { + pname = "bibclean-format"; + ename = "bibclean-format"; + version = "20190302.1217"; + src = fetchFromGitHub { + owner = "peterwvj"; + repo = "bibclean-format"; + rev = "b4003950a925d1c659bc359ab5e88e4441775d77"; + sha256 = "1x5hbs9j4ms93p080267kjyqpk81il3x7q87awf6qzz5xhc20d3b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a96cc66b22e7ec145ffa3031089a3d60e77b8c42/recipes/bibclean-format"; + sha256 = "1lvi1r612jb6w0j6mbq93gk9f7hmb1pn42lfs47gvf0prmjf1zyb"; + name = "recipe"; + }; + packageRequires = [ emacs reformatter ]; + meta = { + homepage = "https://melpa.org/#/bibclean-format"; + license = lib.licenses.free; + }; + }) {}; biblio = callPackage ({ biblio-core , emacs , fetchFromGitHub @@ -6271,12 +6380,12 @@ melpaBuild { pname = "biblio"; ename = "biblio"; - version = "20161014.1604"; + version = "20190214.1907"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; - rev = "a5a68fcf677f286f205f32dc7486f6c9f66aa6af"; - sha256 = "1gxjind6r235az59dr8liv03d8994mqb8a7m28j3c12q7p70aziz"; + rev = "ff05f0b7b1d3378c570a898c6f99f787256b3d53"; + sha256 = "1z4xzrqkw9bzs0fxyddhrpyh9yflvd0d8ki2fywl9d6d5lnns3h8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fbaa8c59b0e64d13beb0e0f18b0734afa84f51/recipes/biblio"; @@ -6289,6 +6398,33 @@ license = lib.licenses.free; }; }) {}; + biblio-bibsonomy = callPackage ({ biblio-core + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "biblio-bibsonomy"; + ename = "biblio-bibsonomy"; + version = "20190105.400"; + src = fetchFromGitHub { + owner = "andreasjansson"; + repo = "biblio-bibsonomy.el"; + rev = "fbdb3ecfcd88c179a2358d7967f7ecafef725835"; + sha256 = "0awqlv1v672vz51wccmijicv4agn0gqw5xllp0pxg8djzxl8isgl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e4867fd81cf56c8a74dcc71774790aa602b068a7/recipes/biblio-bibsonomy"; + sha256 = "0xfycxsslmr5si636l9pv9w5s5hmlk3253wq2vg8dm7b7ag5gr4s"; + name = "recipe"; + }; + packageRequires = [ biblio-core emacs ]; + meta = { + homepage = "https://melpa.org/#/biblio-bibsonomy"; + license = lib.licenses.free; + }; + }) {}; biblio-core = callPackage ({ dash , emacs , fetchFromGitHub @@ -6300,12 +6436,12 @@ melpaBuild { pname = "biblio-core"; ename = "biblio-core"; - version = "20160901.1115"; + version = "20190214.1843"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; - rev = "0036495a2e0d4b02b9e957e498f9437e394d6ed9"; - sha256 = "1f0p5fgvabdpafil7s8sy82hgcfzg1skxfgj72ylv3crq36bn4vp"; + rev = "a5088a332513930ccad808bb792a5823ed44652e"; + sha256 = "0ld1190wdqnpsf4kzbr59jykcrs0dhiha18pfxd82bh6b76h534k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f086d3e8fd6a95ce198e148cd3ede35dd73fb8/recipes/biblio-core"; @@ -6328,12 +6464,12 @@ melpaBuild { pname = "bibliothek"; ename = "bibliothek"; - version = "20180429.1515"; + version = "20190124.1028"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "ffe03506694c94de0444995f973a925deccc400a"; - sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r"; + rev = "b19b37be332bada6b18d4d895edf6ce78ab420c4"; + sha256 = "0i97l8fdrjjb6dzfcqgss5yj4ibkiaxnj32sm6nyr2s7bijkvi4x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8308e72c4437237fded29db1f60b3eba0edd26/recipes/bibliothek"; @@ -6667,12 +6803,12 @@ melpaBuild { pname = "bitbake"; ename = "bitbake"; - version = "20180326.58"; + version = "20190107.355"; src = fetchFromGitHub { owner = "canatella"; repo = "bitbake-el"; - rev = "040498f9375f3b3eb67514c6497f43b77acd764f"; - sha256 = "0jpgc4ps82qwagmh3lh49m11f8b3nbjgaw9wy43q9q1mslx14hf3"; + rev = "6b65c10a88c8750694c9c9e77299450200e7481e"; + sha256 = "0xy4dqlg8d6ppwpa9l96dycag53rmzwiv68s2mzmpkcrjn023dr3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake"; @@ -6798,12 +6934,12 @@ melpaBuild { pname = "blacken"; ename = "blacken"; - version = "20181205.1239"; + version = "20190301.605"; src = fetchFromGitHub { owner = "proofit404"; repo = "blacken"; - rev = "c0fb1b4ab2f223b4a109d0f3ff1369a969c655b8"; - sha256 = "1va06fmkd32gl4br7yagw25rvrwnwclf3zxvqvx9i7958rf5lik9"; + rev = "17b48ee432d83517094635f8caaf2db1128d1db1"; + sha256 = "04202qk6jsckvwc0zwg8513wgfjrnf33cbkv03k3vzwg6zhgmn9z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken"; @@ -7061,6 +7197,33 @@ license = lib.licenses.free; }; }) {}; + bnf-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "bnf-mode"; + ename = "bnf-mode"; + version = "20190406.1326"; + src = fetchFromGitHub { + owner = "sergeyklay"; + repo = "bnf-mode"; + rev = "1dda3ef5f837959d007512d1278a02cf5babfe8e"; + sha256 = "12y4f4r6rrl4gj0ibql1dj0h4j0z5k78lbxf51d06c2y1xk4xr4b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/217bde4ccd2d68dc14b1bfee22fbc99cd4109952/recipes/bnf-mode"; + sha256 = "027pn2lvqsxyj9ii5svql2sw4xm9wrd9zy7ms8vayv737w5xd3n1"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/bnf-mode"; + license = lib.licenses.free; + }; + }) {}; bnfc = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -7523,12 +7686,12 @@ melpaBuild { pname = "browse-at-remote"; ename = "browse-at-remote"; - version = "20181209.248"; + version = "20190213.1129"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; - rev = "2ffeb5d871701df20cd82d2ec5b4fd9b6ae61248"; - sha256 = "0a81kcdxr3jk1k2i8lyi31dawwwp613hysbr3pimdf3kkkv6ps1j"; + rev = "a61bda14a84983c84e81d2135bb59e92049cdf85"; + sha256 = "1chvg9m72i888gq94crand9kkyng7gi487508nhvxsr13a6mjh7j"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote"; @@ -7761,12 +7924,12 @@ melpaBuild { pname = "buckwalter"; ename = "buckwalter"; - version = "20180107.843"; + version = "20190204.651"; src = fetchFromGitHub { owner = "joehakimrahme"; repo = "buckwalter.el"; - rev = "2aa5451c3682c268adebc6b1191a796466732f53"; - sha256 = "0g270jyf2fd3x8p0jcd86j751spfphgsmwjxl61rk1x1kiql4icd"; + rev = "d4a7785eef05491ac4eb3150b75c473480bb51cb"; + sha256 = "1i0kkn2qziakpy0ax8rc1pjdb6r881gybqhl5dwmwsd8gkfhddy5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dd38487731cc978e104afa39f8954cfc33ba27f/recipes/buckwalter"; @@ -8357,12 +8520,12 @@ melpaBuild { pname = "buttons"; ename = "buttons"; - version = "20181220.915"; + version = "20190318.1741"; src = fetchFromGitHub { owner = "erjoalgo"; repo = "emacs-buttons"; - rev = "6bfeca7216ce8fa301e6e99bd40883cc3f1d3787"; - sha256 = "1h5w97q2lz741ny33qrrvh6m0h45ch19fqlkw7kggz207klfx858"; + rev = "a14d0c21cc30d33b57481f535f2a838d65b2032f"; + sha256 = "17b6km8qvkh43g276fmv552lffd2jq5x863fc7zm7xf2khwmpwbh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b8f9437268a51654b2bebdd024c35060b078962/recipes/buttons"; @@ -8820,12 +8983,12 @@ melpaBuild { pname = "call-graph"; ename = "call-graph"; - version = "20190102.1823"; + version = "20190116.2304"; src = fetchFromGitHub { owner = "beacoder"; repo = "call-graph"; - rev = "20c18b4d1991181762ecb881134e0dcefc0d7ed9"; - sha256 = "145qxfbmqi5g5m2670hznn3glycql1m4cg36db7i18xy9c3y2kja"; + rev = "641d600c3cdb002fd99bcf8040e9c4f372cd5de6"; + sha256 = "0lbh2bhsj4xicyzcjnpp8794amaswc20ksh4qr7xcs6q8rgfpbbc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; @@ -8873,12 +9036,12 @@ melpaBuild { pname = "camcorder"; ename = "camcorder"; - version = "20160404.2134"; + version = "20190317.1438"; src = fetchFromGitHub { owner = "Malabarba"; repo = "camcorder.el"; - rev = "c96b3392c99b9f83c968bffa330ec4356c41518e"; - sha256 = "0am8asrzjs3iwak9c86fxb4zwgx5smbb9ywp0zn4y7j37blygswj"; + rev = "b11ca61491a27681bb3131b72b51c105fd996bed"; + sha256 = "11p42cmk9sj2ilpx6nnlbzff85qi0m27wk49da2ipal28wcx2452"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder"; @@ -8898,16 +9061,16 @@ melpaBuild { pname = "caml"; ename = "caml"; - version = "20181011.628"; + version = "20190121.716"; src = fetchFromGitHub { owner = "ocaml"; - repo = "ocaml"; - rev = "e52b1c65189bb7833feb72fe6b9975eda6635bf3"; - sha256 = "0pj1v4lbwnx1nviwrxvkh24k3rxhl7sj21blnqdfzyrf3hlk01r4"; + repo = "caml-mode"; + rev = "cd1142f1e6a9ad8d763688877ce76b2a7436d750"; + sha256 = "1zzsjibiyl947fir1j0swzsq7pk4l1jh8dn86by24zgcpm14gj3c"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; - sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/42667ee0d64bce19ad9081a4fae163a9655641d4/recipes/caml"; + sha256 = "0hpxvvgq9nxcbxq9dm1sia3ph2h7p07pp48jz77pr786lrw67la0"; name = "recipe"; }; packageRequires = []; @@ -8927,12 +9090,12 @@ melpaBuild { pname = "cangjie"; ename = "cangjie"; - version = "20181209.133"; + version = "20190322.434"; src = fetchFromGitHub { owner = "kisaragi-hiu"; repo = "cangjie.el"; - rev = "d37ff3c0b7e40a04c2c09fd5fb8ae1693df7ab9b"; - sha256 = "0cyry0idblgflg1i9v0jjdhxwql75zjd11qx8zy9pkw3wsjamfy6"; + rev = "f4dcb691e3bda6971cb89b07f368dd285179a8ff"; + sha256 = "0hvwaj1g1szyhjvyxhwflq45bbcvvgv391wa7qkwlxmrvvfhp9k2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed79fc972f7fe69d7bad5d1cdde3a276885a9fe8/recipes/cangjie"; @@ -9007,12 +9170,12 @@ melpaBuild { pname = "cargo"; ename = "cargo"; - version = "20190101.1243"; + version = "20190108.17"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "5462994393b01b85a76caacf9277bff431211ae4"; - sha256 = "1lzbyzri6yvqqanslvq5hbr63lpsa22g5sr2jhj377d2l57q8xmv"; + rev = "1f3bc0d10dbddabfe1974590847a1359aeb3c244"; + sha256 = "0kixkp2q8dj7gbqkmgb2jz3ihfrbyxykvfd1abh8bkxsa4zz6khm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -9784,16 +9947,16 @@ melpaBuild { pname = "cg"; ename = "cg"; - version = "20181022.616"; + version = "20190316.1506"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "emacsmirror"; repo = "cg"; - rev = "34a892aa77c9870006bae988c79f694f2e5a68a3"; - sha256 = "0jjjqy7rmr2yzjqzvhz0nxs3nvwjh4gjf8rrh3maivw0wd1l8pl1"; + rev = "9349600829ca1758306e703a649874f8c63955fa"; + sha256 = "1s3s37g99x19zxnq0xbiy95kjhm2hb09saxic2basapcp0sdfbwh"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg"; - sha256 = "0yl2w48953vym4gxcxvjfaq3jgsv5jlya9vq3iwlfxqpapd3r3k9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/be27e728327016b819535ef8cae10020e5a07c2e/recipes/cg"; + sha256 = "1xffjilr9f2s3w7j8f3clq7qvsnr0lr8gadlybpzzy8x5fbmk4n3"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -10322,6 +10485,32 @@ license = lib.licenses.free; }; }) {}; + chronometer = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "chronometer"; + ename = "chronometer"; + version = "20190304.728"; + src = fetchFromGitHub { + owner = "marcelotoledo"; + repo = "chronometer"; + rev = "8457b296ef87be339cbe47730b922757d60bdcd5"; + sha256 = "1apzb0jccw91gdynqa1722bbalzj4kp9fq25zzw1rxsrgh3mgmc5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b20fa4885e2cdc0429d988c76b365bf34d9343db/recipes/chronometer"; + sha256 = "1kgfq9srch0amdgb4cvizlrg5xqq0hkkdq85yjr2xwsljh09m83k"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/chronometer"; + license = lib.licenses.free; + }; + }) {}; chronos = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -10412,12 +10601,12 @@ melpaBuild { pname = "cider"; ename = "cider"; - version = "20190102.2219"; + version = "20190331.1314"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "0c09c9bc2972c2b4917c8e3cf526de31e59cd619"; - sha256 = "1fj7i223lf5vnbh44rih02z87crhhcaadapjkarhmqn1jrbvmmxh"; + rev = "957617895e532217ec0082faf1e80743baf5d4f2"; + sha256 = "08l7q9ms0wby8r4aagcnw3dzqp20ahagpfwc2as787gd9hs45fac"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -10634,12 +10823,12 @@ melpaBuild { pname = "circe"; ename = "circe"; - version = "20180525.531"; + version = "20190322.542"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91f"; - sha256 = "10gi14kwxd81blddpvqh95lgmpbfgp0m955naxix3bs3r6a75n4s"; + rev = "6ccd4b494cbae9d28091217654f052eaea321007"; + sha256 = "0cr9flk310yn2jgvj4hbqw9nj5wlfi0fazdkqafzidgz6iq150wd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -10799,14 +10988,14 @@ ename = "clang-format"; version = "20180406.814"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "emacsmirror"; repo = "clang-format"; - rev = "d11600d94e9aaeb807b4ab7b4ae8069d8bd5f075"; + rev = "38ee476c47c3998f04a8cba9c18d0e2f806fe968"; sha256 = "0zlw1qdchzpr93wqmkn7590w0frmhvd82jjfl1dngwa8j14pf97k"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; - sha256 = "1w2w8hhyxp73s1ziyd0n7f1yi0x46v93630xxpjnf9bgr1psfk5f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/be27e728327016b819535ef8cae10020e5a07c2e/recipes/clang-format"; + sha256 = "0v8nvgjadzmsz088q6cgli5s99z45bz9qb508qln1yips42zn258"; name = "recipe"; }; packageRequires = [ cl-lib ]; @@ -11062,12 +11251,12 @@ melpaBuild { pname = "clj-refactor"; ename = "clj-refactor"; - version = "20181224.510"; + version = "20190405.333"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "feb78480422b715ab9246648d1d4faca2a1eb029"; - sha256 = "104jwdp6awzjmivlwv7x42dr7vnhf8g7nq6h21p5l4kh1l3f95nh"; + rev = "cd6b6fb30fc5a429ff209d20af2f2f304937fe99"; + sha256 = "0bn1bianch1f3c9pps7kxmk6lradmkgqa9bfjqr864w1yrv8yxv5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/clj-refactor"; @@ -11200,23 +11389,24 @@ , fetchurl , lib , melpaBuild - , projectile }: + , projectile + , spaceline }: melpaBuild { pname = "clocker"; ename = "clocker"; - version = "20160125.1505"; + version = "20190214.1033"; src = fetchFromGitHub { owner = "roman"; repo = "clocker.el"; - rev = "07338bc4b850d262eb263ac306ae3366cac6e078"; - sha256 = "0f6qav92lyp36irdlamcxhzfd4p1i4iq18d5cmr7fgfwi894ikcg"; + rev = "c4d76968a49287ce3bac0832bb5d5d076054c96f"; + sha256 = "1wp74fmnk21n5lrpmyk9j25dc79jffbmmhbgg5avzv63az6ffkdk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dadd3f5abad2e1f7863c4d654ff065f641395f64/recipes/clocker"; sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k"; name = "recipe"; }; - packageRequires = [ dash projectile ]; + packageRequires = [ dash projectile spaceline ]; meta = { homepage = "https://melpa.org/#/clocker"; license = lib.licenses.free; @@ -11256,12 +11446,12 @@ melpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "20181119.400"; + version = "20190324.2328"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "0d2e6a6d744c31b2c0992e5a7a0eb348daa29b7d"; - sha256 = "0qal0147bl8nr6njy0a2bj7g8f0p07qi1l59ipyjj0ghza85qz0c"; + rev = "e898a949d6789acbea53fd036af786268b46c620"; + sha256 = "1hds3g0vcd12lhjjnjx7rr8xgll7vg8kxpk9hqbc72p563h1sy97"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -11364,12 +11554,12 @@ melpaBuild { pname = "clomacs"; ename = "clomacs"; - version = "20190102.1411"; + version = "20190313.817"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "b450edfe25271ff922538426f85c649f33f71d50"; - sha256 = "1shnzkici3sjm4n6q8xcxvdd3bhbi7qx8jbjcnwmccr6dwgqwava"; + rev = "461be59e5f480af292c84fd6f7d88f1f885371a5"; + sha256 = "1kglhcid32vxs8nc7j2jjbd0cbwxx2rc0y2wlhmcxpd3gsk2lwp3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -11519,12 +11709,12 @@ melpaBuild { pname = "cmake-font-lock"; ename = "cmake-font-lock"; - version = "20170117.1225"; + version = "20190324.2150"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "cmake-font-lock"; - rev = "8be491b4b13338078e524e2fe6213c93e18a101e"; - sha256 = "0h96c670gki6csqfrhlnjxkpzx0m92l6pcsdhx93l3qbh23imcmm"; + rev = "5b71ab212f272b7c62a9e7b21aa43a2533330b39"; + sha256 = "0ykk5sgxnh77qb61k39fy9vpbgv2hgv5gkh9df1jfyj5lhxxxdcq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/383a7f191c10916ad40284fba94f967765ffeb7e/recipes/cmake-font-lock"; @@ -11549,12 +11739,12 @@ melpaBuild { pname = "cmake-ide"; ename = "cmake-ide"; - version = "20181023.730"; + version = "20190313.131"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "53cda742eadb5bdb5d60ac089717154b34694fbe"; - sha256 = "1h7932f2mywghng7yacnydlwrjbrrg5rqimwas2rxdndg5zcfci7"; + rev = "bcd890250f8937bf624671cdfbe7e8a87f465f8c"; + sha256 = "08hrhcrbdl7wyflg7ijk44r5vhig383axn96vgb60nmj96iq5r8n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -11678,12 +11868,12 @@ melpaBuild { pname = "cnfonts"; ename = "cnfonts"; - version = "20180830.1428"; + version = "20190314.432"; src = fetchFromGitHub { owner = "tumashu"; repo = "cnfonts"; - rev = "6d07b14e5c04033966056dd231047f110ce925c0"; - sha256 = "01m3aw9racrdqy6dz3nyk8x6n4sggja70mh6jj30sfm5w1y8z46s"; + rev = "c31d13cc3c320fd5bf24bf8309c6d982a25c49ee"; + sha256 = "0c50xacgcbk3kbkxbg713bmaidpmkhnsb89pn9v8p8rk5nz06b89"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; @@ -11808,12 +11998,12 @@ melpaBuild { pname = "code-stats"; ename = "code-stats"; - version = "20181206.22"; + version = "20190406.1936"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "code-stats-emacs"; - rev = "71220f4e3afaf175b2ca49139c713774e49d294b"; - sha256 = "1mz1cnfcvl6zp2m32gzh37bz7sc48q5bqpzncmawq4phm172183s"; + rev = "15242297279cb0dee01fbb93ef7536e337e20bb7"; + sha256 = "1f2fmxpijggk804pa2m86z2n9kp11n4w5k83a7l2qw6c855ax8lx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20af5580926e9975605c0a245f6ac15c25f4921e/recipes/code-stats"; @@ -12094,12 +12284,12 @@ melpaBuild { pname = "color-theme"; ename = "color-theme"; - version = "20080305.34"; + version = "20190220.315"; src = fetchFromGitHub { owner = "emacsattic"; repo = "color-theme"; - rev = "f6bbc9eb7a136dd5f6e094cf1e9072b78a05e2de"; - sha256 = "1jlwz8wyilrry13pihmpa9v7zn4l4r6hrxr8qf3l7yinbhzs70p1"; + rev = "3a2f6b615f5e2401e30d93a3e0adc210bbb4b7aa"; + sha256 = "09imx996afh3j207163kg8sc92hd7wljkpban1pnn6f67bgyrvlv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90fc6a19838f8e5ffe3b96747784d2f5628f7434/recipes/color-theme"; @@ -12189,26 +12379,27 @@ license = lib.licenses.free; }; }) {}; - color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub + color-theme-sanityinc-solarized = callPackage ({ cl-lib ? null + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-solarized"; ename = "color-theme-sanityinc-solarized"; - version = "20181021.1355"; + version = "20190205.1659"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-solarized"; - rev = "fa2afc66beebdf7936b9f1391878798d6426730c"; - sha256 = "0fw2x763xfs8c8xw5ard46hc7ypfyx5nc3d3r2v17vbq19syy550"; + rev = "2c36f3ab322fe8a1e63a872c8b1d1a172cf9a8ce"; + sha256 = "09zdxcjxx4dsg672n2sf3qv233wy9rajgafbp7lr2f2q165sl8hl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized"; sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/color-theme-sanityinc-solarized"; license = lib.licenses.free; @@ -12221,12 +12412,12 @@ melpaBuild { pname = "color-theme-sanityinc-tomorrow"; ename = "color-theme-sanityinc-tomorrow"; - version = "20181222.449"; + version = "20190314.1939"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "791e282b504df36ea97b9602316be5125715a08f"; - sha256 = "1nb31dmwzzdfl07hiamzncc9x40ydsbdq27f6rzzq0q5gwflcwip"; + rev = "9b3ff865632226baaefd92852e27ad5e3dcd0c70"; + sha256 = "0dn9xsz1iwx9s398ynm8mk9xlf5yxvfbyqp9nsgfs4p8dd5cbiwz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -12342,7 +12533,8 @@ license = lib.licenses.free; }; }) {}; - com-css-sort = callPackage ({ emacs + com-css-sort = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -12351,19 +12543,19 @@ melpaBuild { pname = "com-css-sort"; ename = "com-css-sort"; - version = "20181206.859"; + version = "20190319.137"; src = fetchFromGitHub { owner = "jcs090218"; repo = "com-css-sort"; - rev = "8a6e8ba3883cfddc5f1d4149412226602efea931"; - sha256 = "0fzb1lv7l9zrgzxdmrmc34gr4wnzs4ymv2ajyxyny5iyk6wrj3ab"; + rev = "fd279a9ed89a8b9eb36e1be7764314b3b1be5e39"; + sha256 = "0nndx0xib03sqhswwvfw1cfzvh70f3qi8d7y5iqk10bpwkmansz0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5189ae21fc97f6b96024a3279a26e43ddc23ae29/recipes/com-css-sort"; sha256 = "0hga2m735lvyj1wzybgp6wh1yv98xnandvavvg7g7mscvf2sl89f"; name = "recipe"; }; - packageRequires = [ emacs s ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/com-css-sort"; license = lib.licenses.free; @@ -12508,12 +12700,12 @@ melpaBuild { pname = "comment-dwim-2"; ename = "comment-dwim-2"; - version = "20170809.1354"; + version = "20190105.853"; src = fetchFromGitHub { owner = "remyferre"; repo = "comment-dwim-2"; - rev = "8da8aba4cab4a0a1eef3aea2de219227526876e4"; - sha256 = "1bvgdm52bp39gdcqxb02bnxssmih887jgr82m3c09yfwkpnr2qry"; + rev = "3dfdd58495c46a37708344a57c5c52beca6b2c1c"; + sha256 = "08pi3y12i6wx69aj09nk5qd6lplwxq5wz3m7w5701988q39x62xl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2"; @@ -12526,6 +12718,32 @@ license = lib.licenses.free; }; }) {}; + comment-or-uncomment-sexp = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "comment-or-uncomment-sexp"; + ename = "comment-or-uncomment-sexp"; + version = "20190225.322"; + src = fetchFromGitHub { + owner = "Malabarba"; + repo = "comment-or-uncomment-sexp"; + rev = "bec730d3fc1e6c17ff1339eb134af16c034a4d95"; + sha256 = "1jhyr854qraza75hjza8fjz2s06iydmdsa61vf5bf2kj5g1bfqkj"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d1e87e59e1a7c7c7d6eab7dd6b37114e567e5c13/recipes/comment-or-uncomment-sexp"; + sha256 = "150gg1i593wgfzy0bg8jwgfc7a6hjnz84m2digjf3fpggvwv0rf8"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/comment-or-uncomment-sexp"; + license = lib.licenses.free; + }; + }) {}; comment-tags = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -12665,12 +12883,12 @@ melpaBuild { pname = "company"; ename = "company"; - version = "20181221.738"; + version = "20190402.1623"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b"; - sha256 = "16k498pgpdk4yigsv9rdzxpyhf6fpwfyil0qx08c8zibj8y8a9nj"; + rev = "5bd57455c611ce54c9acedc8c9d83a14ab4f12c5"; + sha256 = "1ny758skhg7n827583rm2m976sc9mkm2ivdrr2ibhz4ccham2d15"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -12722,12 +12940,12 @@ melpaBuild { pname = "company-ansible"; ename = "company-ansible"; - version = "20180701.1113"; + version = "20190301.1311"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "c6dc714e3a15f89671ae5e8fe668858b20ef63e8"; - sha256 = "01nly13i2bs77lrvkm26i96vrrigbxpb9cakski9fv3xrvfxq9bv"; + rev = "c31efced8a9b461de5982ed94c234fda3df96f10"; + sha256 = "0d2c3ckmwn36fwhvwfvqg86hfd2jwkg2n301chhxzs03v0mc03mx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -12874,12 +13092,12 @@ melpaBuild { pname = "company-box"; ename = "company-box"; - version = "20180607.845"; + version = "20190311.1045"; src = fetchFromGitHub { owner = "sebastiencs"; repo = "company-box"; - rev = "6e047e6fd7226a1b8292a74985db82bbccc679c7"; - sha256 = "0m6rzwg08jcr9kibzxf18rsxjb13igscjyf5zkx1cx7y16zv1i6b"; + rev = "8fc6168f2d3a0275156dd3fdf46ba496adbab226"; + sha256 = "0mmn7lzl69hmy8rlzhwqb2ffgk29mb2ybb149cdpk7ydv1h63hqn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a54879f4dd4dcb6867680567731547d604ad02bb/recipes/company-box"; @@ -12959,12 +13177,12 @@ melpaBuild { pname = "company-coq"; ename = "company-coq"; - version = "20181107.1336"; + version = "20190222.1104"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "24f33527c5917cdd4c3c139f966c49c33b21d4d0"; - sha256 = "1y956x0d42qjl6id8a3qfqaa9bzbnradii67g7bl2673kvb0lf63"; + rev = "93168e134099541a923e70f9d633c78de1aa0c6f"; + sha256 = "0qa96iq99cwlmylzbrknkg3fkhc1x4ngwlpz9rppgzlghpfb3xs7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -12990,12 +13208,12 @@ melpaBuild { pname = "company-dcd"; ename = "company-dcd"; - version = "20181212.2123"; + version = "20190115.1856"; src = fetchFromGitHub { owner = "tsukimizake"; repo = "company-dcd"; - rev = "678229f2676bdfbe588f066e9cb0e7d5eed050f8"; - sha256 = "14h6v6djc2j97j0d910vjc2vcxlg8dnb1fxp94nlldzd6vxwccpw"; + rev = "11e90949e546fcff1b1cd40887ad7b6701aa1653"; + sha256 = "1n4f2hqmvwysbb1l6c5ah58b1bq8vxznk3ysszz8rs5gpqsizqd4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd"; @@ -13025,12 +13243,12 @@ melpaBuild { pname = "company-dict"; ename = "company-dict"; - version = "20180216.156"; + version = "20190301.1605"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; - rev = "7ab6331d8095e9b93c726da754102fd708c0002e"; - sha256 = "18lfqankivzdijsklyi49a1v6nqixbmk4d1m6syqd63qj849aixa"; + rev = "cd7b8394f6014c57897f65d335d6b2bd65dab1f4"; + sha256 = "11whnjmy5dyg4wkwabpip8hqsmqys193m7aqbd7jl4hmq24hrwsw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; @@ -13329,12 +13547,12 @@ melpaBuild { pname = "company-go"; ename = "company-go"; - version = "20180427.1156"; + version = "20190202.1619"; src = fetchFromGitHub { owner = "mdempsky"; repo = "gocode"; - rev = "bf5e5d0215cbdfb334c65c2c6aca36ca89e429a2"; - sha256 = "1bffkyxj3k9dbmdlpj97lq5sih9vlm5zk4fsdzczkyiln8k5jaww"; + rev = "7fb65232883f19a8305706b4b4ff32916ffbcaf5"; + sha256 = "09yqziccv9mg5jlmhw8gslpcwwiiah0hs05nq0qnsbdnvc8bs4lr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef45683cbfe82bf8a9d6f3f1c59e3cf340accbe3/recipes/company-go"; @@ -13386,12 +13604,12 @@ melpaBuild { pname = "company-irony"; ename = "company-irony"; - version = "20170905.1346"; + version = "20190124.1546"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7"; - sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a"; + rev = "b44711dfce445610c1ffaec4951c6ff3882b216a"; + sha256 = "0s8v6kfgngpz6ic0g0l6xi6j9692xpmcamidmbk3l2blb172mggr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -13505,12 +13723,12 @@ melpaBuild { pname = "company-lsp"; ename = "company-lsp"; - version = "20181225.2309"; + version = "20190325.2253"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "7167fa4547a83d6e07196ebf0b05c384b0a9a2c6"; - sha256 = "1gxcj8mir4mdf4m4hh9napjaszcps00iyxq1rp01hnhq71iqzsms"; + rev = "4218f180688eb3ecba454d00b0e68931a0aef5c9"; + sha256 = "0pq4zxviy1cxp28dfnnrxxsi57g0d91chg1pshdhgcpcd7rb53rh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -13698,12 +13916,12 @@ melpaBuild { pname = "company-php"; ename = "company-php"; - version = "20181109.1903"; + version = "20190406.716"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "11234d073f363edff255e8632b728777e2807d01"; - sha256 = "15rinvamhzbx0n1fxwpq7nbjqgqvksgf4q8k3lkyy6ifchwiqys4"; + rev = "bd5aa196a4ece8fd5f606fdbf0b27a61d5dbd4dd"; + sha256 = "1apbsa63rvnf0jczrpvn9jxvgam8sn2lhzlxapn9b6pwgivlps4x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -13716,8 +13934,7 @@ license = lib.licenses.free; }; }) {}; - company-phpactor = callPackage ({ cl-lib ? null - , company + company-phpactor = callPackage ({ company , emacs , fetchFromGitHub , fetchurl @@ -13727,19 +13944,19 @@ melpaBuild { pname = "company-phpactor"; ename = "company-phpactor"; - version = "20181110.102"; + version = "20190402.1916"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phpactor.el"; - rev = "eda8b34a729b3acb641aafa30552c501dec27d37"; - sha256 = "1i96v9167hsw5wwmlq07kiyxqz035ianid1cj8ym17bfj0js0j97"; + rev = "5dc331636786bdcee9ce2868d4d313c40aca1303"; + sha256 = "0qwklrsd8hxjvcddjj4ks3p24nyc3rcsxs9hyn3jphxww2igjbiv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc6edd22befea0aee9b11bc8df7d42c400e12f43/recipes/company-phpactor"; sha256 = "1a6szs85hmxm2xpkmc3dyx2daap7bjvpnrl4gcmbq26zbz2f0z0a"; name = "recipe"; }; - packageRequires = [ cl-lib company emacs phpactor ]; + packageRequires = [ company emacs phpactor ]; meta = { homepage = "https://melpa.org/#/company-phpactor"; license = lib.licenses.free; @@ -13812,12 +14029,12 @@ melpaBuild { pname = "company-posframe"; ename = "company-posframe"; - version = "20181222.18"; + version = "20190313.528"; src = fetchFromGitHub { owner = "tumashu"; repo = "company-posframe"; - rev = "91e8ce6823d1174399f8908e2f70ebcb693aa56d"; - sha256 = "0d1qmc0km4hkbhsab66901gjcq5v7qvxzhx77n49vc59q68jnqaf"; + rev = "74091d132dea4b6ccd98c1ce7cec1b76b0ab8ad3"; + sha256 = "1jzaj3fjgplmzsxvmqh8z93filkk171ki8sk7iz9g44j0w7vmm38"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68c1203ae710e5f7af3f0e5e2877aba6deaf1ac8/recipes/company-posframe"; @@ -13840,12 +14057,12 @@ melpaBuild { pname = "company-prescient"; ename = "company-prescient"; - version = "20181220.1624"; + version = "20190212.2235"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "c395c6dee67cf269be12467b768343fb10f2399f"; - sha256 = "0zh0g9vxgqbs48li91ar5swn9mrskmqc0kk7sbymkclkb60xcjs9"; + rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e"; + sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient"; @@ -14475,12 +14692,12 @@ melpaBuild { pname = "conda"; ename = "conda"; - version = "20181107.1151"; + version = "20190129.1002"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "ac304a85a1af2e0fb180a3fbe7989c26a5cfee37"; - sha256 = "1c0nl0wfz16qyaq7w4w31kb91ryadyi8i3zx6bsdbh8xbnngl7cy"; + rev = "bc2f133d15e037e9dd24d61af734784b4b0d916d"; + sha256 = "01iikrgljci3hv0v12dn07aqfq2yqky77h8kv48yv787gmlcx181"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -14607,12 +14824,12 @@ melpaBuild { pname = "conllu-mode"; ename = "conllu-mode"; - version = "20181222.1056"; + version = "20190214.1317"; src = fetchFromGitHub { owner = "odanoburu"; repo = "conllu-mode"; - rev = "b301934e852bac8942f671998cfcac669c7ea97c"; - sha256 = "15jfbs5k5anxbcsadvb1sz5a3vm96f976c1iga4k16jz16mkhjxa"; + rev = "162846e03f8ccb9dcec393dbf98e9391cca1c070"; + sha256 = "122qz6igksbxvnbkyfnbx4i4qn3sr2kspqm7z9kl8mwl5x1bxa2d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode"; @@ -14789,12 +15006,12 @@ melpaBuild { pname = "copy-as-format"; ename = "copy-as-format"; - version = "20171215.1616"; + version = "20190119.811"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "971957166fe64d914ec4be209b4f80efeeabbb19"; - sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24"; + rev = "d2376c64334fe3de65d89d6d138a2187f9bf802f"; + sha256 = "0i158bkra7zgq75j08knq2camvlhbs2v8zrsxiyp0mc4q949xysd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -14980,12 +15197,12 @@ melpaBuild { pname = "counsel"; ename = "counsel"; - version = "20181222.1925"; + version = "20190407.415"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "58bf1b94c8346491b906aa306f5ed734be67310c"; - sha256 = "14j28ffkcq485043w6pxgqrn8s8jkp50pny9jzm7ybm2wz62r7i9"; + rev = "998890460ebb2860638f2e4d761977080cdcad34"; + sha256 = "185rp0asa0plnwkafl7rxb2z78b6lmyp8jn943b5j8h3wb3wcaa5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -15122,12 +15339,12 @@ melpaBuild { pname = "counsel-etags"; ename = "counsel-etags"; - version = "20181226.212"; + version = "20190323.1754"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "0bd1bf33088a3e31c01e7f239c5cd9c0b0468ab7"; - sha256 = "1dchql9r4qs9lv71hcpy72mdx83gxmmhyxpxkg836701246x1np1"; + rev = "b8ff1b12ee6b9456969a5bd974a8ed470f1f1eb9"; + sha256 = "178idbpphsa486sas1242x954zd0vf8c1hlfhmahgsij5jjd1vyv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -15233,12 +15450,12 @@ melpaBuild { pname = "counsel-org-clock"; ename = "counsel-org-clock"; - version = "20190103.237"; + version = "20190406.2048"; src = fetchFromGitHub { owner = "akirak"; repo = "counsel-org-clock"; - rev = "07c761353a7b1ad21c9b037b22e7d2fbde7fbc9b"; - sha256 = "1c67lfpny4jvza1qm1dbc1mm47d5vff69cn4919jbb4sngnbzpfp"; + rev = "ddf6b89652e4dbc0be5e8719213e7673c83959f1"; + sha256 = "1fd8ll7jcfmy2dhhhsqh1l6wqfklma54bqpb4jnxmdn2w9p3ndmn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d21e10ba82b4ae0f8101031be16bc5f7e80ba5d5/recipes/counsel-org-clock"; @@ -15287,12 +15504,12 @@ melpaBuild { pname = "counsel-projectile"; ename = "counsel-projectile"; - version = "20181226.714"; + version = "20190325.156"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "b3ea4f242d58ff9b903ece4b0e2513d6aed41578"; - sha256 = "0cakmwfgjp5ibasdjlm6jrwnx1b3c2i2w2rbh9dhwx2fs9p30l07"; + rev = "fb19569c9799e3edac7504d21a5ecf49231e9500"; + sha256 = "0n9rjqhplapxiwja5dap03frdvbd6y4i5q4ballmyrgg5pnc8l5k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -15341,12 +15558,12 @@ melpaBuild { pname = "counsel-spotify"; ename = "counsel-spotify"; - version = "20180319.2022"; + version = "20190406.1325"; src = fetchFromGitHub { owner = "Lautaro-Garcia"; repo = "counsel-spotify"; - rev = "9033e207dccdfea7fe590d2e102d50fcd2bd22e3"; - sha256 = "00mjcp3x558gh7f8yrj8y4ivq3pvml7y46rms8xah5zxavg6q52b"; + rev = "f484e6efd3994704cfd16c87c298fbfa12d442cc"; + sha256 = "0b5hykw3n96f0m50176hk639sbzdykhnp52xlp8g6l7p807x27w9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify"; @@ -15368,12 +15585,12 @@ melpaBuild { pname = "counsel-tramp"; ename = "counsel-tramp"; - version = "20180910.1857"; + version = "20190124.2351"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-counsel-tramp"; - rev = "5e3345f3d11f965e80763a3f68dca8a05f597224"; - sha256 = "0rjkgf5idbnkjscmg4n8wvwh2s7dpj0ic848icil2xhc4i189z7k"; + rev = "ac7728bac51afdcb63cd85ad22a8be5737d9d66f"; + sha256 = "0nz0733x2b9b5nkwivvhv5c8747dng451na1sdfbkx5x9fjs5gc7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; @@ -15580,12 +15797,12 @@ melpaBuild { pname = "cql-mode"; ename = "cql-mode"; - version = "20160720.2039"; + version = "20190314.1925"; src = fetchFromGitHub { owner = "Yuki-Inoue"; repo = "cql-mode"; - rev = "2529ade55c125a89d8215f096a74733a90611c5d"; - sha256 = "1ikmz037bv7h0bjrr8qia5g127a0vd223y04ndbyd950gqc1lx4h"; + rev = "d400c046850d3cf404778b2c47d6be4ff84ca04b"; + sha256 = "016fs984fbn9k6q17mpxq8gbpspai71r52da8aq31f3jijxmrh5a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1084dd0ec0f2e8fe6fa8e97b322833c14e8e59d1/recipes/cql-mode"; @@ -15608,12 +15825,12 @@ melpaBuild { pname = "cquery"; ename = "cquery"; - version = "20181203.1029"; + version = "20190117.2142"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "fd4f226b3ded297e3279b77bffc5fd9d5bce37c5"; - sha256 = "0ma6gqndy6n2bx37gw506p9flhp6kcczzkj4mfhzv3s9rklijhdp"; + rev = "555e50984ebda177421fdcdc8c76cb29235d9694"; + sha256 = "1d1m1lgc93fkg7dxb8d6ch68vh6w1zp3yy31bv78vaz8siqrmk16"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -15811,6 +16028,32 @@ license = lib.licenses.free; }; }) {}; + crontab-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "crontab-mode"; + ename = "crontab-mode"; + version = "20190304.623"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "crontab-mode"; + rev = "090ed61e919df6391df45a7645a0d8d5b0dae1cb"; + sha256 = "1yz9vvh2x6s2y02n1z8aqgb40bxgs2s2mxmy1vmp2piffq81d09y"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0831d0f869cad4681b22296225307aa5bf185f3f/recipes/crontab-mode"; + sha256 = "1lwkj5c8435xgqi9d4zgnp9dzi06byibf69fv9p3x79kv565g3gd"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/crontab-mode"; + license = lib.licenses.free; + }; + }) {}; crux = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -15844,12 +16087,12 @@ melpaBuild { pname = "cryptol-mode"; ename = "cryptol-mode"; - version = "20180321.1108"; + version = "20190130.1344"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; - rev = "91f8ad617e5db2fad57a7be1da211f22f3b51550"; - sha256 = "12jd2wc5icnkbvxjam7kgr8bdjavxjsy79vwi0hi3gzwiirx4ifg"; + rev = "1d6bc05380481056b0615670a890a8234d997da9"; + sha256 = "04cicqwmnwq80jydvgax27nyw8vxfcz5aiqlnslj36mh9qbjr01g"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; @@ -16001,12 +16244,12 @@ melpaBuild { pname = "csound-mode"; ename = "csound-mode"; - version = "20180925.1114"; + version = "20190321.859"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "9bc2d0badf8316cca2d167348bb81a82e34297c8"; - sha256 = "0r8c82wp1mpx8xvycncni02vymhr81jnxrqi6rr1majpgan5jvb5"; + rev = "f4bc9236bbc5a696f7ff32d9402749536a332546"; + sha256 = "0ds6cigm3pncsa5blqzfgisjn9v898ayj6nq2va6ssg73k0qfx1r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -16404,6 +16647,32 @@ license = lib.licenses.free; }; }) {}; + cyberpunk-2019-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "cyberpunk-2019-theme"; + ename = "cyberpunk-2019-theme"; + version = "20190228.653"; + src = fetchFromGitHub { + owner = "the-frey"; + repo = "cyberpunk-2019"; + rev = "77f41d0c15c59e13f11af5d285707dd21e72e342"; + sha256 = "12gray55ifv98ysyqsa51xh4w2yis0gki9blpvcbac02sm5xysgm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1821a436d3d9f7c46cbd198f93951aa35bbf6ad7/recipes/cyberpunk-2019-theme"; + sha256 = "09bg3avrsca308y3g86mrzi6klzr4ky8k5y2nbsmwarrarv29qyy"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cyberpunk-2019-theme"; + license = lib.licenses.free; + }; + }) {}; cyberpunk-theme = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -16411,12 +16680,12 @@ melpaBuild { pname = "cyberpunk-theme"; ename = "cyberpunk-theme"; - version = "20180608.2209"; + version = "20190109.1600"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "f8967e46b8bdb3eaf7b72474f2d70997dc1152e9"; - sha256 = "0vrkb07vh5b1azih86s0j917frdp5g6qg1pipddcr6lacgb7n0zl"; + rev = "eb7b21b5655af9a0fa8c745ee1f16f8e073364e6"; + sha256 = "1si63j3mm36lfhiw5pnlv24ffg4ghicd1q7gi5jl2mp9105vs627"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -16563,12 +16832,12 @@ melpaBuild { pname = "cython-mode"; ename = "cython-mode"; - version = "20180213.854"; + version = "20190111.1350"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "9f3f99fd6378ffb17976d74356fd3ba7e22f85b3"; - sha256 = "164ksml3i5gmcwripjsn5byfvnnjf86wrkkd9saw481ym6imii3c"; + rev = "1c6ab8b7fe1f80e1ffc2c105b8202f1eba230f53"; + sha256 = "1f16ivvpnxmc47v0yblrmva8cpkj4fw3q8ya2hrdmbzbjlzfxlgi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -16691,12 +16960,12 @@ melpaBuild { pname = "daemons"; ename = "daemons"; - version = "20181231.1157"; + version = "20190202.728"; src = fetchFromGitHub { owner = "cbowdon"; repo = "daemons.el"; - rev = "a64a4e55666afea6f5bc8e4b7b08bafdab7c7d04"; - sha256 = "0w9hicarnv517ca93hd7dp5xi3pfm8plv2zk64w9f4kapx6xinkf"; + rev = "fd7925b0c113e5bad2e4692430ce049405794910"; + sha256 = "07l8k41ly92m3wkzlzyb9nmq4pd34xkpn7cjrdap7zfppd3iiq2r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1f780485e72ae2885f698fdab0156855f70831f1/recipes/daemons"; @@ -16766,12 +17035,12 @@ melpaBuild { pname = "danneskjold-theme"; ename = "danneskjold-theme"; - version = "20181101.57"; + version = "20190222.200"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "5c55c2ced259e8bbf658b23fc0cb74946caa009e"; - sha256 = "14zrqvfx4243qd1ziqm76irnwgn00dh94qicl1f8bdksyiaz2mvr"; + rev = "1a341399df66d008965fddb6348ae86d7e96d268"; + sha256 = "1cbrjqh8p4ia2psw0v0qvvlmx9g567b7xmwqgjm58x8x38003ym0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -16784,7 +17053,8 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash + dante = callPackage ({ company + , dash , emacs , f , fetchFromGitHub @@ -16798,19 +17068,19 @@ melpaBuild { pname = "dante"; ename = "dante"; - version = "20181231.454"; + version = "20190320.154"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "64e667acdd7efec329bf3049e99418858a13fdff"; - sha256 = "07sxpjcbgzvaac549plhalxkmhp0sd7d5ibmb95ldc3mshgg0y9n"; + rev = "d6be8fa2d49ac73b34578736ca6340573bbcb68a"; + sha256 = "1lhzdvgy4jkzfx4p3cnprb68wray2d36x0aqcnw5g2dw7w6vc7fz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "recipe"; }; - packageRequires = [ dash emacs f flycheck haskell-mode lcr s ]; + packageRequires = [ company dash emacs f flycheck haskell-mode lcr s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -16831,16 +17101,16 @@ melpaBuild { pname = "dap-mode"; ename = "dap-mode"; - version = "20190102.1124"; + version = "20190403.1040"; src = fetchFromGitHub { - owner = "yyoncho"; + owner = "emacs-lsp"; repo = "dap-mode"; - rev = "8f07efcee5b46e580f9b7e511f52b5ea20607b07"; - sha256 = "10gh8gyrd7lxv4lc0l3s40xs5k9pbdgws4gimnw5z3fq23bnvndd"; + rev = "f8f0f005f536ff22f6ca935dd804fa9ecb134d6a"; + sha256 = "09ff6835aflmx0s1dj7bgn1m146c9cnd3j7dh54jrx1mcvywqrx4"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a50eb6f60824a0eb9baacd694274a1042ffc66ec/recipes/dap-mode"; - sha256 = "1vxqgi50wa151k1gc8ja8nma1v2qrinp26lwrn2w2jlihh1jpb3f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/67942b34975015dd6f2b5f6b43829cc13b1832c6/recipes/dap-mode"; + sha256 = "041mmla70ld5783gn8g360klk3cw39pir5d41544zf3yssk12qpn"; name = "recipe"; }; packageRequires = [ @@ -16865,16 +17135,16 @@ melpaBuild { pname = "darcsum"; ename = "darcsum"; - version = "20140315.2110"; + version = "20190316.1515"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "emacsmirror"; repo = "darcsum"; - rev = "5bb38e444cc12940c6933a43792a89accdc2ad0e"; - sha256 = "11h2i0wn118anb9n3kab2hsv78zpiw4d95jal7c9xzhv6xxrz4g0"; + rev = "6a8b690539d133c5e3d17cb23fe4365fbb6fb493"; + sha256 = "1ajdm0p8rdyaqy0wwfslb1mqj9b2dpk8xkljjw6ddacph5hflhcm"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/darcsum"; - sha256 = "0p3hwmwjjqwgkjws5b7gkad4yxh0gs2hr03ar18y43yahwgihvnv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/be27e728327016b819535ef8cae10020e5a07c2e/recipes/darcsum"; + sha256 = "1qr3jh05awxxh2qi1sv542vkryfja44zswa5wxwj7g2dr6ck9jr1"; name = "recipe"; }; packageRequires = []; @@ -17067,12 +17337,12 @@ melpaBuild { pname = "darktooth-theme"; ename = "darktooth-theme"; - version = "20181013.206"; + version = "20190201.1716"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "780f9e25ae4abccab4e053f2caba7add4bc9d3be"; - sha256 = "0y19dzr9qd5qxvp8yjgrcawji7ahqcpqy0cbyy4hjbzi48si6126"; + rev = "507853d70d14201b108432b697fdcd3785fc006e"; + sha256 = "0ly3v8a80b31ffmzvr3h0x4igr1bgcpi92wbxj86r3z1c05s31rp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -17097,12 +17367,12 @@ melpaBuild { pname = "dart-mode"; ename = "dart-mode"; - version = "20181230.1856"; + version = "20190308.1714"; src = fetchFromGitHub { owner = "bradyt"; repo = "dart-mode"; - rev = "36fe2ce002e616e8ba69eb9b7cb20959023861c1"; - sha256 = "0lmlxlwnssqhcrin7jl9fgxg9sgqn7qgc3d5zq2y27kam8mbnar1"; + rev = "d5776f1e9bfeb45eb30723eba3030691a8491545"; + sha256 = "0dlkzfj1bvd62qqfj3wc46gbyg82cw995zsb7jyc8ziz9n1a383z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/dart-mode"; @@ -17122,12 +17392,12 @@ melpaBuild { pname = "dash"; ename = "dash"; - version = "20180910.1156"; + version = "20190320.706"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "6514359b8606a6a9a94068ccd601fcd6379d6584"; - sha256 = "0s90f0j7x194k0w1iryd2clrvx992l9cy54w2iq83nw1z40fbg0i"; + rev = "677c1561142db89cb151f50ce21f24096ca1a328"; + sha256 = "0183iaipz13n5ga80qy49q25h7hj8bs7sz68547hn46zlnnwnbih"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -17201,16 +17471,16 @@ melpaBuild { pname = "dashboard"; ename = "dashboard"; - version = "20180902.1148"; + version = "20190320.25"; src = fetchFromGitHub { - owner = "rakanalh"; + owner = "emacs-dashboard"; repo = "emacs-dashboard"; - rev = "caef4564d50cc00b748d98f6180f26d4036cc8c6"; - sha256 = "1q1q3ns7729icyp05dq2kvjall93wc85ws0d480fjk36vf4fc9dw"; + rev = "17accfce424a18c4120ad99dfc1d7d93591dbce0"; + sha256 = "0f40xj3wchpj3g9pv15f88vy86d0vllbwr1xli0yfv326lm0j97r"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; - sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef3c6af6ff5d880e6336f8db32b22b64b182794e/recipes/dashboard"; + sha256 = "19l7mv57ra3i8bz35zfq0wrrp8mk0bzhng6wqpbf9dax4pq3pnp9"; name = "recipe"; }; packageRequires = [ emacs page-break-lines ]; @@ -17229,12 +17499,12 @@ melpaBuild { pname = "dashboard-hackernews"; ename = "dashboard-hackernews"; - version = "20181209.2102"; + version = "20190108.1805"; src = fetchFromGitHub { owner = "hyakt"; repo = "emacs-dashboard-hackernews"; - rev = "0e30d3dfd67d87f970edd025b4739bbb286a5d8c"; - sha256 = "09bwhd7ci767nssn22nalb7k9a65iq2f5k62ap4rv4c4w3w0pv0w"; + rev = "b71814716d8f78181b9d1990f06072460de0797e"; + sha256 = "1dvv10xn2mh0nh85cd78y23cn8p9ygdhj4k7xs4fa6r7bhp0xvqm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ba74a9b76458bfd53e9cea7bd704d1488c9c98/recipes/dashboard-hackernews"; @@ -17247,6 +17517,34 @@ license = lib.licenses.free; }; }) {}; + dashboard-project-status = callPackage ({ dashboard + , emacs + , fetchFromGitHub + , fetchurl + , git + , lib + , melpaBuild }: + melpaBuild { + pname = "dashboard-project-status"; + ename = "dashboard-project-status"; + version = "20190202.554"; + src = fetchFromGitHub { + owner = "functionreturnfunction"; + repo = "dashboard-project-status"; + rev = "7675c138e9df8fe2c626e7ba9bbb8b6717671a41"; + sha256 = "1sbjrc1l57q2ifmw6pf3n105qk3q7rskqy9811qijpsbcl1m819d"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfc05873c6532c866d89c4cc07eb84b447a25c70/recipes/dashboard-project-status"; + sha256 = "1r25xmscz3lrjm6jjix416py26za5l1ck3xa77qbyrr4rf1gsakg"; + name = "recipe"; + }; + packageRequires = [ dashboard emacs git ]; + meta = { + homepage = "https://melpa.org/#/dashboard-project-status"; + license = lib.licenses.free; + }; + }) {}; date-at-point = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -17309,12 +17607,12 @@ melpaBuild { pname = "datetime"; ename = "datetime"; - version = "20181021.1050"; + version = "20190404.1137"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "178befd4881f407ad97c05fadb74589ade7297f2"; - sha256 = "12f5jv6x3lm08lz674783cqppr9khi56s028zc6bndq3qc797h4d"; + rev = "8c6d6fc991766e6bf9cefc4ea4b04eeae8116a84"; + sha256 = "0c5y304pvns8jhy4fpz4jmbfxdgz8ms04hgrnsb0g168szc9g0s9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; @@ -17470,12 +17768,12 @@ melpaBuild { pname = "ddskk"; ename = "ddskk"; - version = "20181220.1202"; + version = "20190215.1927"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "cc3abce75d196d0634270c01ced44a63e7713d8a"; - sha256 = "0c6gfaf2x7310mc8m7pfbp8xw12kna6779r7rwk0va7dr43cvsvq"; + rev = "9a5397829359e2e0f37e26701a70515c0f9fcba8"; + sha256 = "15463cf8vykh2865k52qs25awc4yv91bfk4x9swh7ccrczv0d33q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -17499,12 +17797,12 @@ melpaBuild { pname = "deadgrep"; ename = "deadgrep"; - version = "20181229.548"; + version = "20190314.1507"; src = fetchFromGitHub { owner = "Wilfred"; repo = "deadgrep"; - rev = "b663a8f27513ab68081e2bb46402b74834b5ad65"; - sha256 = "0fg64mi7kx8jpg0316dvlja71n50m5ba52zyscd92r8c2c4znqgr"; + rev = "160e7adb7f043fc42ba6d4d891ad50ef1e063be7"; + sha256 = "1sm92hj4ilq0h82fy5k5nzn7jq56yw2665ikqdcj89k9xldin6xi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep"; @@ -17600,12 +17898,12 @@ melpaBuild { pname = "decide"; ename = "decide"; - version = "20180316.1101"; + version = "20190201.1337"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; - rev = "257f0e39ac60ca375942950b44eeaee04cb9d961"; - sha256 = "0hiv3wlqidj1qd8z5jy800spzrpbca2vgq4zg1lkzvbcmhqvcqqm"; + rev = "4bfcc826dd5b1c30caec455d8baa4f363159eac6"; + sha256 = "07rwflgqlsgqrw2v7rbshrbcr1qkgsx59y904jspvj310s8bsczg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; @@ -17696,26 +17994,27 @@ license = lib.licenses.free; }; }) {}; - default-text-scale = callPackage ({ fetchFromGitHub + default-text-scale = callPackage ({ emacs + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "default-text-scale"; ename = "default-text-scale"; - version = "20180520.2349"; + version = "20190107.1218"; src = fetchFromGitHub { owner = "purcell"; repo = "default-text-scale"; - rev = "512d701df5e2079cad33329184fd7683c3b0b0af"; - sha256 = "1zwrjlaxsxx7snyvyklhrchkbqg14lhr9xk7rhhik8fp4dy4f5yj"; + rev = "f425d3765c4dea3f2e550720278f9d424579ee5d"; + sha256 = "0h42jiwxrxjmk7ccwh3h25n7dy2rq61ncm5wx27jhkncc5jdm4h6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale"; sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/default-text-scale"; license = lib.licenses.free; @@ -17755,12 +18054,12 @@ melpaBuild { pname = "define-word"; ename = "define-word"; - version = "20180706.1329"; + version = "20190128.759"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "637cd29837d4bd5567e17a11a479fd2edfb0e2c1"; - sha256 = "1gni89sgs7bnl0h42jyqcph9mhgingybwcmf29j8zm440zii5f9p"; + rev = "df1118858fae492cf476a963c1174bfada141c7f"; + sha256 = "0sspnc95y70dcms4551sg93m8998i78lnnrngr59cldr5hwzbr2l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -17885,12 +18184,12 @@ melpaBuild { pname = "demangle-mode"; ename = "demangle-mode"; - version = "20180515.1945"; + version = "20190116.1857"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "374c84a0b190f0f0ea76b956035003228077d1e0"; - sha256 = "02z2mjillglyv65ijdlc62hbjddp3xv185xg7s93xz7ymg04c394"; + rev = "b4659ca85c4f02e9043e91d71affb4a8ede87339"; + sha256 = "1rybal9rvnhp4bsdpx57zjida6c9hm44qjvp1fha7fcynjp462iz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -17962,12 +18261,12 @@ melpaBuild { pname = "desktop-environment"; ename = "desktop-environment"; - version = "20180423.153"; + version = "20190401.835"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "desktop-environment"; - rev = "62fbceded526b8e35c90803bcf80e33ebfe8473a"; - sha256 = "1j2kvdj3k9amj93w8cbh49rbf3vhnkbisw67hjhif62ajc19ip4k"; + rev = "564a0f4e8acb747f825c34e0abc6d6690f5d5060"; + sha256 = "0b8gnyhadnwppvwdlgm5fxiiawrwyf9kqxcas5hrjmlnyskdcall"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe988e0dd4a1272ecf7b2fe758ef0c81e2acad2/recipes/desktop-environment"; @@ -18113,23 +18412,24 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , reformatter }: melpaBuild { pname = "dhall-mode"; ename = "dhall-mode"; - version = "20181127.1743"; + version = "20190113.1601"; src = fetchFromGitHub { owner = "psibi"; repo = "dhall-mode"; - rev = "ca4cc8556e890c016b5dcc21e842dc5e7a8a4a19"; - sha256 = "09n5x35a1brk67qlw8qw2xxl13sk336g6xyb5xkg0m8ww0agd58b"; + rev = "b59698e9f81ef30cc784729ee4d8c719e6c21bf6"; + sha256 = "1aw6b2gkpclzahyyzxmj2025l8c82w83lz4ixxv5fk63yc9vj96l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs reformatter ]; meta = { homepage = "https://melpa.org/#/dhall-mode"; license = lib.licenses.free; @@ -18198,12 +18498,12 @@ melpaBuild { pname = "dictcc"; ename = "dictcc"; - version = "20181212.1037"; + version = "20190118.1202"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "413bd0b27c35fee75de622ff5c504b6453ca9819"; - sha256 = "061cha9yh4prqqhdvgn43b18h1sirh7l289ygckf2zqw50klx82d"; + rev = "3244897515db954eafeed9648e7a0011b89c3ce2"; + sha256 = "1nlgz3i8kynhl6d6h5rszja14z5n7ri83mm5ks90nbdhjcqwk3qd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; @@ -18225,12 +18525,12 @@ melpaBuild { pname = "dictionary"; ename = "dictionary"; - version = "20140717.2029"; + version = "20190403.1218"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; - rev = "a23b8f4a422d0de69a006ed010eff5795319db98"; - sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm"; + rev = "6edc1d0a4156d33c3da0c1649c308b809fda46e1"; + sha256 = "0g95q3yggzxr8d2gjxamfwx8xbzf182naxpb265r7v9awd35bqk5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b08ed7b90e3283e177eff57cb02b12a093dc258/recipes/dictionary"; @@ -18252,12 +18552,12 @@ melpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "20181218.1034"; + version = "20190223.1533"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "2cddce48d472111f178da84d44656f92012aa64b"; - sha256 = "1ghkkg1cp8s8q8sjfb1l523p8xpqzqgq8rwb1lcvrmf5wszm1fwf"; + rev = "84a5fe1900af2e5cc522f02749804f0d9f094bbf"; + sha256 = "1xlsg728mz3cwhrsqvisa0aidic67nymd9g7h4c1h3q63j39yb2s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -18830,12 +19130,12 @@ melpaBuild { pname = "dired-filter"; ename = "dired-filter"; - version = "20180922.407"; + version = "20190211.1220"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "65ccc2487e87b11bc7ca1c0d3118003dcfd0a71b"; - sha256 = "1fzzyp0lizk5avz96aa4k9yrabljjv69x9462fdxfpjh7hyb5zqf"; + rev = "618b2037a3fc6940894a1030863298c96362c3b8"; + sha256 = "061aadq4k7rfarp2yqzzldldr4k1g7m44jvnbsypddbnwqp6nf5c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -19187,6 +19487,30 @@ license = lib.licenses.free; }; }) {}; + dired-rmjunk = callPackage ({ fetchgit + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dired-rmjunk"; + ename = "dired-rmjunk"; + version = "20190209.1633"; + src = fetchgit { + url = "https://git.sr.ht/~jakob/dired-rmjunk"; + rev = "5d94726b4e427bb21dcc6f043bc3fcfc98b27b7a"; + sha256 = "0imxvaafxpndb3m07wd74xjn093hbib2g38kmrwxj26xkgzw60nc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/75d501ae9b64d9aa083f43358881a467a7cd2a04/recipes/dired-rmjunk"; + sha256 = "1m07z6gcsd5i1xshgfxqrpcrqpl0ffa9ls2443za5wkgbalhxx47"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dired-rmjunk"; + license = lib.licenses.free; + }; + }) {}; dired-rsync = callPackage ({ dash , emacs , fetchFromGitHub @@ -19197,12 +19521,12 @@ melpaBuild { pname = "dired-rsync"; ename = "dired-rsync"; - version = "20180906.302"; + version = "20190301.540"; src = fetchFromGitHub { owner = "stsquad"; repo = "dired-rsync"; - rev = "e112bf22c913d1491bb2149250be866ceb1806ff"; - sha256 = "0q9q2b5ffwld87zs26nkkbim9zrpp3m4vf63lnqnbfzpgybx3b5m"; + rev = "ff229a32008438a2bfce7ef6c23e8e0d7a5f0c74"; + sha256 = "0wlb27d7isclp5j2cmk31mdix6wx1cavjfnkk5306iwrbpirpv96"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce9f41ad832cef527dde97f829a8b8339e6ac48b/recipes/dired-rsync"; @@ -19224,12 +19548,12 @@ melpaBuild { pname = "dired-sidebar"; ename = "dired-sidebar"; - version = "20181111.940"; + version = "20190319.1811"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "f7782416e5e8e5018f775106dc61dd3a4e5dda84"; - sha256 = "0vl5rpdgr0p5airh7l4glc03hghb0rmjgdxgk1l1g4a58m8cbhga"; + rev = "c895f43e2ee77042f2f9596c4cde8f5f224b8403"; + sha256 = "1wrlvlrv7lh71m6jambbpcxdg0416h1w5d5y673igkp0ri87n2q8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -19301,12 +19625,12 @@ melpaBuild { pname = "dired-toggle"; ename = "dired-toggle"; - version = "20140907.1349"; + version = "20190402.2302"; src = fetchFromGitHub { owner = "fasheng"; repo = "dired-toggle"; - rev = "84efb9ec9c327e4da53cdb7cda5b51dcd0ede0e5"; - sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma"; + rev = "509bf1f3c6d5e5f9bc29f94d88127e2d82d5c6ed"; + sha256 = "1h91z38bflj1z1zy798a4ngkny2f7gp03xbf222jiyhwc9djgg8q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17ae4c5ff42e0c48e53d93c88853f649f59034e6/recipes/dired-toggle"; @@ -19405,12 +19729,12 @@ melpaBuild { pname = "direnv"; ename = "direnv"; - version = "20180513.123"; + version = "20190319.718"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "6cf079fe8171bdf4bebefe02e8353d7f13847ebd"; - sha256 = "0vw9s70h5zjz5k225mzm893sv5pdb4lz5x7fc4r98iva0wipldgn"; + rev = "8ad3672c56d65b1eacc012cc51a36ed544b4b160"; + sha256 = "02blhinkkfh3iai6j1k5swplf5mkwijy3p7wy38rnd1gnyj2z4la"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -19977,12 +20301,12 @@ melpaBuild { pname = "django-commands"; ename = "django-commands"; - version = "20181216.1327"; + version = "20190320.22"; src = fetchFromGitHub { owner = "muffinmad"; repo = "emacs-django-commands"; - rev = "eff302cbac0bd797108aafe05cc57c9e9112e381"; - sha256 = "0mvgcmniaj8nllzhm5jv68fad8m41wgadwlw54dyra99wfb30fh8"; + rev = "1b19436a1160d1552207d4356d5e78793dabe100"; + sha256 = "1zb8mf0dgdr83n61a54m5grhdr6nz75zrgwczpzfl3f66xkvfci9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd217a23a9670c7eb826360b34df1a06ab3e450f/recipes/django-commands"; @@ -20130,6 +20454,32 @@ license = lib.licenses.free; }; }) {}; + djinni-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "djinni-mode"; + ename = "djinni-mode"; + version = "20190302.1739"; + src = fetchFromGitHub { + owner = "danielmartin"; + repo = "djinni-mode"; + rev = "f0da31d8f45c4b1b2341cf88ec7f2d2e7d16267f"; + sha256 = "1jfc2n5js596wmpy6g8jyysn9hwf151s952v3ph0wpcisl7wsiyv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e88f64e21275c6755f2589d1afa16eb4e575b8/recipes/djinni-mode"; + sha256 = "19222702dr7hfl7ffqp5z4sslg949p88rwvmg2al82i1a0wkgc98"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/djinni-mode"; + license = lib.licenses.free; + }; + }) {}; dkdo = callPackage ({ dkmisc , emacs , fetchFromGitHub @@ -20244,12 +20594,12 @@ melpaBuild { pname = "dmenu"; ename = "dmenu"; - version = "20180118.445"; + version = "20190329.2010"; src = fetchFromGitHub { owner = "lujun9972"; repo = "el-dmenu"; - rev = "6e492cd4ee4fb39ecda92776707fc270f54d25e7"; - sha256 = "085ap58qfwr7gvrx68dy72z4ph1mvwka5i7ydx58m1a3bb9rshnw"; + rev = "162f9f513d5dbd5f61f8d7adb48546f646d7d3fe"; + sha256 = "1216ab5n7bmpjxrfj4b13mjq1rh6wsdk1dh8mgqxvwh1mydy5lsa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98bcdd71a160b9c04f83cc5b939031c9e7b5eb59/recipes/dmenu"; @@ -20355,12 +20705,12 @@ melpaBuild { pname = "docker"; ename = "docker"; - version = "20181215.1026"; + version = "20190407.218"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "eae8586b65289bc0e6a556d1aeb633663bdcd029"; - sha256 = "055bp8p88r0icxkwhls5hwh5gd5di9c7rzd8anshn9qllpdpc3yz"; + rev = "e127a157f8d0d9ffd465075ecf6558f36d2d3b24"; + sha256 = "1g8r1faqp0z0vqp9qrl8m84pa0v2ddvc91klphdkfmldwv7rfipw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -20632,12 +20982,12 @@ melpaBuild { pname = "doom-modeline"; ename = "doom-modeline"; - version = "20190103.535"; + version = "20190406.12"; src = fetchFromGitHub { owner = "seagle0128"; repo = "doom-modeline"; - rev = "804167cf5a05f0b0332fc9bdb8275cefb76622f2"; - sha256 = "15mqn38w6x2wamwp0llg5m9j57cnhm0mzczxp68ni74dwksgrgk7"; + rev = "c5b5a4d2d24b67239993c398e5631e54908fe815"; + sha256 = "0jfh10vnxaz93569yb11zqirj12487ly1gxxrr807583pn24b6n0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline"; @@ -20660,12 +21010,12 @@ melpaBuild { pname = "doom-themes"; ename = "doom-themes"; - version = "20181219.1820"; + version = "20190313.1520"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "2f4a0cdf287a086d45a1d9e8536ace6a2e152318"; - sha256 = "1rvqiyc7i2zzzip3aqv8s3ik9qa4qav04fiyps1bvbsv7flzsfg0"; + rev = "cbac92578aba8eff8edd18b3e1ea72c295e3631e"; + sha256 = "0v0002smmwjszl94950wmggs0ss9kfigzrhfvayhwcqw0m5h531c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -20755,6 +21105,32 @@ license = lib.licenses.free; }; }) {}; + double-saber = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "double-saber"; + ename = "double-saber"; + version = "20190325.1217"; + src = fetchFromGitHub { + owner = "dp12"; + repo = "double-saber"; + rev = "5555dc28cbaa228fa8f9390738a4200e071380b8"; + sha256 = "06ykn84hp4yvf6z2457jqgyck70y30361l8617ilb7g337hk15xl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19f5c0195ad9b278a7aaa3fd8e70c0004cc03500/recipes/double-saber"; + sha256 = "0zsmyvlxm3my3xbj7m38539vk2dl7azi1v7jb41kdiavj2cc55zg"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/double-saber"; + license = lib.licenses.free; + }; + }) {}; download-region = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -20916,12 +21292,12 @@ melpaBuild { pname = "dracula-theme"; ename = "dracula-theme"; - version = "20180710.624"; + version = "20190107.1216"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "a1c9888b7876ace60a536d27fb290e788bffc9cb"; - sha256 = "1bi257gp4rskwbvr1hkgz16r0pw4xqvaxgixzv4abb35vsc9gncx"; + rev = "66e429f4d576346661ae3a111bafaa06febc1d94"; + sha256 = "0lyy8vjzzcfcj4hm7scxl4cg4qm67rprzdj7dmyc3907yad4n023"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -21146,16 +21522,16 @@ melpaBuild { pname = "dsvn"; ename = "dsvn"; - version = "20130120.1257"; + version = "20190316.1501"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "emacsmirror"; repo = "dsvn"; - rev = "b01e3601ac26735efa3f1fedc81e9a4f6e173635"; - sha256 = "1rfl10zqksvrry3l4g4h9gp3banmfas1n3qn9lsw8nbm259w1sf4"; + rev = "c37d2412ba92aad647bcf5aeb151e620e8069f8d"; + sha256 = "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dsvn"; - sha256 = "1kgc0b8as7w1h9dsknv2h7dzr6jcrs0j0p376050pshgzcm79nm6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/be27e728327016b819535ef8cae10020e5a07c2e/recipes/dsvn"; + sha256 = "189navhhakmkhfc2afsls1jiaxg62wxvpmmn00jlnwlgjm97gdk3"; name = "recipe"; }; packageRequires = []; @@ -21226,12 +21602,12 @@ melpaBuild { pname = "dtrt-indent"; ename = "dtrt-indent"; - version = "20180921.1521"; + version = "20190128.1301"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "e860db7235147ed5ac1fd8f12b51dbb7cf2e75f1"; - sha256 = "0i98rrk5wil0aldmmh6xkjy1mr4438z0i77l176wgl50dkj7xa6g"; + rev = "9ab9cb9d7f391fb09f61c9289c51c36374ddbcbb"; + sha256 = "0pgf0pvqd8k4yzhdn2df9lp0y8hmlm2ccrh07jivwlccs95pcz7z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -21333,12 +21709,12 @@ melpaBuild { pname = "dumb-jump"; ename = "dumb-jump"; - version = "20181221.1547"; + version = "20190327.1027"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "41ab1d621ad9c1d69572779e9c8e991526dcda40"; - sha256 = "1s91m9qr515d1dxl2qywjx7ymz340482qj9kd2bk72s70xc4z9kb"; + rev = "6988b21a08b53fbfeaa6e0b0f182524257dec1e4"; + sha256 = "1a0zs58j1027pllssb3pai2654wbvdbf2g0y3dqbg35gfqanaizp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -21376,6 +21752,31 @@ license = lib.licenses.free; }; }) {}; + dune = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dune"; + ename = "dune"; + version = "20190327.120"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "dune"; + rev = "23f6db7f970293a992006025fcaea018e6485546"; + sha256 = "1nzq3rrkz10gmvppdhwvhgf8nh1x912xizwn6nlj7qffin588r16"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/06648d1d37767cbdc7588d7a8f709d679d478a3b/recipes/dune"; + sha256 = "1lqza4fjm9xxmdn8040bvsl467qzjy709dlmiq2241gfhxpmvvr7"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dune"; + license = lib.licenses.free; + }; + }) {}; duplicate-thing = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -21436,11 +21837,11 @@ melpaBuild { pname = "dyalog-mode"; ename = "dyalog-mode"; - version = "20181231.941"; + version = "20190305.137"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "a86091740e75"; - sha256 = "1z2hc6ms454h6f513kkcidq7grfd7d4mjrd3vmwfvkjwh48lp8kz"; + rev = "6f2a9d8f86be"; + sha256 = "1hgn86mgi0xaa3s85f5kn7crdhirghfq62ri3wn0ywkg6jc0bln6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/dyalog-mode"; @@ -21460,12 +21861,12 @@ melpaBuild { pname = "dylan-mode"; ename = "dylan-mode"; - version = "20180927.2205"; + version = "20190108.1900"; src = fetchFromGitHub { owner = "dylan-lang"; repo = "dylan-mode"; - rev = "a347998ae3ab69c181e09d73f49e11666e89fe71"; - sha256 = "1jyfnxf5rgjl9dhpd2z7kisf2282pgp5z3vpa02qis2kgwfz2gy8"; + rev = "9a6ad5ff83f2dfc25ce3deee9d3ef71ed53964b5"; + sha256 = "1d6krgiabkrj3mryaz79vmiqy0vkr5s8ji34yjd14v73ikzwxwkp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94481ba3ebba6a99f11efab5a33e8bc6ea2d857a/recipes/dylan-mode"; @@ -21806,12 +22207,12 @@ melpaBuild { pname = "eacl"; ename = "eacl"; - version = "20181216.2127"; + version = "20190206.1725"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "e484807861cf6e4dbba41e3d8c343f01b96b9c5f"; - sha256 = "03ydcxkavgzfj8vxwi0a5jn6hp1c4cnf1sk5x9z4m96jac9xpkxq"; + rev = "fe0091e62927e43e6ae2017e5170bc9c2272164b"; + sha256 = "00zlb0lp16crqgp87fnmadphqrx1wc3lndcam4f3apcnxp1dybbg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -22070,12 +22471,12 @@ melpaBuild { pname = "ebib"; ename = "ebib"; - version = "20190102.441"; + version = "20190404.546"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "ecac86f83985baba4077d34d6b9a844c5b30ae2f"; - sha256 = "1i97wp0ly7r7cmwiq5q93n24xzm28y5ih96pjrfqjwj0qc1i4cyj"; + rev = "6c1200a7e53ca192b3765f81006b586c557ab993"; + sha256 = "1nbgjhd7whcr96szzjddynvyvm70qdrc92q82m8nkz9z2v514kz1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -22151,12 +22552,12 @@ melpaBuild { pname = "eclipse-theme"; ename = "eclipse-theme"; - version = "20181219.1321"; + version = "20190122.218"; src = fetchFromGitHub { owner = "abo-abo"; repo = "eclipse-theme"; - rev = "4aea0df40cc797ad749a9cf8656baa9f92a3bf97"; - sha256 = "0h8ryj4xkbc7idid30a7kn41m7zy43bhr7p9vw0abxyahmxi87z1"; + rev = "485cc1e7bd7eb6a42c6db803f4170ec4da18fc28"; + sha256 = "0bp9ci7024sdayar2dpmgax200ipxg5wajw3d2vdj3f5v9qcyxsj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81fcf3536ead18a91400f6936b3f789b4b594b9c/recipes/eclipse-theme"; @@ -22265,16 +22666,16 @@ melpaBuild { pname = "edbi-django"; ename = "edbi-django"; - version = "20180924.1534"; + version = "20190212.617"; src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-django"; - rev = "fc0b246c51a817595e803bb68dc5f9bf906b7dc3"; - sha256 = "10f6kfh4yyzw3d9sqx6x88rxkkmh33i2d91whmjq9sd9b9sxjyfp"; + rev = "9b73db66c02a222fc62dc3bc590962f58c5b43d8"; + sha256 = "1yinm4qzwpdmr4a0isbkiw6ny23gllajcppwh7g0d62di3v242dm"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/345cafbf5358f8179bcbcb895cace75f289c02f1/recipes/edbi-django"; - sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/10dd853022ab93e345761b04d760b3763f4d2384/recipes/edbi-django"; + sha256 = "02vcbqgkvhlw9msf65777f85c8myxr95g2dz199nlfmz4vpqrkgq"; name = "recipe"; }; packageRequires = [ edbi emacs pythonic ]; @@ -22653,6 +23054,7 @@ }; }) {}; editorconfig = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -22660,19 +23062,19 @@ melpaBuild { pname = "editorconfig"; ename = "editorconfig"; - version = "20181224.1849"; + version = "20190405.705"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "c03200da052d316188da87e25192a07aced50095"; - sha256 = "19j2428ij7sqvrqs7rqg1mcnv9109y6drqba40dkv3vrkk5d2yia"; + rev = "df102f4eee98c541fd855cd7acc82aba206e3222"; + sha256 = "0wlna9d22qn6ly1in0w8pd9np7p65f2hglpimm7n8lr3485q2sdd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/editorconfig"; license = lib.licenses.free; @@ -22964,12 +23366,12 @@ melpaBuild { pname = "eglot"; ename = "eglot"; - version = "20190101.656"; + version = "20190213.124"; src = fetchFromGitHub { owner = "joaotavora"; repo = "eglot"; - rev = "e65792fc4313ee7143efc6c133c5824be4fb7db2"; - sha256 = "1hmn1daq3nqyzsyniv5gg9kd0ihx0mhhw11v0w154b32hbn9qw42"; + rev = "7d6e3cf5d7ae098aa6c8572343c8bc9b8453aace"; + sha256 = "1q616yp9zi9a76sjb9f901r4cck40p8f5rgxmdwsavagl5w8d8cz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot"; @@ -23021,11 +23423,11 @@ melpaBuild { pname = "eide"; ename = "eide"; - version = "20181204.1335"; + version = "20190108.1316"; src = fetchgit { url = "https://framagit.org/eide/eide.git"; - rev = "d5397d2ab2f46dcb536022c47e2d5aeed992bd82"; - sha256 = "1ivl5whj2k7inla1g8gy0k53hragkm2ynhl49g358ic9bvj5jcnq"; + rev = "3b6d48df2cc1731812b5bd72d11c205dee17b930"; + sha256 = "1jl0fyiqiqqd9wf2cdk8l6fbnnbq72np6d2n6kya0gk4afj5kr6g"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a42244392719c620b47bc43a7a8501dab4b6f74e/recipes/eide"; @@ -23070,7 +23472,9 @@ , fetchFromGitHub , fetchurl , lib + , markdown-mode , melpaBuild + , polymode , request , s , skewer-mode @@ -23078,12 +23482,12 @@ melpaBuild { pname = "ein"; ename = "ein"; - version = "20181229.1515"; + version = "20190404.1625"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "624e9549ef20ab4d16806dae448c942baffef4a0"; - sha256 = "0z699x90qz2icb06g4v6q2d7p8arx4727rb2v9k7p9kmf830dhhl"; + rev = "5accc13b518b0db584b8a1a0b782dbc3171f4ec6"; + sha256 = "02m062f2nj3giccbfq7cl3i4qm19rbcyzan42q3w5hqm4y0zy8zc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -23095,6 +23499,8 @@ cl-generic dash deferred + markdown-mode + polymode request s skewer-mode @@ -23138,12 +23544,12 @@ melpaBuild { pname = "eink-theme"; ename = "eink-theme"; - version = "20170717.807"; + version = "20190219.58"; src = fetchFromGitHub { owner = "maio"; repo = "eink-emacs"; - rev = "4c990bb3428f725735fa1f733ef4c5ad61f632b0"; - sha256 = "0jxs36qdsx58ni5185qyi1c7gchyla3dpv4v9drj1n072ls82ld4"; + rev = "326b07523dcb076d6209cdbc7fdbb73df296dbdb"; + sha256 = "1s5w45p0in2ljrbhc7nsc0ppff5wybzwrwv60z1a6dnd8d679qfj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme"; @@ -23169,12 +23575,12 @@ melpaBuild { pname = "ejc-sql"; ename = "ejc-sql"; - version = "20190103.624"; + version = "20190404.411"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "bc9a17a19a6b44ab2ee913b20fdb0efd0909ce80"; - sha256 = "19z1xv2q4vmwi2fsksmlifxjgs07pxp8hv1lxx0bsx6sfdm9gpjz"; + rev = "8afdb7e8a28f916149b53345816e50667d4441b8"; + sha256 = "1imc324b862d92yl7n9bqr92k1d1d7pnls73xy4q8lfrllik0ja2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e01655679087504db1206b22435ba8eb7050aa23/recipes/ejc-sql"; @@ -23355,12 +23761,12 @@ melpaBuild { pname = "el-patch"; ename = "el-patch"; - version = "20181220.1548"; + version = "20190127.1455"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "ca6c6ba40f4cee3156415ee793bbbf24fe06e9ca"; - sha256 = "144dj8cary6c15pgnarbx0v9bjx8n4w22jq4wswis7vnsy03rcnn"; + rev = "879094151fa1b4d96435b92c53751b0b761ba46c"; + sha256 = "1jn1mp0zhiyqgx6c4ywkq098c9k1pfzq128f2aq7a5vin4558s7p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -23561,12 +23967,12 @@ melpaBuild { pname = "el2org"; ename = "el2org"; - version = "20180311.855"; + version = "20190313.651"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "81f1c97db8911f5bdf92c729630ab509de4ec73f"; - sha256 = "152y6a6qjch2w84axghzcqiswhx1cq5bq1r1gjfffh41wsddqb53"; + rev = "d9792a9a861d4d43b0d3aefb2ec9268a6fbc83bc"; + sha256 = "169fgx42n2s4gr6mq3zffxgdvkawvbyd6xja3djmp0yi8k85jazl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -23645,12 +24051,12 @@ melpaBuild { pname = "elcord"; ename = "elcord"; - version = "20181027.2350"; + version = "20190321.1145"; src = fetchFromGitHub { owner = "Mstrodl"; repo = "elcord"; - rev = "2224b0dd9137c04a62dd8ff7078ab80e9289643e"; - sha256 = "1gi0hs0kakyrhh2g3555njs6g83zy4whf70gd9ysa8pvh05br8ga"; + rev = "17d3e5b95e68d1b6c396ba0decd94a85226f6504"; + sha256 = "1rhz34bwmjvi98yl9fq4did2pj62v3zpdyr1ryb9yfaz6b59baga"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord"; @@ -23691,6 +24097,58 @@ license = lib.licenses.free; }; }) {}; + eldoc-box = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "eldoc-box"; + ename = "eldoc-box"; + version = "20190305.1306"; + src = fetchFromGitHub { + owner = "casouri"; + repo = "eldoc-box"; + rev = "0d671026b923cef0b2e9f6e9339fa8b1de59543f"; + sha256 = "02pqfdx8jxy5sn4iqamiqmkdllfdz56s1x9hh9qc6psxpjrb38m3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aac2e64f9e0d06b95bdf0dece214263f75470ea8/recipes/eldoc-box"; + sha256 = "11720hi2gvjwc4x2yrxnrhh76wf3sj3yd0vaa3sc22xa5g1wi40r"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eldoc-box"; + license = lib.licenses.free; + }; + }) {}; + eldoc-cmake = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "eldoc-cmake"; + ename = "eldoc-cmake"; + version = "20190323.548"; + src = fetchFromGitHub { + owner = "ikirill"; + repo = "eldoc-cmake"; + rev = "1347b4bd643e8011094c4036a397b0acc4d879d7"; + sha256 = "0m2shpwh55dl1ymmin638ldwkpi5n62iljszlfi5gjwyshd58db5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e19f92097e6003a893907aa46a2df755d2bf0b87/recipes/eldoc-cmake"; + sha256 = "1y47zhxgisvsk0kgvlwrlspmjb2a6wrxwkiahxp9fkdc58r9w7v0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eldoc-cmake"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -23698,12 +24156,12 @@ melpaBuild { pname = "eldoc-eval"; ename = "eldoc-eval"; - version = "20181227.2326"; + version = "20190106.1200"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "eldoc-eval"; - rev = "17946951b914b8520f41d804a6b32830ed32d0c7"; - sha256 = "1khnh4yxwbbcyqcldy0c17s0d0bzgca7x8p7v48886qg4d4aqkm8"; + rev = "4a1cf92dc5c4eca7519eb32f61b95e9e9f5755e4"; + sha256 = "1x90yjzlilzfdkslxi5ijdqi0pcldlz2p3m6nk17b8b3mayi7zj7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ba2004d3db4c5a71676dca82ad880328cf6073/recipes/eldoc-eval"; @@ -23726,12 +24184,12 @@ melpaBuild { pname = "eldoc-overlay"; ename = "eldoc-overlay"; - version = "20171219.140"; + version = "20190222.2143"; src = fetchFromGitHub { owner = "stardiviner"; repo = "eldoc-overlay"; - rev = "b13a5641f694cda92740ccdb1ee2c475507eb206"; - sha256 = "0zn68h4mcdd3j8jfrpaa5d8f0irdwly5wj6v6pm54xc8x14wc141"; + rev = "cfec077d9a699c88265af2e9480d5e76a3b3f833"; + sha256 = "0c16i6y7675rzif5gj9s6rz3nc59339yp4fn27a56sly42qfnh9f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f865b248002d6d3ba9653c2221072a4aa54cd740/recipes/eldoc-overlay"; @@ -23778,12 +24236,12 @@ melpaBuild { pname = "electric-operator"; ename = "electric-operator"; - version = "20181123.5"; + version = "20190225.2327"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "6de04b2c622b6384adc3d861ea6f02bd895b7463"; - sha256 = "084clwn617snv5vh5pz368m40fn3adklhi99sqdj71sssy5xidxr"; + rev = "b6aec9502fffbb7b9459665122ea3908fa70a498"; + sha256 = "0i9rifwkir9hxxw5pqpc8b0libgjf9hz9kdbywqh2pkqjvr2ypyl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -23880,12 +24338,12 @@ melpaBuild { pname = "elfeed"; ename = "elfeed"; - version = "20181127.1143"; + version = "20190407.1454"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "448ad647449b2712409fb784e2cc90af5b8491f1"; - sha256 = "05001p2bl6v92zlj4s2a1fz4fncnrmlvyqwp5qkw3lrzf5qkiyn2"; + rev = "2f19e61a41fb732704366ca9d62aa9f0f090408a"; + sha256 = "13mmgxi71afl7kvx8gs75smacad69ywivcp7gwjid7bpn6rd2myy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -23911,12 +24369,12 @@ melpaBuild { pname = "elfeed-goodies"; ename = "elfeed-goodies"; - version = "20171126.2251"; + version = "20190128.831"; src = fetchFromGitHub { owner = "algernon"; repo = "elfeed-goodies"; - rev = "fc0c3e72f9fcd7bbf5237f6f2323bc666e8240b4"; - sha256 = "16qkh3cp764hayj4n003sm1q673bq7b3rzf1mii5f3xp6n8i84b7"; + rev = "95b4ea632fbd5960927952ec8f3394eb88da4752"; + sha256 = "0mfigkp77acqlnkj07vjzbcamwxp37zqxramp1qdf95psnz177q7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ebb8d23961fd9bfe101f7917caa3b405493f31/recipes/elfeed-goodies"; @@ -23976,12 +24434,12 @@ melpaBuild { pname = "elfeed-protocol"; ename = "elfeed-protocol"; - version = "20181123.653"; + version = "20190312.509"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "3b5d8592a68635a89ea6cded5bb9fe49779c3ce0"; - sha256 = "13l94xid4pac1pkz6sbbximb93yjzqz3g4ci1xr6m3h2wi4khzn7"; + rev = "c5faca15ccfe7e03dc4ee1372a07671c20015737"; + sha256 = "1cdg111dgpphlpv2csv9nr5p2zjk3qss7bf0y8485nnzcin4ip9f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -24111,12 +24569,12 @@ melpaBuild { pname = "elisp-demos"; ename = "elisp-demos"; - version = "20181230.907"; + version = "20190314.929"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "elisp-demos"; - rev = "50b0f4a52fe3ca049f02a195d225a2089321d840"; - sha256 = "1aa07vr6pqbbv51dibcgdj26np438zp6vsbrmprc7nr374viqbq7"; + rev = "8c3ee9e83f92876606432251569fd4ce62e7e764"; + sha256 = "1z5x0rrn8486k1vm9v0g2wvjv8q7yr2n4jrb94ayp31z547yn0q9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1bd1c7a4576d4874a8c5fc8ab2dbc65f0e5bc8c/recipes/elisp-demos"; @@ -24136,12 +24594,12 @@ melpaBuild { pname = "elisp-depend"; ename = "elisp-depend"; - version = "20161230.750"; + version = "20190325.414"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "elisp-depend"; - rev = "005fdef289fff4bd636a1deef8de6b2737e5d073"; - sha256 = "1j39b6a6qhmxpknnxx8yn3sz39ldyvf4lmvi94c4cw7pq7dmmpma"; + rev = "6679da9a6be5a845bb4804224c8394a9bc62168f"; + sha256 = "09xbrk1li76fwa85kvd5xpr0zswrkh51p7a62sb8g422wpaqxiwx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ea159f0cc8c6e4b8483401a6e6687ab4ed73b7f/recipes/elisp-depend"; @@ -24240,12 +24698,12 @@ melpaBuild { pname = "elisp-refs"; ename = "elisp-refs"; - version = "20181210.1655"; + version = "20190323.631"; src = fetchFromGitHub { owner = "Wilfred"; repo = "elisp-refs"; - rev = "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9"; - sha256 = "1k3qnc5qyq7k968zy57c243953yb76zqnf02xwmz7rq11nlrxfr6"; + rev = "540daaf50a88ca0e7d7c8d5f09ca383362e67baf"; + sha256 = "1qxnli3nsh5di1rxwrylvv4k818w18rq6dvlmsrkkp08m7byi4fz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/elisp-refs"; @@ -24318,12 +24776,12 @@ melpaBuild { pname = "elixir-mode"; ename = "elixir-mode"; - version = "20180711.545"; + version = "20190319.1144"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "emacs-elixir"; - rev = "90323cd7669eb472ee1f97b9d070056ebe225d15"; - sha256 = "06kq92r9nmw95l6isc87w0yb9jmd11bm09j3hwww4sn2bv5z2686"; + rev = "b86aab218d67d041682e50b5c939308638bb0200"; + sha256 = "0226ing29qqvnv9yr3bkyajimqw33ihfzcqj18nq83lfhwggbp19"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/elixir-mode"; @@ -24370,24 +24828,25 @@ , let-alist , lib , melpaBuild + , reformatter , s , seq }: melpaBuild { pname = "elm-mode"; ename = "elm-mode"; - version = "20181225.1346"; + version = "20190222.1325"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "dc5ce009b18c07e5235d1974691b372fc0cacace"; - sha256 = "19v0l0zwxfy6slwknzf3y6accd7rwq6yv24bn745miyvcdbw8nmi"; + rev = "b59b66a5369816c3a6d47b3702b9007431b7b4cf"; + sha256 = "13y4xhf4czir4fdl36lk9zhn6292x0lbxhdywpq55fy9ivz4pk6q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1"; name = "recipe"; }; - packageRequires = [ dash emacs f let-alist s seq ]; + packageRequires = [ dash emacs f let-alist reformatter s seq ]; meta = { homepage = "https://melpa.org/#/elm-mode"; license = lib.licenses.free; @@ -24401,12 +24860,12 @@ melpaBuild { pname = "elm-test-runner"; ename = "elm-test-runner"; - version = "20180918.1555"; + version = "20190105.1123"; src = fetchFromGitHub { owner = "juanedi"; repo = "elm-test-runner"; - rev = "73696add403cee6547fcb6eb4e49798e1583d0e2"; - sha256 = "1pphswh5dps98y4zm9fm5wvs3g0ayx7l2nv7wd6np3ydn3gwj25m"; + rev = "a31d567a64d86d36e3675347abd696824a731e0c"; + sha256 = "15kgz44ylni4anz461hihrhvg24jvd7jzykqdjacsznyphfv94m9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/064db8f60438927255458a7fbd8ae871f8264d67/recipes/elm-test-runner"; @@ -24480,12 +24939,12 @@ melpaBuild { pname = "elmine"; ename = "elmine"; - version = "20170511.20"; + version = "20190212.940"; src = fetchFromGitHub { owner = "leoc"; repo = "elmine"; - rev = "432d2f2f7cb5b533f25b993d1001abcadcebe8ed"; - sha256 = "02lsxj9zkcaiqlzy986n1f65cfyd8pkrdljgplsbd9p0w8ys0s94"; + rev = "2f020e41940b182deeca39786a3092a2d68b5eb7"; + sha256 = "0x2av6zjd4kkyzxm2hcwjx9x8j2fzqg85pka57hqpk2fhfhsmy3s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine"; @@ -24644,12 +25103,12 @@ melpaBuild { pname = "elpa-clone"; ename = "elpa-clone"; - version = "20170502.514"; + version = "20190109.1540"; src = fetchFromGitHub { owner = "dochang"; repo = "elpa-clone"; - rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110"; - sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7"; + rev = "5dddbab4c27ec6aca541a1f8e9792617f10fc325"; + sha256 = "17lbdgwg97x8q8dbghylr2j0nwb72mpfl679qb0pl9184ih27qfc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; @@ -24702,12 +25161,12 @@ melpaBuild { pname = "elpy"; ename = "elpy"; - version = "20181228.921"; + version = "20190406.755"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "b4803b554d78941e871cd976ff7828294e85c991"; - sha256 = "073bwxwjzcbmvpcz9q2xjwzx9x7hkvjni6fwvikh6yawzjp56jis"; + rev = "2d4a968e8fe04e6ad099c526349633105a38f608"; + sha256 = "13nbpd79vhfp7k9da59999l49hh0k1m8n9q9mdfrk4irrglzmm89"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -24795,12 +25254,12 @@ melpaBuild { pname = "elsa"; ename = "elsa"; - version = "20181119.1347"; + version = "20190331.858"; src = fetchFromGitHub { owner = "emacs-elsa"; repo = "Elsa"; - rev = "9a2f3d5abfac44ab50aa9b6c34bbe8b9562741b1"; - sha256 = "1plsrjpbxb45cv98bjkn05lmv7brc16l8l2qrha9w2y363fqlc8d"; + rev = "118a943c2c447fd0f05cd2cc7ebb5dbcc222be00"; + sha256 = "0c2rbphkzj6cjf4fgy13fim2b8r3zdic3q6pgrymlcm9am0gdkdn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f126c49fe01a1c21aca0f45643d44ecf4c3ad95b/recipes/elsa"; @@ -24975,6 +25434,34 @@ license = lib.licenses.free; }; }) {}; + elscreen-tab = callPackage ({ dash + , elscreen + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "elscreen-tab"; + ename = "elscreen-tab"; + version = "20190203.819"; + src = fetchFromGitHub { + owner = "aki-s"; + repo = "elscreen-tab"; + rev = "29d7a65c3e134dd476049c9aebc8d029238e71f7"; + sha256 = "0303i61m1qg65d3i3hsy7pzdhw0icpx3im99qkfmy6lxi4h9nd0p"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/06a8348c6911936e16a98cf216578ea148e20e5d/recipes/elscreen-tab"; + sha256 = "18krbs462cwi3pf72kn1zf1jf4gv9n3ffdg4v5bgb19i69sq7spi"; + name = "recipe"; + }; + packageRequires = [ dash elscreen emacs ]; + meta = { + homepage = "https://melpa.org/#/elscreen-tab"; + license = lib.licenses.free; + }; + }) {}; elvish-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -25162,12 +25649,12 @@ melpaBuild { pname = "emacsql"; ename = "emacsql"; - version = "20181111.205"; + version = "20190310.622"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "f8c3d9fce28ab7d5b0c9fcf2c1236151ca7add24"; - sha256 = "0kfr3y54b7cj9zm3dnqfryilhgiaa78ani5fgi402l5h9i922isn"; + rev = "5ebd12b6ffaa9fbadefe8518eab07a028bbaf7c1"; + sha256 = "19anva1mcm89hylhdjjjsc3gc32kv2wqp5qs6h7rca059kkqj277"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c3b6175b5c64f03b0b9dfdc10f393081d681309/recipes/emacsql"; @@ -25243,12 +25730,12 @@ melpaBuild { pname = "emacsql-sqlite"; ename = "emacsql-sqlite"; - version = "20180128.1252"; + version = "20190108.825"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "62d39157370219a1680265fa593f90ccd51457da"; - sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; + rev = "60b99760c59afa58dc0241e0468e6fc40b8f199b"; + sha256 = "0l376j85q7fnlz35db22vrz618g2d94j0qa21kl3cna81n8wpr5z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite"; @@ -25372,12 +25859,12 @@ melpaBuild { pname = "ember-mode"; ename = "ember-mode"; - version = "20181001.236"; + version = "20190403.952"; src = fetchFromGitHub { owner = "madnificent"; repo = "ember-mode"; - rev = "88e5ffd33d8664b4d5124d6aa2ea9ed8d50c8c9e"; - sha256 = "0y0lpzkcalis1jzclphnbd3p3656i3qzvinrwf40j3rylrp2vcc4"; + rev = "3510afc5023d760a66aef260ba601c15a31dc878"; + sha256 = "06y5nd2fs0xskjxhd1dn4g9y03i7xamv7jiwq8cm0c2mli5pjpr1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode"; @@ -25448,24 +25935,25 @@ , fetchFromGitHub , fetchurl , lib + , magit-popup , melpaBuild , seq }: melpaBuild { pname = "emidje"; ename = "emidje"; - version = "20181219.956"; + version = "20190209.926"; src = fetchFromGitHub { owner = "nubank"; repo = "emidje"; - rev = "0a27ad9571eaff772a6c6fe7228d76269f82183b"; - sha256 = "1jj42vskz56sgq4cqsnl4yms88dh7kdbd2f8m81dqyi4r5im4j1w"; + rev = "7e92f053964d925c97dc8cca8d4d70a3030021db"; + sha256 = "0xg2bw9vzwvkx6xh4k2n6qhyhqg5iifl6aa0s7svvdnw35x00hv2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d64b3b42b4b9acd3e9d84921df287f3217db83e/recipes/emidje"; sha256 = "1p2aa4wl2465gm7ljgr5lbvxfgx0g1w1170zdv3596hi07mccabs"; name = "recipe"; }; - packageRequires = [ cider emacs seq ]; + packageRequires = [ cider emacs magit-popup seq ]; meta = { homepage = "https://melpa.org/#/emidje"; license = lib.licenses.free; @@ -25531,11 +26019,11 @@ melpaBuild { pname = "emms"; ename = "emms"; - version = "20181122.1132"; + version = "20190221.847"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "359e1d38d09060b5f7860320649d6c30b71e4bbe"; - sha256 = "0ayfmr0rg002xi5dklap87a2765z724cl8qs6j5l7qlq4k9dzwqq"; + rev = "6013464eb7295fcd749b3146f758fc9295fbe11a"; + sha256 = "0g7a31yn9p0iqr2im0l9d8fch58ffk5m7g3kfnn377pbyfh4hr11"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -25877,12 +26365,12 @@ melpaBuild { pname = "emojify"; ename = "emojify"; - version = "20181220.1950"; + version = "20190401.2053"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "f2edcba0f6b19717e38a3e96adc8adc262f3b5a5"; - sha256 = "0yynms2mcrfxgs27kzk3ag8d24ifffs9fyv7m4hvv46mwwhnmyk8"; + rev = "4954a4f2cffe5c459727bee30cd221c59eacd839"; + sha256 = "1y7swk97qllnk0lc3x8ya9lrd7d74ximjaa5pnj695knrf1ib0jn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -26077,12 +26565,12 @@ melpaBuild { pname = "enh-ruby-mode"; ename = "enh-ruby-mode"; - version = "20180730.1609"; + version = "20190407.413"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "5e19f321d702ff6b698047af6b3ddcd1c9f0d979"; - sha256 = "1x9qwfhmg9f01pg30sm05sv7jpnzqgm94xvz65ncz55qimjbydsl"; + rev = "249c98e1345f71b03260dc4af747be9a7f1a8a07"; + sha256 = "18gq393ply76hxd1k5myavzg5aayhyng89392mrhbshq437491kx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -26332,12 +26820,12 @@ melpaBuild { pname = "epkg"; ename = "epkg"; - version = "20181104.1143"; + version = "20190314.1713"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "c42bc98a711ffa8d2a7b9096b563ac0edb0b9bf3"; - sha256 = "0hn67mdv6i8l1sfvs8gm2my05chk69nm4vf108l2ff22lims8ghx"; + rev = "408d46a9d041b516e9fda0414058a287dfef37fb"; + sha256 = "1csvjirm3w40jzpd1nqlqwv8nx5cscmwpmb2rhijj59fw12jllnc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -26481,6 +26969,34 @@ license = lib.licenses.free; }; }) {}; + equake = callPackage ({ dash + , emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , tco }: + melpaBuild { + pname = "equake"; + ename = "equake"; + version = "20190403.1840"; + src = fetchFromGitLab { + owner = "emacsomancer"; + repo = "equake"; + rev = "997ad912062cbdf8598d6f029319ee046649a26c"; + sha256 = "04xzjsifam29y55wfhw29gviadp0f2pn4di6nnhrypxlir2mg3rz"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2a4a0ec11a9c720d7ed90addcb31d0a9d5594f5b/recipes/equake"; + sha256 = "17r10d3acmhixbi24k19rx720qi8ss4v53n107arqmr04rkd1v2y"; + name = "recipe"; + }; + packageRequires = [ dash emacs tco ]; + meta = { + homepage = "https://melpa.org/#/equake"; + license = lib.licenses.free; + }; + }) {}; erc-colorize = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -26514,12 +27030,12 @@ melpaBuild { pname = "erc-crypt"; ename = "erc-crypt"; - version = "20161228.739"; + version = "20190318.1650"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; - rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5"; - sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w"; + rev = "043b109409ee5b17bf06956fa46e1beb66d06ca4"; + sha256 = "1k4y203m7d7cbgdyin3yq70ai9yw0rfln2v61xd7xa5zxvgvj2v2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; @@ -27036,12 +27552,12 @@ melpaBuild { pname = "erlang"; ename = "erlang"; - version = "20181011.536"; + version = "20190404.228"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "76e2f04bff3685a8efb9321edf02a6996c5fbf59"; - sha256 = "1qx5n9q3j1nq8n83g34jvcfxk5f3y3y9q4h8y4gvv2d2gns0zblv"; + rev = "e3ca92be9f1945f50ef84631a826b431bad2bfe6"; + sha256 = "14sbwlvn4nb33xrss9x3dn74nkzmr1gss029aycfd8sjclyzv1zn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -27063,12 +27579,12 @@ melpaBuild { pname = "erlstack-mode"; ename = "erlstack-mode"; - version = "20181221.1101"; + version = "20190204.809"; src = fetchFromGitHub { owner = "k32"; repo = "erlstack-mode"; - rev = "b748eae5905c671effd6dfb8f5dd1a6863bc524f"; - sha256 = "1f49r0f46s2ii4ml7r92q9nnnikil0yxpwvxif3j4z45apcg7y0y"; + rev = "0ab44afa899ee7e52e712e0a1644fb9f4d40d2a6"; + sha256 = "1wnqzj9aycb67h9za2r97f2yflnwdr9qjg1kygr8rawxa1z7lim6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ee61c1c5f116082b37fb13d15052ed9bbbc1dac/recipes/erlstack-mode"; @@ -27361,12 +27877,12 @@ melpaBuild { pname = "esh-autosuggest"; ename = "esh-autosuggest"; - version = "20171223.1855"; + version = "20190227.2001"; src = fetchFromGitHub { owner = "dieggsy"; repo = "esh-autosuggest"; - rev = "aa921f8975b0f95d1cb0044e6ad7f17529261610"; - sha256 = "19qhpvw5y7hvkqy8jdyrnm4m90jdxxdiaabcrjiwxmkzq3wgnx8q"; + rev = "cdfe38ee16e1e125d37178f11a371ed7560f5b35"; + sha256 = "1pglw16y9a68kdgyb04vl6nr0wynykwdgrkzhcis1xzhdllivkad"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; @@ -27517,12 +28033,12 @@ melpaBuild { pname = "eshell-fixed-prompt"; ename = "eshell-fixed-prompt"; - version = "20170804.635"; + version = "20190111.1435"; src = fetchFromGitHub { owner = "mallt"; repo = "eshell-fixed-prompt-mode"; - rev = "4351b214de6d4e8e45279930448e2f93b491848e"; - sha256 = "1zx3zn28m5dnvsnkpqd26szv9yzplnb6wyp9vfjfs3hnasrizbxc"; + rev = "2c860029354bf1f69edc1f12e4a0d9aeb9054f5d"; + sha256 = "1j1m661rgbfr04357wq2a7vhm04s3vrbw4r6y1k2cx2ap9amkb25"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt"; @@ -27717,6 +28233,33 @@ license = lib.licenses.free; }; }) {}; + esonify = callPackage ({ cl-lib ? null + , deferred + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "esonify"; + ename = "esonify"; + version = "20190110.821"; + src = fetchFromGitHub { + owner = "oflatt"; + repo = "esonify"; + rev = "bdc79d4ab2e3c449b5bef46e5cabc552beeed5c6"; + sha256 = "03xl6a49pg3y1g3dl7fglrn956ynzj2vlviwlv08ngflvbn5shai"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8a05dadbf515af6202d1cb96d4fdceb07bb7a6da/recipes/esonify"; + sha256 = "0facvhl6p4v1h3magvp6lzahdzbgg7a15hbj9rgfncvfzfjzlq5a"; + name = "recipe"; + }; + packageRequires = [ cl-lib deferred ]; + meta = { + homepage = "https://melpa.org/#/esonify"; + license = lib.licenses.free; + }; + }) {}; espresso-theme = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -27858,12 +28401,12 @@ melpaBuild { pname = "ess"; ename = "ess"; - version = "20190103.559"; + version = "20190407.721"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "2d11bb6d1851aadbf35c621b36603230b08b4f80"; - sha256 = "01c2r5l0bd31bakhbjwgdzm8klbs2iqq993ma6iqawvkm14virw1"; + rev = "1c2a5e9525d4bd66cf54aac087837a2f70d5bfd5"; + sha256 = "11nkgxzykrw7cfcdb8mbrym92mna0y4lfv02fpy3l8zffcs71mcn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess"; @@ -27913,12 +28456,12 @@ melpaBuild { pname = "ess-smart-equals"; ename = "ess-smart-equals"; - version = "20150201.2201"; + version = "20190203.2049"; src = fetchFromGitHub { owner = "genovese"; repo = "ess-smart-equals"; - rev = "e0f5f18f01ed252fde50d051adf1fa6254a254c9"; - sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x"; + rev = "746cf9e78c3b86cbbf78d69c335a8a4ff3da79d6"; + sha256 = "1by8bzw3yl86mqzh7lwz5dca243n956jnd2rz4vilpgbh5cka2l3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4403cf87e05311d7fe0360f35f9634b9fdfc6f81/recipes/ess-smart-equals"; @@ -27939,12 +28482,12 @@ melpaBuild { pname = "ess-smart-underscore"; ename = "ess-smart-underscore"; - version = "20181112.1302"; + version = "20190308.1701"; src = fetchFromGitHub { owner = "mattfidler"; repo = "ess-smart-underscore.el"; - rev = "17fde1f2bffffeb67520922e09ebf66693ef0c6f"; - sha256 = "0pc3vx8v59gvqamklv291ivm5ddg7wmzy358lqnl2hhgg85s90i7"; + rev = "aa871c5b0448515db439ea9bed6a8574e82ddb47"; + sha256 = "0knb4zfva2m0vd8awcfy5kyd21rjdhxnc1n74qazr9y82l5w7i9b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore"; @@ -28075,12 +28618,12 @@ melpaBuild { pname = "eterm-256color"; ename = "eterm-256color"; - version = "20181026.829"; + version = "20190122.2001"; src = fetchFromGitHub { owner = "dieggsy"; repo = "eterm-256color"; - rev = "1340f69a78faf4e709ee29875550ecc9f434b216"; - sha256 = "1q66v7qk3xririsqx1nkckrd9v8lq4nl5j0b0dmxnq0hg5a0kxxh"; + rev = "0f0dab497239ebedbc9c4a48b3ec8cce4a47e980"; + sha256 = "00ins8n92p5aspr6bjrvn5y5w0ximakk22yklsfmkav4h10al4as"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; @@ -28203,25 +28746,24 @@ eval-sexp-fu = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl - , highlight , lib , melpaBuild }: melpaBuild { pname = "eval-sexp-fu"; ename = "eval-sexp-fu"; - version = "20180509.1903"; + version = "20190109.9"; src = fetchFromGitHub { owner = "hchbaw"; repo = "eval-sexp-fu.el"; - rev = "1cfd0f3e167d63080692fad97ffe0091b024ad73"; - sha256 = "0l20ja8s0881jlrlmba496iyizfa0j5bvc2x39rshn8qqyka2dq2"; + rev = "e1d7165383c941b3f11c2715707adc3d91d129a0"; + sha256 = "01mpnpgmlnfbi2yw9dxz5iw72mw3lk223bj172i4fnx3xdrrxbij"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b1a896521cac1f54f7571ad5837ff215d01044d/recipes/eval-sexp-fu"; sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs"; name = "recipe"; }; - packageRequires = [ cl-lib highlight ]; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/eval-sexp-fu"; license = lib.licenses.free; @@ -28319,12 +28861,12 @@ melpaBuild { pname = "evil"; ename = "evil"; - version = "20181206.409"; + version = "20190222.412"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "82c65dcfe23aff3d764cafc78124d92940c5bd59"; - sha256 = "128zn8k44s0v8wbxlcya46vga70mizy9rn6q2vwlajyxbndl0k00"; + rev = "297b8f323754d967beeaed28080311f5afbe25c8"; + sha256 = "047x7q643mw5vxq857zx83k2w0108gj2wii510cn9ixdxkwhc0ya"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -28540,12 +29082,12 @@ melpaBuild { pname = "evil-collection"; ename = "evil-collection"; - version = "20181224.1551"; + version = "20190327.1904"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-collection"; - rev = "4737aa47438a565119652212c16dade59f23b785"; - sha256 = "0lzwcmsm0igvh1jhjq2a8ipa2pf4lw7lm04xfxf7xj1ai30l7i40"; + rev = "28bf368cf14b87d1a96c71f8b2d422d7edf4c39b"; + sha256 = "0r6p3pkrhrlbd77dn20n86rxkgpvrj62842s2nnmr9mk5bwd5fap"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fbc35279115f6fdf1ce7d1ecef3b413c7ca9c4f1/recipes/evil-collection"; @@ -28808,12 +29350,12 @@ melpaBuild { pname = "evil-expat"; ename = "evil-expat"; - version = "20181227.448"; + version = "20190111.2140"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-expat"; - rev = "bfbcabe8a071f9ba628d3d88579097973bbec9e9"; - sha256 = "0midcnvzss7brlzhbmp8ig3mr26w5zl3dzd8zjgks9b222kqvvh5"; + rev = "4c344ea19b789002d759a202ffbf594730d2c59a"; + sha256 = "16v7fnldxag6l1lsnrnhdjkga9qi78lbdfbb82k6pmv04991mbkr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat"; @@ -28890,12 +29432,12 @@ melpaBuild { pname = "evil-fringe-mark"; ename = "evil-fringe-mark"; - version = "20180727.2347"; + version = "20190319.2153"; src = fetchFromGitHub { owner = "Andrew-William-Smith"; repo = "evil-fringe-mark"; - rev = "37521e190dc0414a2bfddd6b219527b1a8dd3f58"; - sha256 = "1hxylidf90j7zxr1rwgjkycc5l0qf2dvngrkfrvnl7r7yls6mgmd"; + rev = "a1689fddb7ee79aaa720a77aada1208b8afd5c20"; + sha256 = "0pf8bl7bmcn1l0dlxkgbgwb1n2fxpzxwcr4jf06gzyrrmmwah526"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70dcc07c389d5454de64fb08cd666d489d6d5483/recipes/evil-fringe-mark"; @@ -29188,12 +29730,12 @@ melpaBuild { pname = "evil-magit"; ename = "evil-magit"; - version = "20181127.701"; + version = "20190224.1228"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "c636350113995313d7c158175276849824a12a74"; - sha256 = "14kcy3fpywm5zqxqyjma8k29qhiw83s15vn3dy0jc96wxvh10rlr"; + rev = "e2fec5877994c0c19f0c25fa01f3d22cb0ab38ba"; + sha256 = "134v7s03jvbhm70mavwab85r09i68g2a5bvriirh0chz1av2y16v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -29241,12 +29783,12 @@ melpaBuild { pname = "evil-matchit"; ename = "evil-matchit"; - version = "20181229.1739"; + version = "20190307.213"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "abe43359bfc2608c03267639b1688e237ee7b66b"; - sha256 = "134m20ylf6vm02xgnh385w745x0ldi42m8asz41h4das6n3wv3fx"; + rev = "00ab601346a5646aa6db4935684021ec16650a58"; + sha256 = "14wbsj1fwxz36qdnnf9qr2rz38qm4x3aj265asmvpfizgbm2jd4r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -29269,12 +29811,12 @@ melpaBuild { pname = "evil-mc"; ename = "evil-mc"; - version = "20180921.1027"; + version = "20190321.906"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "2af29ecd2fbed1571c4cc2501dfb2e38ffd4bfa2"; - sha256 = "1996ysiaj9s34cf2z4vyw3i6jwsc1s7b6r8v3hgb8h6rg19a77mf"; + rev = "ef22ee1a9d9a82a9b954f27f82ddcb7cb0f634ec"; + sha256 = "026nvajf9wbm47qw1napzsngqjrkq84d052ybhxf30as6pigj36s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -29381,12 +29923,12 @@ melpaBuild { pname = "evil-nerd-commenter"; ename = "evil-nerd-commenter"; - version = "20181226.219"; + version = "20190407.128"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "151ac5747539eaac5562b93c94f738d6001ab0c7"; - sha256 = "0fqcdc7wl39xrmq6ygjy5v5v2jlj6disd1bgbyy1mi8phw6irghl"; + rev = "acc0f75cde9e4ffd946f7835c3b388fb77f633a7"; + sha256 = "1r8shfdddys9vqvrxf7s6z83ydqx9xhqs9sa7klbsajryqcp50b7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -29835,12 +30377,12 @@ melpaBuild { pname = "evil-surround"; ename = "evil-surround"; - version = "20181218.1157"; + version = "20190402.2118"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "9e445b7ab1b2381a1882804553af2789c2282987"; - sha256 = "1l1iywjhzjwkvpiibfqmv9d86iy7pvi57ajdjhgk38yj9yc9nz8i"; + rev = "68f7033322dcba3781dddb48465878e896a9f57b"; + sha256 = "17wxib52qwpfi809lq3c1zsxqprmkk9ghg0q8zc3r7gq2f5d8yy8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -29940,12 +30482,12 @@ melpaBuild { pname = "evil-test-helpers"; ename = "evil-test-helpers"; - version = "20180109.1040"; + version = "20190104.226"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "49d6167d6bb97454afe1d06a5324483682de8ab6"; - sha256 = "0l3hmmkys3fw5yxs4kmjx5nrbjh9w19d0bfkryhbxhc5xszydvzz"; + rev = "3766a521a60e6fb0073220199425de478de759ad"; + sha256 = "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -30211,12 +30753,12 @@ melpaBuild { pname = "evil-visual-mark-mode"; ename = "evil-visual-mark-mode"; - version = "20150202.1000"; + version = "20190116.757"; src = fetchFromGitHub { owner = "roman"; repo = "evil-visual-mark-mode"; - rev = "094ee37599492885ff3144918fcdd9b74dadaaa0"; - sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz"; + rev = "ac5997971972a9251f140b5542d82790ca4a43b4"; + sha256 = "1gh5614l4zf15109zc64pnnc5rp5ilah9mavgr2rbv2874k3vs4n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/293cdd3387f26e4c8f21582d75a194963ac9cff7/recipes/evil-visual-mark-mode"; @@ -30392,12 +30934,12 @@ melpaBuild { pname = "exec-path-from-shell"; ename = "exec-path-from-shell"; - version = "20180323.1904"; + version = "20190105.1907"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "4d0af1274797ce61f5d8c209339d5b9cdc49aca6"; - sha256 = "1h45vxyw0pa99fldnvca96rz1w1hl7mrgx5m51rknxascfvk6fqx"; + rev = "76cd6e3fa8a7dac937af7e40507843dfae4f9184"; + sha256 = "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/exec-path-from-shell"; @@ -30418,11 +30960,11 @@ melpaBuild { pname = "exiftool"; ename = "exiftool"; - version = "20170822.1432"; + version = "20190203.1206"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "3a07dbcb975577734d4abf6d68e1ab83a01951bb"; - sha256 = "10prrwvmc891vkzzgqmz0xd85xgi52ni83ydf0bvhfmcg0wmm0cc"; + rev = "4131fa38160dabd5d7143aad8aca5db575749292"; + sha256 = "0lbsa8v39aih8mcvvdm0jang05gm5br5g2fay3lccf73c9aimrfh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -30493,12 +31035,12 @@ melpaBuild { pname = "expand-region"; ename = "expand-region"; - version = "20180817.434"; + version = "20190327.528"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "27a78e7c364b4e6d39f6593f5a55a12c4a7675bc"; - sha256 = "0dslj330729sjhxg080xqw5hasmm23niliwmihm9464cl51h1mhi"; + rev = "0ba6f41a7921ae24e8d3a2345dd5492052fe93f4"; + sha256 = "0j92jj0ydqll3c4p14gwn6z0c3l44ali2yr3cnz3a96g00fd36y4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -30651,12 +31193,12 @@ melpaBuild { pname = "exunit"; ename = "exunit"; - version = "20181231.18"; + version = "20190215.1940"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "exunit.el"; - rev = "8cae9a7420c2872984fdb9a93e20a78c4f714560"; - sha256 = "0v7zf81pr7g487df41hic0b3zhyvhfprv89ysy9pq658980sq759"; + rev = "1b7763bc4822f3292a6b9b368693b0c271052eb8"; + sha256 = "1g6w7gchw34acqwigsjhf93hx83w11wr6a2yv6p8ncw9r3vgbnh2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94e4fd4cf58b280d08d22aff4dd9c47201a29e72/recipes/exunit"; @@ -30704,12 +31246,12 @@ melpaBuild { pname = "exwm-firefox-core"; ename = "exwm-firefox-core"; - version = "20181126.920"; + version = "20190402.1425"; src = fetchFromGitHub { owner = "walseb"; repo = "exwm-firefox-core"; - rev = "e2cc27e180a6721e9cf1c84d354bdbfff515d054"; - sha256 = "0a84s3bx62ld14zkirywx7cfc018zbx6caaav9mlqj03lvc6wcsi"; + rev = "71539f3fce35095992c4975467e89a7833a2319d"; + sha256 = "0psb180wcn2yg9r75nbpr54npaiqshpjy4hr03jpf2shzr9d9zlq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/745a2b98c48b00cd794dfb97be4072813ee67ada/recipes/exwm-firefox-core"; @@ -30732,12 +31274,12 @@ melpaBuild { pname = "exwm-firefox-evil"; ename = "exwm-firefox-evil"; - version = "20181203.411"; + version = "20190403.1145"; src = fetchFromGitHub { owner = "walseb"; repo = "exwm-firefox-evil"; - rev = "e23ebbb9bf1c75536bde9d563ec8668db11533d6"; - sha256 = "1mm84028yjz790xpqpdal8k1pd4adlfk6cn35rrqh5yb0g9wj91c"; + rev = "e343ac57c945946c238f2f24fdf810e691c023c4"; + sha256 = "0037fiv0nsid1bh492vmpcz4vi116hbp8c169k8yjalkb9y8sjn9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09fa63c7bd639c0b7dda540504c74cdbbe4f9875/recipes/exwm-firefox-evil"; @@ -30791,12 +31333,12 @@ melpaBuild { pname = "exwm-x"; ename = "exwm-x"; - version = "20181213.608"; + version = "20190224.352"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "88c8b70be678ce0e9fa31e191ffd3f76bbfee61f"; - sha256 = "03l3dl7s1qys1kkh40rm1sfx7axy1b8sf5f6nyksj9ps6d30p5i4"; + rev = "02ec31cd8996b1b3fe305405fef7334c4d08e72b"; + sha256 = "18cgfnh7bp152gi4zv2skrkjbxs0v2zn6jk35rc48y8nfivps2f4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -30826,12 +31368,12 @@ melpaBuild { pname = "eyebrowse"; ename = "eyebrowse"; - version = "20180514.1219"; + version = "20190322.233"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "ec7e11022032348ee23a3586a1306871f9d28b25"; - sha256 = "16mks2dr4k6bjr1xds9j2jwm7zwad4z67wa0qg9n50gyiyn4pl4g"; + rev = "52e160997a1c4b1d463e8b9cc2ba3e27408c2a89"; + sha256 = "0y2n08ykfc3hga5m969syysa2r4h3d2i1xfi0jjhpw3h7qrisbw8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -30932,12 +31474,12 @@ melpaBuild { pname = "f"; ename = "f"; - version = "20180106.122"; + version = "20190109.106"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48"; - sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"; + rev = "8191672377816a1975414cc1f116fd3b94b30bd0"; + sha256 = "1b9wq6r6v44y11ldcj8czmah4ciibkm2261q4z9awd7v7iqlzf07"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; @@ -31086,12 +31628,12 @@ melpaBuild { pname = "faff-theme"; ename = "faff-theme"; - version = "20181114.536"; + version = "20190115.1307"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "646ab8b56093614679b8465993eae9678e792c12"; - sha256 = "031jqw9sna4b12ki1am0xy9mqzh6a6r5dayhqpv0fbnbr6spvscy"; + rev = "cf76f8d700ae4e7c58b2ebb4bbe3b10a21a5658b"; + sha256 = "1jap3fx29l542p4yjaimy1v0d2rnd5bprnz8clxhm80jn6km8v9d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -31468,12 +32010,12 @@ melpaBuild { pname = "feebleline"; ename = "feebleline"; - version = "20180914.1400"; + version = "20190402.825"; src = fetchFromGitHub { owner = "tautologyclub"; repo = "feebleline"; - rev = "89ddf31ecad885e5491e8d6b71b48c1591b3faec"; - sha256 = "0v0m2vk7cxfrihcs1ipbw80wfj0nvyqzyfamzk3fnk42hj4qdb75"; + rev = "d1df599254f4c250720ae98dd69dada89535a295"; + sha256 = "10h59zd9hq81dyjw558k417kaqs5m9bhmx8mndcshh4cn1xfp5j3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline"; @@ -31493,12 +32035,12 @@ melpaBuild { pname = "fennel-mode"; ename = "fennel-mode"; - version = "20181230.1836"; + version = "20190401.1108"; src = fetchFromGitLab { owner = "technomancy"; repo = "fennel-mode"; - rev = "1addd6a49a42921cf3de5b58499c692c888b0afb"; - sha256 = "1b381crm847aid7w44ig17jyffnhyafbj8libvrac3cgw3ndcqj7"; + rev = "17678a7fc073c64cb0ec78f913154df377a42575"; + sha256 = "0n2vz6vsi380gcgg3ihwjs3z2rc1hb8yh4xlzjwz01dhahj08p1x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f/recipes/fennel-mode"; @@ -31778,12 +32320,12 @@ melpaBuild { pname = "find-file-in-project"; ename = "find-file-in-project"; - version = "20181216.1846"; + version = "20190330.1830"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "0072b813fc77ef34f776fcafbd13c4aeeae360cf"; - sha256 = "1m7z4m9b3a7pfsbcda71mhn9vjjjbnaql69jnb4i1afwh5nwm7hx"; + rev = "33fc401eeda51c11dfecd78d961538aaef23761b"; + sha256 = "1vrw2c88lanb5r8gapf62blccb98s864b5bn3fc5hj27ybd441vd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -31803,12 +32345,12 @@ melpaBuild { pname = "find-file-in-repository"; ename = "find-file-in-repository"; - version = "20151113.519"; + version = "20190404.128"; src = fetchFromGitHub { owner = "h"; repo = "find-file-in-repository"; - rev = "898fd7ea2727772ba09383a2ece7f3f7f1e77e29"; - sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh"; + rev = "b44d78682082270dc6b59cdc911333d0d3e7edaa"; + sha256 = "1icsxp2b3grvdbv6bh9hpxz1hrqa7vvjzajjwi2knvjbq41d99bn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/find-file-in-repository"; @@ -32060,12 +32602,12 @@ melpaBuild { pname = "firrtl-mode"; ename = "firrtl-mode"; - version = "20180221.1555"; + version = "20190223.1944"; src = fetchFromGitHub { owner = "IBM"; repo = "firrtl-mode"; - rev = "1ac00d526018945389bcb2292dbdd8395381774a"; - sha256 = "02xznsiij39lhjr261vl7yz4k4i76vshh5kwa7ax95zpj2zbs0v6"; + rev = "e55c555809037b7aaf2367ad2255f0a27addd23a"; + sha256 = "1nsihyx9znblc4kxyk06r7alhd4wh67312zwp9discgyf4ksm572"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/firrtl-mode"; @@ -32085,12 +32627,12 @@ melpaBuild { pname = "fish-completion"; ename = "fish-completion"; - version = "20180827.129"; + version = "20190207.1358"; src = fetchFromGitLab { owner = "Ambrevar"; repo = "emacs-fish-completion"; - rev = "a73526d67c4c5f7f2e425cec79d56c7517c7f1e9"; - sha256 = "0aip3gkkhysz74jfr4bbc31p3qwy31l436y3bvjskgk44zf7z78k"; + rev = "23aafb993f8f74dca6e2f299030ca5d3e1aee95b"; + sha256 = "04dcqhdb544i7c6np4prbq13cwfxw37czmpnm3j36di6c1g9gkzb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/fish-completion"; @@ -32189,12 +32731,12 @@ melpaBuild { pname = "fix-word"; ename = "fix-word"; - version = "20181231.2303"; + version = "20190215.1238"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "a8472f32a923388c4c4bc3b0bed4da915f03276b"; - sha256 = "1k23bpjy17pmycin4886cxk49gw1flqbfnwgxnxmmk3v39nx58s3"; + rev = "b3b3a3c8e33e425f9a8d0ec653adb6897c8efc03"; + sha256 = "1nw9ih0knaqaban5nqp3anvr37mivylqs8sc8l3v1i9srlqnsj1m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -32640,12 +33182,12 @@ melpaBuild { pname = "flower"; ename = "flower"; - version = "20181025.926"; + version = "20190215.946"; src = fetchFromGitHub { owner = "PositiveTechnologies"; repo = "flower"; - rev = "49e224ab26d85f5cd4a3ad9cdac391264b80ad5e"; - sha256 = "1kn9sibvsnaprhjwfz1cdvb4mi4d4qsp70gxjij58dk51jpni7yf"; + rev = "6ef1affa2d7090714ccc4494823de28cfc11da35"; + sha256 = "1dp3g52j1i49bv802g27b7yszpxz0i28i4j74qp39qlld3k0gys0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; @@ -32666,12 +33208,12 @@ melpaBuild { pname = "flucui-themes"; ename = "flucui-themes"; - version = "20181217.1649"; + version = "20190321.1613"; src = fetchFromGitHub { owner = "MetroWind"; repo = "flucui-theme"; - rev = "bbea224c8020d40260e7da581acd7601eeaf84c4"; - sha256 = "1fdvl2i3h0ql678jcd1jsp008rwl5clm438gi8hgdjwygn3byv1k"; + rev = "921ff298da71366eca3d1e4fc410126d405d5366"; + sha256 = "0gqsr0xsxrbxsdfn3yhf76wxpqp63m1652ryvc2hwskkgj41y3nl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77d06aa7405f0badf5ab425ddeeb7a754c17d2af/recipes/flucui-themes"; @@ -32684,6 +33226,32 @@ license = lib.licenses.free; }; }) {}; + flutter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "flutter"; + ename = "flutter"; + version = "20190203.2201"; + src = fetchFromGitHub { + owner = "amake"; + repo = "flutter.el"; + rev = "4a59efee1cde408c311ef21c6d3e6fd65868ed42"; + sha256 = "1cn247dq85pkmv4wpv5pkfaizlphlns0nh97fgna2qr9ig3hpn6j"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2dc736e396632d7a26c40b6b1de23f41b645722d/recipes/flutter"; + sha256 = "1v8m3rvdivww9bsk52m0ap336ql5zi637byisil4wcivxabc4i94"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/flutter"; + license = lib.licenses.free; + }; + }) {}; fluxus-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -32804,12 +33372,12 @@ melpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "20181214.248"; + version = "20190320.326"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "365e3aa8f3ace560a12b4bf57bbf775b4f9db7a3"; - sha256 = "12lkdzr7iqgrsq3ll12rqka1d5mccx656bgid7f8xf1bipnz0129"; + rev = "c311febff8c9bf07d6c6d486c32a07340ba62727"; + sha256 = "0kfd1a6na2h19ysdr0yziii79mbaqwgd3sjx4f0nvs4rs907a3iq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -32939,12 +33507,12 @@ melpaBuild { pname = "flycheck-checkbashisms"; ename = "flycheck-checkbashisms"; - version = "20160224.906"; + version = "20190402.1918"; src = fetchFromGitHub { owner = "Gnouc"; repo = "flycheck-checkbashisms"; - rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057"; - sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3"; + rev = "2e386775f1a0eb5d80e5d70e98474ee32ecafb24"; + sha256 = "1ai4p0s6wh4sp972fxkjlc4mn6ai1zc27zh4vm63rfrayri1g31z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms"; @@ -33559,12 +34127,12 @@ melpaBuild { pname = "flycheck-elsa"; ename = "flycheck-elsa"; - version = "20181029.721"; + version = "20190211.1121"; src = fetchFromGitHub { owner = "emacs-elsa"; repo = "flycheck-elsa"; - rev = "ea7bac8ddd1e2bf60ee1744a83bc0c4dd1dc70d0"; - sha256 = "0bcfbdnc13jscl7dw06yfzgkamfapfnyqccg8mdm5sin8kvbdhc8"; + rev = "d216bf97e6f4f200354f701fadff669403e18e46"; + sha256 = "1r7xnph5q1si4kp3900nvh1il69nhrb1yfh9h13zwpwfql4add4n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a15c49d2fc800a6b69304edd6dbad90aaa5053f/recipes/flycheck-elsa"; @@ -33577,6 +34145,34 @@ license = lib.licenses.free; }; }) {}; + flycheck-ensime = callPackage ({ emacs + , ensime + , fetchFromGitHub + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-ensime"; + ename = "flycheck-ensime"; + version = "20190212.242"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "flycheck-ensime"; + rev = "9fe000e7004725bc8c3b7554237d717bca9cd9ac"; + sha256 = "0fl6p2hvcm1f5snx8a82h53kkfnbgycik0d5a7krcjgiby6w7wam"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8d1ef354566c7f337c62accbd1d2f86ffcbd98a/recipes/flycheck-ensime"; + sha256 = "11h7xwm8vwi8nca7yy9q0y30jcj77s07aa45xqz7n8rsqp6wdp3z"; + name = "recipe"; + }; + packageRequires = [ emacs ensime flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-ensime"; + license = lib.licenses.free; + }; + }) {}; flycheck-flawfinder = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -33613,12 +34209,12 @@ melpaBuild { pname = "flycheck-flow"; ename = "flycheck-flow"; - version = "20181128.736"; + version = "20190304.659"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "d945f21c74ba8a0f32e1eacb96c1361ebbe2d863"; - sha256 = "1yvzfbvr47yd4ykasw7rlw32jd30b1zryyj1zwcy3dfqc72b3qrg"; + rev = "9e8e52cfc98af6a23fd906f9cb5d5d470d8cf82d"; + sha256 = "14qldlisbmxzammr500gyha2hiv2xgyzfc6mysqii06kbcqn1ik1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -33667,12 +34263,12 @@ melpaBuild { pname = "flycheck-golangci-lint"; ename = "flycheck-golangci-lint"; - version = "20180711.117"; + version = "20190330.712"; src = fetchFromGitHub { owner = "weijiangan"; repo = "flycheck-golangci-lint"; - rev = "b4b51aa6fe5335c0f46f2f83c7dc32e4141ff9f1"; - sha256 = "0kxzziq4d4x1li1cimjckxk5n1429017k39jbfxm4p1bzq1xd6q3"; + rev = "8e446c68311048f0b87febf8ef0379e29d358851"; + sha256 = "0xxxqk8ag082nwwq3dvhzvnbgn9c90mbda7qvi2y4qbh1p1nccqc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fffbecd6cb43866fc9f37ba2d2c998ef6186c6d5/recipes/flycheck-golangci-lint"; @@ -33721,12 +34317,12 @@ melpaBuild { pname = "flycheck-gradle"; ename = "flycheck-gradle"; - version = "20180923.1900"; + version = "20190314.1934"; src = fetchFromGitHub { owner = "jojojames"; repo = "flycheck-gradle"; - rev = "6a61daada4b2353a1c7c223cf8d5bccb907534c8"; - sha256 = "1crfmz3blki768a91pn6gm24fwlfid3pm4xchjr416amm539md08"; + rev = "1ca08bbc343362a923cbdc2010f66e41655e92ab"; + sha256 = "14zvx7f2nszf8p14aibqa4pdg3ly7yw66a58bw2whjw9zfi9rnr0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/382d9afd2bbb0c137719c308a67d185b86d84331/recipes/flycheck-gradle"; @@ -33748,11 +34344,11 @@ melpaBuild { pname = "flycheck-grammalecte"; ename = "flycheck-grammalecte"; - version = "20181129.920"; + version = "20190212.805"; src = fetchgit { url = "https://git.deparis.io/flycheck-grammalecte/"; - rev = "dae94fceeaf6ffc758b58eef6cecaadb6cb6c98b"; - sha256 = "1k72qhjdzd38ij45ji636ybqx8dd4h99di6aqv80z5p7njj93z6d"; + rev = "2f4812eaa6e809051e23c34a085df2b704a15741"; + sha256 = "0xzmr2c74f3375q4nx7zf2jpxawxdkid5mf5nw81wl2v55mv1k2q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd82aa0568d998a3d176b5ee47b8a227438ea09/recipes/flycheck-grammalecte"; @@ -33823,6 +34419,32 @@ license = lib.licenses.free; }; }) {}; + flycheck-ini-pyinilint = callPackage ({ fetchFromGitLab + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-ini-pyinilint"; + ename = "flycheck-ini-pyinilint"; + version = "20190312.1231"; + src = fetchFromGitLab { + owner = "danieljrmay"; + repo = "flycheck-ini-pyinilint"; + rev = "54744a78d06373404933fedc3ca836916e83de51"; + sha256 = "1zdvan6l2s97s7swnccq21z1ja8vl64l757j3hg50ipq8j5yy9dl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a1d0b4be0dd3e238ad2e3a157b11ecc82c0639/recipes/flycheck-ini-pyinilint"; + sha256 = "028ksrlrrsn2wsz7kqf3qk4pp3scs7zvp74c4xj52rm4hh7ycbl7"; + name = "recipe"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-ini-pyinilint"; + license = lib.licenses.free; + }; + }) {}; flycheck-inline = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -33832,12 +34454,12 @@ melpaBuild { pname = "flycheck-inline"; ename = "flycheck-inline"; - version = "20181218.410"; + version = "20190320.911"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-inline"; - rev = "242c975bce9dfae8c36f4986cddb84358a3f9e56"; - sha256 = "0lzy2k7i4jxcixx7ivkhivl5zan6ag9kkxns7wviinj67nwmcvv0"; + rev = "cf9eceabff8370f3b834b943a5777b9f914583f9"; + sha256 = "1sk8r90iqxpzrg0lpq4vd8ywdi08i0bbmgdivmr510jw2bpi3wp4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9ecc3a4696d2b3b0f0b8b1ca6e5285380ac046a/recipes/flycheck-inline"; @@ -34373,12 +34995,12 @@ melpaBuild { pname = "flycheck-phpstan"; ename = "flycheck-phpstan"; - version = "20180801.1041"; + version = "20190227.842"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phpstan.el"; - rev = "afd63d6183f75536c01e456c9cb16b65d0f70a95"; - sha256 = "0dak9nc334dlcq4ss21palnafaysnxnrh8qws2shwvbwnq6kzz4j"; + rev = "1151b8d418af532fdf0732b9793b479c64a364e3"; + sha256 = "0wb9pshgcrq2w9d9fpkywz299ihcb9fffh3fdk8rm1r8irylrjkh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/flycheck-phpstan"; @@ -34455,12 +35077,12 @@ melpaBuild { pname = "flycheck-pony"; ename = "flycheck-pony"; - version = "20160501.1417"; + version = "20190226.1835"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "flycheck-pony"; - rev = "3d3387133a44f5b3f0fb178ef4addf6e1ce1df2f"; - sha256 = "1da10q378k5kbcj0rrpzhm7r3ym4rfwc7v1ialcndbmflsn09m5s"; + rev = "9356cbcd404eaf381ab0c4b0f9c47232f723fa7e"; + sha256 = "1rzz3cl0pxn3hhrkxcdiy17wl4dzbn8kxm3hq90zmhag1gbfy4zz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2bcb82f4ddb92243058c9ab1a67d4f7ef87b155/recipes/flycheck-pony"; @@ -34539,12 +35161,12 @@ melpaBuild { pname = "flycheck-posframe"; ename = "flycheck-posframe"; - version = "20180321.2307"; + version = "20190327.411"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-posframe"; - rev = "61bdfd4b04e1651163fdcaa7dc631ad073b3e513"; - sha256 = "1r5cwmrszp5cvzlcc4dyhajxd0zrgxjpc0arhr2jkw1fc3d611x9"; + rev = "d1591cfaef04c67e1a01a32833f140ab27c33773"; + sha256 = "1c1fxl8l8z5b6k4hb2bk6n6w4diyg9sz04qbqq91qls8rwnnvy0a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/124f2a7833e3386a0bf57c8111d782ae7a7ee02e/recipes/flycheck-posframe"; @@ -34583,36 +35205,6 @@ license = lib.licenses.free; }; }) {}; - flycheck-purescript = callPackage ({ dash - , emacs - , fetchFromGitHub - , fetchurl - , flycheck - , let-alist - , lib - , melpaBuild - , seq }: - melpaBuild { - pname = "flycheck-purescript"; - ename = "flycheck-purescript"; - version = "20161121.907"; - src = fetchFromGitHub { - owner = "emacs-pe"; - repo = "flycheck-purescript"; - rev = "60087203dfc9a1338a77c5d621480eac6f0426e1"; - sha256 = "00iyy7gfhxyz4zna423c6y4wyx0rcd6kd1z50s22bi31bya9w8k1"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a315aad238fa223058a495e1ca8c71da6447024c/recipes/flycheck-purescript"; - sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd"; - name = "recipe"; - }; - packageRequires = [ dash emacs flycheck let-alist seq ]; - meta = { - homepage = "https://melpa.org/#/flycheck-purescript"; - license = lib.licenses.free; - }; - }) {}; flycheck-pycheckers = callPackage ({ fetchFromGitHub , fetchurl , flycheck @@ -34621,12 +35213,12 @@ melpaBuild { pname = "flycheck-pycheckers"; ename = "flycheck-pycheckers"; - version = "20190102.1014"; + version = "20190308.1115"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "23de65612cf29ab77504e8b61aa000f548463410"; - sha256 = "0hjwcb77bmqzajzwmjs01kpqhh7l71vrvad4zlfwhyqnkdsn0x7c"; + rev = "15951d3dfec4c63e4761af53a85f2ade6182bf82"; + sha256 = "01lbh1g2ndgsk71qyskx9aii95bbw787mrf98zh7ihk2ak5nskaz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -34675,12 +35267,12 @@ melpaBuild { pname = "flycheck-pyre"; ename = "flycheck-pyre"; - version = "20181013.1855"; + version = "20190215.422"; src = fetchFromGitHub { owner = "linnik"; repo = "flycheck-pyre"; - rev = "8b14688df52de9f2d8f8ddcb9bc6f2b44bc8e70c"; - sha256 = "0zw76znq80bxa6imn5nyzdpwn3fa0wsm3jfdaayllkqix6x6igvk"; + rev = "0560122caae207d99d8af1ac2b4e5d6f6a1ce444"; + sha256 = "0f58127197q6yfylz53nigyn7v91pcsdd91ywfgq5lrl0f5fvmdy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aca6199ebfbf93f844c8f7a3db785dec079ef8af/recipes/flycheck-pyre"; @@ -34693,32 +35285,6 @@ license = lib.licenses.free; }; }) {}; - flycheck-rebar3 = callPackage ({ fetchFromGitHub - , fetchurl - , flycheck - , lib - , melpaBuild }: - melpaBuild { - pname = "flycheck-rebar3"; - ename = "flycheck-rebar3"; - version = "20180806.1403"; - src = fetchFromGitHub { - owner = "joedevivo"; - repo = "flycheck-rebar3"; - rev = "3cca1268c54643204b5bae52e3f0bf5bc921018c"; - sha256 = "19jfzswli21zqffig0946y0zv9ringhsgg6g6av1rnpq716fhp6h"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3"; - sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc"; - name = "recipe"; - }; - packageRequires = [ flycheck ]; - meta = { - homepage = "https://melpa.org/#/flycheck-rebar3"; - license = lib.licenses.free; - }; - }) {}; flycheck-rtags = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -34759,12 +35325,12 @@ melpaBuild { pname = "flycheck-rust"; ename = "flycheck-rust"; - version = "20180904.417"; + version = "20190319.846"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "f1220ccd9acbdb2556765f49f2f3dcb00dca2970"; - sha256 = "1m5ic4xapyansyifs8rrjdw2l9l4wnvmc51aflflmj7c13f0lvwr"; + rev = "a139cd53c5062697e9ed94ad80b803c37d999600"; + sha256 = "1fh6j5w2387nh2fwwjphkhq17cgj5m2q5k0fhidvgc2w65lzbr1r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -34896,12 +35462,12 @@ melpaBuild { pname = "flycheck-swift3"; ename = "flycheck-swift3"; - version = "20181116.402"; + version = "20190125.2050"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "37994f11c93f585119647e6ba10761e9766b593d"; - sha256 = "12611z7f53pw0yn70m40nsp6qd2jpm2hdf8s2gqz4lf0qh2z91lb"; + rev = "ba4e831ff04b180323435214dd4cca8184968ad1"; + sha256 = "1ss2s3q2mv07ph87i2fki1nxq6b51xs4i1mll1faplj2nrr2hyzm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -35061,12 +35627,12 @@ melpaBuild { pname = "flycheck-vdm"; ename = "flycheck-vdm"; - version = "20181127.1223"; + version = "20190304.39"; src = fetchFromGitHub { owner = "peterwvj"; repo = "vdm-mode"; - rev = "e131edb0d35de28bd47d6128dd70d9a6fc46e0fa"; - sha256 = "090a0imk7dr6vqq4lf806pvajqc499x2gmi0k7rgc1696rbyzhb5"; + rev = "103993147b24325ef68099d087dce9ac501f02f9"; + sha256 = "1amwm9m6d0z5pjkp9ng8xma57058br3fvnhk64placlln6fkajbz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f246b9dcf7915a845b9e2cd44cc1a0833b412c8f/recipes/flycheck-vdm"; @@ -35454,12 +36020,12 @@ melpaBuild { pname = "flymake-gradle"; ename = "flymake-gradle"; - version = "20180923.1900"; + version = "20190314.1933"; src = fetchFromGitHub { owner = "jojojames"; repo = "flymake-gradle"; - rev = "812f2ecf93781b0c152cd278f9cb5a6b662d66bf"; - sha256 = "1dns1k0jp8av9yx5d3061x82f0kfm6a2gkax954l7f03mhiyxmww"; + rev = "dbedd29b78d4828ef57d4de20867be5df3eaab99"; + sha256 = "0g6h09lz68b4dvqv5sksr7gkab0599fbm07xnc2mk01lzbas43b0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cccc8537324e0faf7fd35325e3ccd3b2e05771a/recipes/flymake-gradle"; @@ -36369,12 +36935,12 @@ melpaBuild { pname = "focus"; ename = "focus"; - version = "20171203.2103"; + version = "20190317.1942"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "045ee6175e9340f873db03445c74ff9eefa35a27"; - sha256 = "1hrx8bj4gf0dqbfxgvis62zxnkiyms6v730s55vd8711zxdl0pw4"; + rev = "ab42b8779929beeb7878c7fb3d3ccd80d9327c7f"; + sha256 = "079v1syid7h2vr2ya6hs6hl0pgj60qdsw60mqw4cj2zllmkrkwj4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -36421,12 +36987,12 @@ melpaBuild { pname = "foggy-night-theme"; ename = "foggy-night-theme"; - version = "20160209.708"; + version = "20190123.814"; src = fetchFromGitHub { owner = "mswift42"; repo = "foggy-night-theme"; - rev = "60a12abdac29c2d913e1cf24485d0cc083e26093"; - sha256 = "1mnak9k0hz99jq2p7gydxajzvx2vcql8yzwcm0v80a6xji2whl70"; + rev = "14894e06ee5c6e14db36f2cb07387ee971c1736f"; + sha256 = "1rjhb8gjlnw002y8sjn2d976qdsjgvp9hsrlca1h5wmmkfha9knp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/65b3f5959241e601fdf9469e407d153cebcbe24c/recipes/foggy-night-theme"; @@ -36679,12 +37245,12 @@ melpaBuild { pname = "forecast"; ename = "forecast"; - version = "20180429.1515"; + version = "20190124.1028"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "ffe03506694c94de0444995f973a925deccc400a"; - sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r"; + rev = "b19b37be332bada6b18d4d895edf6ce78ab420c4"; + sha256 = "0i97l8fdrjjb6dzfcqgss5yj4ibkiaxnj32sm6nyr2s7bijkvi4x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -36789,18 +37355,18 @@ , let-alist , lib , magit - , magit-popup , markdown-mode - , melpaBuild }: + , melpaBuild + , transient }: melpaBuild { pname = "forge"; ename = "forge"; - version = "20190101.1658"; + version = "20190407.915"; src = fetchFromGitHub { owner = "magit"; repo = "forge"; - rev = "e2ee3cabc7a9e2f3198dd25a17bf591450175903"; - sha256 = "1y4jhys4ypikmzh5ym8m7n0l670sk97pvs5nbk4xzyww2vy6cpxr"; + rev = "d803da1d817453684c644ef2822c7e29cee768e3"; + sha256 = "1d10wb5j6lnc2r87qhwmfzbs9gav178g8vwsgx9cfhzzk9hyqd02"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23512cf8152161322960d72a5ec49a7595003477/recipes/forge"; @@ -36816,8 +37382,8 @@ graphql let-alist magit - magit-popup markdown-mode + transient ]; meta = { homepage = "https://melpa.org/#/forge"; @@ -36858,12 +37424,12 @@ melpaBuild { pname = "format-all"; ename = "format-all"; - version = "20181207.1219"; + version = "20190330.1206"; src = fetchFromGitHub { owner = "lassik"; repo = "emacs-format-all-the-code"; - rev = "87c7a43abb43722eb49f3591ef4a687cc26ce7d0"; - sha256 = "0n4qd56hllddvnbxwwc6r7mcfvwycgahm9wrb3lqh0m5bllp56kx"; + rev = "7dd5c5e9f73ae36bb78567ee429ac88220938b6c"; + sha256 = "0j20k0d7v5zjdr2hkn3r9vymw343qkp1j8gj6jylr3j51c4gd2x3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f53143ebd42ef5be793b86d50b23f0a57617d6cc/recipes/format-all"; @@ -37068,12 +37634,12 @@ melpaBuild { pname = "frame-mode"; ename = "frame-mode"; - version = "20170419.1427"; + version = "20190306.1949"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "frame-mode"; - rev = "c0feebf8eab91ac0646a4d30be946e551bb5267f"; - sha256 = "19a7vxr1qhxr1yh9mvlhrbnpmqk9qmbmb4gwxrwdsqrac3fs3lr7"; + rev = "4551bf43bc087448ce0edcd67c36f68649e95274"; + sha256 = "0p3j6h8rcxwjmylg9rx86n6y6bysicif1hxan6xdwz3pskkhm3lj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e83da89eeee834cc14c0b128d55ef3634f76fd0/recipes/frame-mode"; @@ -37096,12 +37662,12 @@ melpaBuild { pname = "frame-purpose"; ename = "frame-purpose"; - version = "20181229.1311"; + version = "20190114.603"; src = fetchFromGitHub { owner = "alphapapa"; repo = "frame-purpose.el"; - rev = "bf17e2bb89ab5655355515e8b59c3c225abf29b9"; - sha256 = "1pvys1d9f99kb9f1yz7znq6n83iaym9ymqma5x3gwfjc0jwizig8"; + rev = "78f978f13589ec5c5370187c008c8aa83e6e71b4"; + sha256 = "0zd981jsbf8fj5a3s7agbg32f6x3s7g87jlz13msgpgmkfhpx3gx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/033bd36a2419f4521944ccbfe8ce1eb56af20472/recipes/frame-purpose"; @@ -37363,12 +37929,12 @@ melpaBuild { pname = "fsharp-mode"; ename = "fsharp-mode"; - version = "20180518.1120"; + version = "20190304.517"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "68d2121a7317d90fe3794c9295d117f4aebd1438"; - sha256 = "0mymvik20slbgsasjpn6nkqcb4z6z4mvd1sf1xalv0qjk24vrlmk"; + rev = "386994e7d420872a31d7dd2eee9610d8ace98faa"; + sha256 = "15blnkcrsmm6896dpdzcx3xqzxzkc0x8d5bg9b5sw7qca6vnjbqk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -37403,12 +37969,12 @@ melpaBuild { pname = "fstar-mode"; ename = "fstar-mode"; - version = "20181110.549"; + version = "20190319.1401"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "0089f2d4451f73c389f82ebff9e22773f2d0014d"; - sha256 = "1mwqdww9sw14s4h4hdndadkxh8lgynwjkfyzf55fnjhf068hzsv8"; + rev = "d63d1c48573c82317e5b5991486d1595094bcccd"; + sha256 = "0zz4dv28lpycjryb2lswpjwh4lhf6hh73grisk0ql33hg4rmsqwx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -37610,7 +38176,8 @@ license = lib.licenses.free; }; }) {}; - futhark-mode = callPackage ({ emacs + futhark-mode = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -37618,19 +38185,19 @@ melpaBuild { pname = "futhark-mode"; ename = "futhark-mode"; - version = "20190103.616"; + version = "20190302.124"; src = fetchFromGitHub { owner = "diku-dk"; repo = "futhark-mode"; - rev = "9f778251c13fcfae27d4f764f18fd727985e0e2e"; - sha256 = "0fhwyw2la3h1papr1cnxmzywy41pgqcx5q9agz08pncl52lsxjvs"; + rev = "7140d0fcd509fac6deeda5b4065ede5ee5922466"; + sha256 = "06dpspyyqqwb2vhdxmxgw0n8kpb2zw5qczp4bck9vkayqxqb8ahn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97210774b450b7611d2bfdf36e04a425835d86b9/recipes/futhark-mode"; sha256 = "1sck984a8m0i9n07jnhpnin6k060756g73ix34ghzd65j5f0pvlw"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/futhark-mode"; license = lib.licenses.free; @@ -38030,12 +38597,12 @@ melpaBuild { pname = "geiser"; ename = "geiser"; - version = "20181128.352"; + version = "20190224.1248"; src = fetchFromGitLab { owner = "jaor"; repo = "geiser"; - rev = "b421d3b4693249e2e46095693b41eed1e8161a58"; - sha256 = "0bvlv2yx9x8zb8ndkmk91gpd55c0ms9vgjw23nl89zda2gmlazzx"; + rev = "156970ff1402512b4bbf53a5e1c22156cb0e2f9c"; + sha256 = "0n295p54zigbdiclfkacz3rqkxr6aib1npz0x8nkhnhv5avcwgyf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67dc8d6e33f3522043f96761b23ea68c9c27084e/recipes/geiser"; @@ -38057,12 +38624,12 @@ melpaBuild { pname = "general"; ename = "general"; - version = "20181229.742"; + version = "20190308.1342"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "90da0ca74f83eceacb0a7b8d2d44dd699c5d534e"; - sha256 = "0w3lify62hb2g7kb3gypfich1v74iqnk1g8iha6xwkikfayk8v7g"; + rev = "5f1ae7fcf24c0a9d9aec164944796783c8d77d09"; + sha256 = "0xr4jbghr32q31hlsffslc43jj9qnn9pkz2v2pbl1ba4rh8dafjz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -38216,12 +38783,12 @@ melpaBuild { pname = "ggtags"; ename = "ggtags"; - version = "20181220.1838"; + version = "20190320.1508"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "2f538aa15c60ad8365b7240579f67a90f600c1d1"; - sha256 = "16fjj3f5i3kjvk93bm8y5ginwk6rkizkgd63y4fi799rx12n2kc2"; + rev = "4d9000034d352cd983ae6626f560e434d0b3e9ca"; + sha256 = "1h89prfxdr50drsira3qqvh1mb7v09p4w8jpb7aapq2jl5fl2knc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -38456,12 +39023,12 @@ melpaBuild { pname = "ghub"; ename = "ghub"; - version = "20190101.1709"; + version = "20190319.1643"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "f1b8aebf99a7de298de6333a82c9b714609f2e99"; - sha256 = "0nn0y194m7l1pzsv83vvhghfrnwqv7w8770g9nsrps0f0jhfi7rf"; + rev = "c7ca6780bcd4d00d22e668e74b25f865ba892a45"; + sha256 = "0icy333p2f9bsg552hjliqi6b9cmygf2ix10xgbam1zzh1b77clz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/ghub"; @@ -38510,12 +39077,12 @@ melpaBuild { pname = "gif-screencast"; ename = "gif-screencast"; - version = "20180827.135"; + version = "20190326.149"; src = fetchFromGitLab { owner = "Ambrevar"; repo = "emacs-gif-screencast"; - rev = "62e69ea464e87f1f7791d95a4fbbe9b70a84668a"; - sha256 = "1q02mk4pzaxdl8sf191iwxz481gaqfc9nvd4v95ggjyp3ahq1y4n"; + rev = "248d1e158405e6cba2c65ecaed40e2c59b089cd8"; + sha256 = "19xqi5mgalnnhb4hw0fh7py2s2dllldx1xxbhwhknkdpifai8hl8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/gif-screencast"; @@ -38745,12 +39312,12 @@ melpaBuild { pname = "git-command"; ename = "git-command"; - version = "20160111.503"; + version = "20190310.2211"; src = fetchFromGitHub { owner = "10sr"; repo = "git-command-el"; - rev = "a2c192aa779f81a99a10f0eb6dd018f13b2ff949"; - sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl"; + rev = "89169f4b8e8d2546cac81d38bf584764e630812e"; + sha256 = "1dgy9c7q0lxx5k5vdjcil6405qjpqpyq3s0ndh8fn6ybbhap9jda"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55d697bc95a7026c7788c13e4765e1b71075e3/recipes/git-command"; @@ -38773,12 +39340,12 @@ melpaBuild { pname = "git-commit"; ename = "git-commit"; - version = "20190101.1707"; + version = "20190319.1652"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "cc435005b07bd7ba17962ffa4e210b441e8a1a52"; - sha256 = "1aiqqdc8j81d16bvj978a6z50rfhl18j0grad7r9wnwd6bda64gz"; + rev = "24fd932a2344306be82efec599212b0535abf253"; + sha256 = "14b1czjwjhi6xlnfg7vdjvp2fc927cpd8r1xp8kvnfjviwmav6gf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -38989,12 +39556,12 @@ melpaBuild { pname = "git-lens"; ename = "git-lens"; - version = "20180328.717"; + version = "20190319.642"; src = fetchFromGitLab { owner = "pidu"; repo = "git-lens"; - rev = "ea49e2e005af977a08331f8caa8f64d102b3b932"; - sha256 = "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"; + rev = "f6cc0a37c9c5c422c49c32650e70bc4721707985"; + sha256 = "05bkpg7xz8644np9imsj5ms821sbsb784ap5fjdnnn69kllz0d33"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-lens"; @@ -39015,12 +39582,12 @@ melpaBuild { pname = "git-link"; ename = "git-link"; - version = "20181030.1959"; + version = "20190309.1526"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "976723dfdb9ae42e093a3cb32fc41841e94201e6"; - sha256 = "0xsyzgwbsnf4xah860182pfirkfbixsf0nkfm05n1rvid7a6495d"; + rev = "1dbabfed4c5c3c5ac6ffa9035a9c3d4c6cc7f885"; + sha256 = "1b115d5rsb9m8lqjplg3qp0bxfc5cij5fgp0j21zspqwqvj7h0hq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -39142,23 +39709,24 @@ , fetchFromGitLab , fetchurl , lib - , melpaBuild }: + , melpaBuild + , transient }: melpaBuild { pname = "git-timemachine"; ename = "git-timemachine"; - version = "20181204.746"; + version = "20190317.847"; src = fetchFromGitLab { owner = "pidu"; repo = "git-timemachine"; - rev = "3a4a7f11af613090122d1d4bb8823eaeed93398f"; - sha256 = "0qfwqnp2yxgb3jgzlv33n6zvk24bgrrh6h1aj8hxnpdca0nihx8v"; + rev = "b97f93d66cffcd69281346845d3a1e32197eda29"; + sha256 = "08zsn3lsnnf01wkv5ls38jga02s5dnf0j3gigy4qd6im3j3d04m1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-timemachine"; sha256 = "06xdzic7j3d3pqgwxp1q6fs8sf3mi02a9phjvhk90kyvbr8h94ck"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs transient ]; meta = { homepage = "https://melpa.org/#/git-timemachine"; license = lib.licenses.free; @@ -39453,6 +40021,35 @@ license = lib.licenses.free; }; }) {}; + github-review = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ghub + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "github-review"; + ename = "github-review"; + version = "20190327.32"; + src = fetchFromGitHub { + owner = "charignon"; + repo = "github-review"; + rev = "9c3ffe30fba5d02e9951e76d1a5be2ed046663da"; + sha256 = "078rv6f2p3wrznhgvmkhd071bwy72007f5l2m2a0r1k2i3vbfaja"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3b57420d20c799c0472dae4ab7e017d53dafb262/recipes/github-review"; + sha256 = "1vh24bmvafv9px80gwgcgk7d9z6pjxaadzz7fba8r3m3fzhv4v58"; + name = "recipe"; + }; + packageRequires = [ dash emacs ghub s ]; + meta = { + homepage = "https://melpa.org/#/github-review"; + license = lib.licenses.free; + }; + }) {}; github-search = callPackage ({ fetchFromGitHub , fetchurl , gh @@ -39621,12 +40218,12 @@ melpaBuild { pname = "gitlab-ci-mode"; ename = "gitlab-ci-mode"; - version = "20181127.1041"; + version = "20190323.952"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode"; - rev = "99214277a0ea0f20472631e05ba8302997d5d364"; - sha256 = "1xwsdclv1q98dsb79bd9yq050axqzc1y4vswz4gf5zhshmfvg130"; + rev = "cfd39298a87e989473278d819dc0498a43fce45d"; + sha256 = "1naa7fngfzdj884kfriv777d99ksn36kxqv5rl5zv6h1sl25c6pr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; @@ -39649,12 +40246,12 @@ melpaBuild { pname = "gitlab-ci-mode-flycheck"; ename = "gitlab-ci-mode-flycheck"; - version = "20180604.1504"; + version = "20190323.1129"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode-flycheck"; - rev = "30ea0eab74b24818f187242b079845785035e967"; - sha256 = "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798"; + rev = "eba81cfb7224fd1fa4e4da90d11729cc7ea12f72"; + sha256 = "1w1simnlffg56j79gal1qf1nlav9f8fmr2zfswfrmcv6cac6fhj9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode-flycheck"; @@ -39775,31 +40372,6 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ fetchFromGitHub - , fetchurl - , lib - , melpaBuild }: - melpaBuild { - pname = "glab"; - ename = "glab"; - version = "20180821.851"; - src = fetchFromGitHub { - owner = "magit"; - repo = "ghub"; - rev = "d75ba1bd8843f53ae3e37b206187b3b97d9f3540"; - sha256 = "0h9v8l1v9wa5sxng16qqlpgqpdi6an7fn83frrk4lfxf555mm2aq"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/glab"; - sha256 = "0kyr1znf82qi15r6iha6dbyhmfzghx969hd364rsvkly8ry8pk5m"; - name = "recipe"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/glab"; - license = lib.licenses.free; - }; - }) {}; glsl-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -39807,12 +40379,12 @@ melpaBuild { pname = "glsl-mode"; ename = "glsl-mode"; - version = "20170927.736"; + version = "20190326.1251"; src = fetchFromGitHub { owner = "jimhourihan"; repo = "glsl-mode"; - rev = "384968506cf25c5c2df61b32fdfdbd041e3bf651"; - sha256 = "0729s4w010vw4ajvh1zpni7szxv9rpm6jk2y9hp7qyi67zbgjjgc"; + rev = "ee5d6aa5631e26792fa27c7e418224d514454591"; + sha256 = "1acgx4k4cb6pgvwzdgck9v9gk3ffnmvl7ylsljbi7pjxsiqkzp45"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode"; @@ -40115,12 +40687,12 @@ melpaBuild { pname = "gnus-recent"; ename = "gnus-recent"; - version = "20181228.1051"; + version = "20190115.951"; src = fetchFromGitHub { owner = "unhammer"; repo = "gnus-recent"; - rev = "b73c7b069c22b84182b22bbffc39c1073aa309c8"; - sha256 = "04riqy1jzidg0jzdiaj707smypnqj0zx1vm6k0ghhswwly8brlfq"; + rev = "c6b287532fe82e95dce5a488f752c122567f9348"; + sha256 = "1lpjs5qgvplbbm2waixiyj3mk4698h09150chm1mwxjc0np2acj1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b80d94cf1a8b8e2d4da5d45f65231aa4884a3a0/recipes/gnus-recent"; @@ -41217,12 +41789,12 @@ melpaBuild { pname = "google-translate"; ename = "google-translate"; - version = "20181201.1656"; + version = "20190206.429"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "17a1ddc074b96cdc3b8199ccb06824a7a95bf9ff"; - sha256 = "09sxphprj3aq9q2dpy5gmyjnwjcyd3vb4jcg0mx3cv3ibly86ysl"; + rev = "bf119aac424994d2aa91fce9630adc01ed0ea617"; + sha256 = "05ljjw7kbnszygw3w085kv57swfiiqxri2b5xvsf5dw3pc3g7j3c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -41373,23 +41945,24 @@ goto-chg = callPackage ({ fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , undo-tree }: melpaBuild { pname = "goto-chg"; ename = "goto-chg"; - version = "20181228.503"; + version = "20190110.1314"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "goto-chg"; - rev = "e6e4298ac53a030933ddba76f6efe68aa929faf0"; - sha256 = "1zc8n5ggm6m5pnxvaq9nc6gjx72qkr14rigglib94ggy1hmjxgwa"; + rev = "1829a13026c597e358f716d2c7793202458120b5"; + sha256 = "1y603maw9xwdj3qiarmf1bp13461f9f5ackzicsbynl0i9la3qki"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ undo-tree ]; meta = { homepage = "https://melpa.org/#/goto-chg"; license = lib.licenses.free; @@ -41446,6 +42019,32 @@ license = lib.licenses.free; }; }) {}; + goto-line-preview = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "goto-line-preview"; + ename = "goto-line-preview"; + version = "20190307.2336"; + src = fetchFromGitHub { + owner = "jcs090218"; + repo = "goto-line-preview"; + rev = "1e361d8c0b9596154db579e6ae5edbd51e12eedc"; + sha256 = "16zil8kjv7lfmy11g88p1cm24j9db319fgkwzsgf2vzp1m15l0pc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/231e0b056114a63aa472ccfc0cd24f2f12a31600/recipes/goto-line-preview"; + sha256 = "1mbc9p96rrxpafdfx7wq50aj4fd3c47p7pqjwqqfdgk9dskmsjc2"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/goto-line-preview"; + license = lib.licenses.free; + }; + }) {}; govc = callPackage ({ dash , emacs , fetchFromGitHub @@ -41535,12 +42134,12 @@ melpaBuild { pname = "grab-mac-link"; ename = "grab-mac-link"; - version = "20180328.745"; + version = "20190302.646"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "35edb57d136c2a9726fd14e6a59cce4fc0248771"; - sha256 = "1c3g6ygi71qm3lqvhjjzxkpdhwkpx4qwm8mhinwffcib5hagrafn"; + rev = "94e6130d7542bafdf594e45606d1148b0a5687f7"; + sha256 = "0p55gs2xkfw2lgzkaxjy869hqi1gqnxbxgndvkczzj3f0nzfsa0y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -41816,12 +42415,12 @@ melpaBuild { pname = "graphql-mode"; ename = "graphql-mode"; - version = "20181223.652"; + version = "20190320.57"; src = fetchFromGitHub { owner = "davazp"; repo = "graphql-mode"; - rev = "0f2b4b16049b7b4043575f0ec592305624a8775c"; - sha256 = "0cq72dcidmqld7gb0wdw36k75jwbpwrhi47lff1xxyllh7nwvgk9"; + rev = "ebd6502c0901dd2864a6ac893659a0cd74b6ba73"; + sha256 = "169bp2ps0i931qlcn0nsngs8dycqzlr3dcb5smnlmbjylmqi9yjq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; @@ -41935,6 +42534,32 @@ license = lib.licenses.free; }; }) {}; + greek-polytonic = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "greek-polytonic"; + ename = "greek-polytonic"; + version = "20190303.558"; + src = fetchFromGitHub { + owner = "jhanschoo"; + repo = "greek-polytonic"; + rev = "114cba0f57cc077871693c799b807df2292341ec"; + sha256 = "09prvjnhvirip6s0rlsp7pyyaj9xswvvjskxb2977ymki8ijxmqf"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0e6206be0e6f416c59323cf10bf052882863f3/recipes/greek-polytonic"; + sha256 = "0rp5iwiznp95r8srxvq72hna2hgcqj4q1dvg2ma86cqzgqwr4xnw"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/greek-polytonic"; + license = lib.licenses.free; + }; + }) {}; green-is-the-new-black-theme = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -41942,12 +42567,12 @@ melpaBuild { pname = "green-is-the-new-black-theme"; ename = "green-is-the-new-black-theme"; - version = "20180322.1903"; + version = "20190313.1205"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8"; - sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m"; + rev = "65a2b7e7cc6497fbc851319225842a1624bfecc5"; + sha256 = "1jlmrakj8kf7n2zzmrsacrmvlcwfl27a4zwrvigw28z13z7g5a3g"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -42203,12 +42828,12 @@ melpaBuild { pname = "groovy-mode"; ename = "groovy-mode"; - version = "20181111.257"; + version = "20190407.1614"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "f80b6795f645aff592ffbdc6b500084955094f5c"; - sha256 = "14wlr28hkb4za3pdd3z6s2nb20rwy064cjv0kcca56hyd71i2i4w"; + rev = "aa531c659758b896ff8fbd307080ce0d1d04ebfb"; + sha256 = "0jcqldpgx9b0xsvxvj7lgqrb39cwn7adggrlxfcm0pgc40dpfwb4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -42282,12 +42907,12 @@ melpaBuild { pname = "gruvbox-theme"; ename = "gruvbox-theme"; - version = "20181013.444"; + version = "20190406.1946"; src = fetchFromGitHub { owner = "greduan"; repo = "emacs-theme-gruvbox"; - rev = "39124183cf47d25780cd02e33e57743484b4c680"; - sha256 = "1zaba3hlk0h3n20gyk1s6kd2hdk47vfm6yb8fa4v80znhmgfwhac"; + rev = "f05bfb9d8be4270dc919d14410f16f7da1fcd9e0"; + sha256 = "126kqvgjy71rimr4f7sgnh2j73i3i0s650bx84jl8n4k48x0hwz5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/gruvbox-theme"; @@ -42332,12 +42957,12 @@ melpaBuild { pname = "gscholar-bibtex"; ename = "gscholar-bibtex"; - version = "20170913.1457"; + version = "20190129.2155"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c"; - sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2"; + rev = "3b651e3de116860eb1f1aef9b547a561784871fe"; + sha256 = "0wwjz4k1hsc1z489ygz4kh3dh23d7pnkgg2js07as7038hmhkjcb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -42384,12 +43009,12 @@ melpaBuild { pname = "guess-language"; ename = "guess-language"; - version = "20181124.919"; + version = "20190325.736"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "guess-language.el"; - rev = "bc6fe11d7ea36d5319ac05c00d52b50d42d64cea"; - sha256 = "1sfvlpqfp24gbav7ahhwgaakiw4xn07mzgxwnqhwr5ilj6322w0i"; + rev = "e64d88f287a547198e4c96e2fff543e103f2b456"; + sha256 = "0dmbr7gylnc1dsjaldfw51nmli66lizs1w5a8p1zacpf7w5kf7x2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language"; @@ -42470,12 +43095,12 @@ melpaBuild { pname = "guix"; ename = "guix"; - version = "20181222.1355"; + version = "20190107.1126"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "495baedc983070f0158442173bdef0a35c2a1e9d"; - sha256 = "0p2sn6siq7ns1qjw51jcr20v0dz1z7s11mym892hiq6hib2ykdgz"; + rev = "c4c96663fefe7e007c372e7d24d6e7016b70e4ee"; + sha256 = "1730q2dm84f15ycjdf3dgl2j8770mhr6qnyzxgac3zzkjr8pyvq7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -42624,12 +43249,12 @@ melpaBuild { pname = "habitica"; ename = "habitica"; - version = "20181024.1111"; + version = "20190401.2121"; src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "d977984ac342e9177ba98f400b3c160c450c936d"; - sha256 = "10x0bcd67b2q4zhww6bzqics18kkv198d2hy6digi385fkwhvfxb"; + rev = "4f708d0fc0564fa3b624452b9f24ba4a6eeae181"; + sha256 = "1g0flh50j2gzx3414id758klvrxgdk5p26hpxdab46f8kvjylgip"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -42651,12 +43276,12 @@ melpaBuild { pname = "hack-mode"; ename = "hack-mode"; - version = "20181207.342"; + version = "20190407.1646"; src = fetchFromGitHub { owner = "hhvm"; repo = "hack-mode"; - rev = "789207479cea0adc3f2ba4d567964a261b782e9d"; - sha256 = "0930h02z3z644jzbq970nmdk10jlldvyw0fd6gzs4x1z99bjrxad"; + rev = "831bab05b283a719a4762fec0082cc599def93c7"; + sha256 = "1nzlzldmnz9hc9i09lzs4wqqvwv0x5n69kv0lq9rs5cqjm7yyphq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27e238e5d2aaca810fd3fb6836ca49c9fa07cc87/recipes/hack-mode"; @@ -42723,25 +43348,24 @@ }) {}; hackernews = callPackage ({ fetchFromGitHub , fetchurl - , json ? null , lib , melpaBuild }: melpaBuild { pname = "hackernews"; ename = "hackernews"; - version = "20181123.1722"; + version = "20190211.1535"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "916c3da8da45c757f5ec2faeed57fa370513d4ac"; - sha256 = "09bxaaczana1cfvxyk9aagjvdszkj0j1yldl5r4xa60b59lxihsg"; + rev = "30798c7bc8cb7cd732d49a274d74057b4ce6cf74"; + sha256 = "1iifzz2n8ca6275rwmd3xp9lv0jp3c8nzhmrw3aarsnwdmxr1hmh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a"; name = "recipe"; }; - packageRequires = [ json ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/hackernews"; license = lib.licenses.free; @@ -42860,12 +43484,12 @@ melpaBuild { pname = "haml-mode"; ename = "haml-mode"; - version = "20170923.2153"; + version = "20190219.1302"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; - rev = "1cbb2de8f0fc25f35448c5cad04642f28078f3bb"; - sha256 = "1045bf7bq914d3577kg9xakm4yciwwsvlh5qwfk4wnsraf7rld0r"; + rev = "bf5b6c11b1206759d2b28af48765e04882dd1fc4"; + sha256 = "1zh19b9az4ql87vjmjm0j7y6c4ir6w3rh0n4sxzqqpnv8xpd4b44"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; @@ -43249,12 +43873,12 @@ melpaBuild { pname = "hasky-extensions"; ename = "hasky-extensions"; - version = "20181231.2310"; + version = "20190204.1216"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "fc36f6ebfa296764076858c858ce508b24895255"; - sha256 = "0wy90lr5gpp3cby8flwsnzf5dxv2dv88xby0fadx3kmwh9c40mr6"; + rev = "eb1437f815bd93946ecf707e8d24dc704c273586"; + sha256 = "1r8xbfxjig2qgkvfd2yy1b5vpn1l49h504b0zbdir9hkipwzmls9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -43277,12 +43901,12 @@ melpaBuild { pname = "hasky-stack"; ename = "hasky-stack"; - version = "20181231.2311"; + version = "20190304.1448"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "b2d3d2906523973310c83cf253341f332cdf8fc2"; - sha256 = "0gqfylcwc1py26dw73nzad8d1r0f091r8rb0j7a8dxsf4hvpw8ya"; + rev = "a3176aece9a9ab0a36ae795965f83f4c1fa243bf"; + sha256 = "1j9cvy95wnmssg68y7hcjr0fh117ix1ypa0k7rxqn84na7hyhdpl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -43539,12 +44163,12 @@ melpaBuild { pname = "helm"; ename = "helm"; - version = "20181221.1344"; + version = "20190407.1013"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "d27efee1002e6afc31b0fea9e4c14fe6330d8437"; - sha256 = "1l8xma5xp7xib6pizy7w68kpdmaw5iy84hahdi60977scc0al1zh"; + rev = "a52049cc51a7db2f2a98c93e0eef7a419271c7a7"; + sha256 = "0yb1hjs79g5417cw3kihdk8hvjx3lllf63qn0mn59zk62s9cdw68"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -43817,12 +44441,12 @@ melpaBuild { pname = "helm-bibtex"; ename = "helm-bibtex"; - version = "20181030.1442"; + version = "20190214.809"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "af05ccb498d89550644cc01c80628053d4d2d73f"; - sha256 = "0m2yn7n7i5kn31m72006n58qw8qhklylna0l2yv4maf46k527xxw"; + rev = "72cdad743706f4bed185f7be918f67a8c3dcb59f"; + sha256 = "17f2gf4rsg3fqsj4kwiyi7cnr1q4xiam8b31kv2p1smh4qw8yfnh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -44245,6 +44869,7 @@ }) {}; helm-codesearch = callPackage ({ cl-lib ? null , dash + , emacs , fetchFromGitHub , fetchurl , helm @@ -44254,19 +44879,19 @@ melpaBuild { pname = "helm-codesearch"; ename = "helm-codesearch"; - version = "20180203.2033"; + version = "20190405.411"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "87a68168b7c1490769305db0df60035e47799a75"; - sha256 = "0wiyz0kh2m2mpjhnl2mvsx2gvhkmmk0xaw432mxr48zz9jjnlha9"; + rev = "1dd925cdc7527f4e1cfb433d823d1be805455df3"; + sha256 = "1dpym7bwaavw9ggdhvma32f3kd0psrb4s2pcgni0j53hmawl7szr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q"; name = "recipe"; }; - packageRequires = [ cl-lib dash helm s ]; + packageRequires = [ cl-lib dash emacs helm s ]; meta = { homepage = "https://melpa.org/#/helm-codesearch"; license = lib.licenses.free; @@ -44337,12 +44962,12 @@ melpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "20181224.2239"; + version = "20190407.1014"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8433e877e31537d65e017219c1fe226abd78ae57"; - sha256 = "14z01xsv9lkzi9dr3w7glvkzjqghs5p1fqiaycdxhcmpizhvb2ja"; + rev = "a1791980f9ddca1989c65a67e6997bdde481dc27"; + sha256 = "1g6gj6wq3yiazyf73zk8hqc3nv52fg42g5gv5n8v766a3fb7bisq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -44366,12 +44991,12 @@ melpaBuild { pname = "helm-cscope"; ename = "helm-cscope"; - version = "20170326.22"; + version = "20190406.151"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "helm-cscope.el"; - rev = "3cc7259ab4989f9f7ca039e703cdac14b907530a"; - sha256 = "0gh4csq6v6lqqpi966iwl2238wgkmr3vxb4kxffajpk8r0cq1c9x"; + rev = "e4698933e26524c025533cbb8fd1e1ab61e1d940"; + sha256 = "0lq0qhgacafz56kblkghs6pgh4linw3s2646zcamy0psksmxjcli"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope"; @@ -44448,12 +45073,12 @@ melpaBuild { pname = "helm-dash"; ename = "helm-dash"; - version = "20180503.218"; + version = "20190316.1309"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "0ac2db529577fa63f2ed32310062873c585b91de"; - sha256 = "0jsa4vvhbcndv47gssjnk3fwbld73jhf0f5l7hjkq82ckimw0bvi"; + rev = "192b862185df661439a06de644791171e899348a"; + sha256 = "06am5vnr4hsxkvh2b8q8kb80y5x1h3qyv7gwggswwhfa7w2vba3w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash"; @@ -44722,12 +45347,12 @@ melpaBuild { pname = "helm-emms"; ename = "helm-emms"; - version = "20180405.2228"; + version = "20190304.232"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "d3f9bdef8ff0d093eaf6e26af50ea905ab53fdec"; - sha256 = "0bdb8xp0yp3gijpa9i2rc17gfzjhzlm92vdzw93i10qpd1xhj4aa"; + rev = "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd"; + sha256 = "1595r09y3rmwd46nnhvjja3hb8j2ila295ijxv61cg52ws4wginh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -44776,12 +45401,12 @@ melpaBuild { pname = "helm-eww"; ename = "helm-eww"; - version = "20180827.136"; + version = "20190315.207"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-eww"; - rev = "2bb7b644f953c45b5dd03298b556312440618026"; - sha256 = "0cm6ja6jhkp0yniqj4r3mdzlwwm0ab7fczgzfd745sx1xy1jfiwk"; + rev = "76ba59fda8dd6f32a1bc7c6df0b43c6f76169911"; + sha256 = "0hpq1h0p69c9k6hkd2mjpprx213sc5475q7pr2zpmwrjdzgcv70z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/455a32c1d4642dc6752408c4f5055f5f4d1288eb/recipes/helm-eww"; @@ -45260,12 +45885,12 @@ melpaBuild { pname = "helm-github-stars"; ename = "helm-github-stars"; - version = "20180717.1811"; + version = "20190326.924"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-github-stars"; - rev = "809cf88e2984b121348b1046e1d3890f1fd580b4"; - sha256 = "09ywdsymh479syq9ps15bgyqf5gr94z8wn4jvlcxqz5aq5fil9vq"; + rev = "8cea100f788832ad28c2a61b8fc805298383e263"; + sha256 = "0ml324fi7bqh32d2vg41y13zqj4yx0hsqp5nmb6sw74qics7g9ma"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars"; @@ -46021,12 +46646,12 @@ melpaBuild { pname = "helm-ls-git"; ename = "helm-ls-git"; - version = "20180711.223"; + version = "20190104.2322"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "e38cee59c42fbf16b6de239a537d27af58473394"; - sha256 = "0c53x1dzb80xs6qsmd6py7b9g7d0zva0dhvvxmipjy48dlzr3k5z"; + rev = "0702bc1950f26358c1a024bdbb2d0b1d7dcd2e51"; + sha256 = "0ndgnnsknan2f5jy1aiwcll1kxqyzcjc9kh6vkyd8d4dw7rskldg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -46075,16 +46700,16 @@ melpaBuild { pname = "helm-ls-svn"; ename = "helm-ls-svn"; - version = "20150717.39"; + version = "20190316.1503"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "emacsmirror"; repo = "helm-ls-svn"; - rev = "4d4dc1a272f27fba5fdd7cc47e5d309b53c63ae3"; - sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; + rev = "a6043e1187282f649e2cb9f0e722a42daf41294b"; + sha256 = "0jh3q2nx3hn6v1qvip5sbfsvf9zy74ppn1rl037d0hlssh6qir9j"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/helm-ls-svn"; - sha256 = "0rqsy6gk114khqr28bp2fi0ixaa8wbqd952yxph517p1pbfwxy66"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/be27e728327016b819535ef8cae10020e5a07c2e/recipes/helm-ls-svn"; + sha256 = "10rbplwagmwp8lvhandzlinnzl1vcsvdlnjk9jpj3nw42x9wahx4"; name = "recipe"; }; packageRequires = [ cl-lib emacs helm ]; @@ -46093,28 +46718,84 @@ license = lib.licenses.free; }; }) {}; + helm-lsp = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , lsp-mode + , melpaBuild }: + melpaBuild { + pname = "helm-lsp"; + ename = "helm-lsp"; + version = "20190104.1334"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "helm-lsp"; + rev = "78e2d936589f60f61ebed21c896416a59375aa46"; + sha256 = "1cmcvzffqrmnbyrzi7brh118236ycb5bmr6np6c3h6janmhmml8n"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/67942b34975015dd6f2b5f6b43829cc13b1832c6/recipes/helm-lsp"; + sha256 = "0hzwz243n45xcm3rnzmd6z8zrqy9660fy0l8mb940960cjzsxf3m"; + name = "recipe"; + }; + packageRequires = [ dash emacs helm lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/helm-lsp"; + license = lib.licenses.free; + }; + }) {}; + helm-lxc = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , lxc-tramp + , melpaBuild }: + melpaBuild { + pname = "helm-lxc"; + ename = "helm-lxc"; + version = "20190116.1250"; + src = fetchFromGitHub { + owner = "montag451"; + repo = "helm-lxc"; + rev = "6f11ea39c48816215fbd2df6c4bdaa90241aeac7"; + sha256 = "19f2jbjid1kfnqyqz9jnzy3blp5is23r14ss9iaky4wwb4gs0847"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a7717154a657bb7c27b25579ea2c1b31b5c0b5f/recipes/helm-lxc"; + sha256 = "0mhxbs99isbvls34g0415iy3fry7kanala6624gp5l5isbmn95rm"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs helm lxc-tramp ]; + meta = { + homepage = "https://melpa.org/#/helm-lxc"; + license = lib.licenses.free; + }; + }) {}; helm-make = callPackage ({ fetchFromGitHub , fetchurl - , helm , lib - , melpaBuild - , projectile }: + , melpaBuild }: melpaBuild { pname = "helm-make"; ename = "helm-make"; - version = "20181107.1326"; + version = "20190403.624"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "f86c3973af760df6d7d0ecc61c3d9d14e1d93e2b"; - sha256 = "0lfwgdcvyg67m43gz00q65widv72hyqy2xgshd2j1pxkmqj2pmwk"; + rev = "12c94f765401157d9ae0ba701636b50c9e313486"; + sha256 = "1qanvb2wggmznxvyx8cpfs0ah6ysk0sqp2ccki8c20835l0awnyv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc"; name = "recipe"; }; - packageRequires = [ helm projectile ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/helm-make"; license = lib.licenses.free; @@ -46295,12 +46976,12 @@ melpaBuild { pname = "helm-notmuch"; ename = "helm-notmuch"; - version = "20180730.1022"; + version = "20190320.348"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-notmuch"; - rev = "9988eb0f787c82c779f2417b5613b9142a5b1c9b"; - sha256 = "1jwhmlqlgzxj2zfz0za33vn8m2zrsmkmnq2vx5i1nry70p9h43b4"; + rev = "97a01497e079a7b6505987e9feba6b603bbec288"; + sha256 = "1k038dbdpaa411gl4071x19fklhnizhr346plxw23lsnxir9dhqc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; @@ -46427,7 +47108,7 @@ }) {}; helm-pass = callPackage ({ auth-source-pass , emacs - , fetchFromGitLab + , fetchFromGitHub , fetchurl , helm , lib @@ -46436,16 +47117,16 @@ melpaBuild { pname = "helm-pass"; ename = "helm-pass"; - version = "20180607.1648"; - src = fetchFromGitLab { - owner = "jabranham"; + version = "20190315.635"; + src = fetchFromGitHub { + owner = "emacs-helm"; repo = "helm-pass"; - rev = "fdff8f8f2e2b8a61caed7b6c171624700dbe1346"; - sha256 = "1rq4gsz924m06l01x0058cgxxmqwvh4jga8fb7lwviispxi21nbn"; + rev = "ed5798f2d83937575e8f23fde33323bca9e85131"; + sha256 = "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/helm-pass"; - sha256 = "0a2yqd99j295ingljrvrni4z8qvlk9l827xi3rmkpafhhysch66h"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a34e0ab66491540dd0c5b62c7f60684056b16d5/recipes/helm-pass"; + sha256 = "153cj58x2xcmjs2n4fl1jsv8zir4z9jwg1w00ghv70k5j3rwsjkp"; name = "recipe"; }; packageRequires = [ auth-source-pass emacs helm password-store ]; @@ -46926,12 +47607,12 @@ melpaBuild { pname = "helm-rg"; ename = "helm-rg"; - version = "20180629.220"; + version = "20190130.934"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "helm-rg"; - rev = "008b4b06036d95921f176f222e6055255516116d"; - sha256 = "1zkcqcvr2svfa7i4d0vghr80nnksgmvdhfigb3r6prv9v84ghwkm"; + rev = "2cac4b6f9ab16962d63003c3f8b07e4d4f9899db"; + sha256 = "18nvndrqshvl79awixvsc9d7xi8npbyr10d7clbr0y2l405bwx4j"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; @@ -47226,12 +47907,12 @@ melpaBuild { pname = "helm-slime"; ename = "helm-slime"; - version = "20181110.134"; + version = "20190315.212"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-slime"; - rev = "070d024147e1632b7358711b7f8fb77a28dcf265"; - sha256 = "1gbifis00x6wd81smng81xn7xgflwxnzrr4g49g159g3dj3vvlzx"; + rev = "ebe80eebd1dfba1f1c837876c8f73cefc8c4db87"; + sha256 = "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c35d43a7a8219de4a7f675147f598966aaecb9db/recipes/helm-slime"; @@ -47417,12 +48098,12 @@ melpaBuild { pname = "helm-system-packages"; ename = "helm-system-packages"; - version = "20181011.2355"; + version = "20190325.315"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-system-packages"; - rev = "d25e88c6791fb6166aa3f69693670750e56caa5b"; - sha256 = "1r3m81rylyhk9vvl4mv4rrqzh5lj2i944n7ih0zca3y8z37klh67"; + rev = "9e43d446bbf2dd00dfda1d4aef2501fb2400bb1d"; + sha256 = "1rijsmqg5hfrrrkcc9nyy2smw6jnkxhqd9yqpd3rywj7dvb40blc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages"; @@ -47490,6 +48171,33 @@ license = lib.licenses.free; }; }) {}; + helm-taskswitch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { + pname = "helm-taskswitch"; + ename = "helm-taskswitch"; + version = "20190304.614"; + src = fetchFromGitHub { + owner = "bdc34"; + repo = "helm-taskswitch"; + rev = "00fe3a1f535dc63ec8ad1a46739f08c27fc5087c"; + sha256 = "1y8nmh4aq450xqvc69zcr23gahzk3d6z4y0vpd73m0mys1rmvrng"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3602b1f7b9a75cc82c4bde9ea12b2509465db30f/recipes/helm-taskswitch"; + sha256 = "01yvdbwlixif670f4lffpsk9kvlhgrmh95jw0vc568x0bd3j2a02"; + name = "recipe"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-taskswitch"; + license = lib.licenses.free; + }; + }) {}; helm-themes = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -47526,12 +48234,12 @@ melpaBuild { pname = "helm-tramp"; ename = "helm-tramp"; - version = "20180829.9"; + version = "20190124.2047"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "2148e21fd1a6c8a0b61678bd187ab5a7e387ae64"; - sha256 = "1dinm85z5dz7ql75bh9hy4kmasfb05amnch32y6xscjdg6736w8j"; + rev = "a7456cee86a83d68c966475fab90ab94006fd23c"; + sha256 = "1yrwv3xzbqndns9lda70vpv75vipgjd5j9s1dx1ggfhx21kbnf9w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -47692,12 +48400,12 @@ melpaBuild { pname = "helm-xref"; ename = "helm-xref"; - version = "20180528.816"; + version = "20190212.2259"; src = fetchFromGitHub { owner = "brotzeit"; repo = "helm-xref"; - rev = "6f7e8eeec5cc4db64a76ba242c0f2f61e7ee1e46"; - sha256 = "13f47b3pv37181bbvpaws2z4jcfbim8b2b7zh988gbm579qi4fq6"; + rev = "c258209ee6c21774ba3df89d3c6bd7afbb86af9f"; + sha256 = "1mznr67ivddms0vhaj4aglfkhfzssifrrv65pfm8ny76gwlvx73z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref"; @@ -47832,12 +48540,12 @@ melpaBuild { pname = "helpful"; ename = "helpful"; - version = "20181229.523"; + version = "20190407.1536"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "dcf0b2fc030675a6030e458a927d74025a954122"; - sha256 = "1wi2gjix6qjsj7p9b0qwig058g8p0260xq1v46r8asgikma63li9"; + rev = "53ae44bd2384de5e2513496ccf6ca2fce6767299"; + sha256 = "1fpqnimqbrwhpv714iw46i0dyb4gxdvh08640xbwbqpm9p546lm7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -48211,12 +48919,12 @@ melpaBuild { pname = "highlight-blocks"; ename = "highlight-blocks"; - version = "20151201.815"; + version = "20190318.857"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-blocks"; - rev = "9c4240a5d16008db430d1a81c76dad474d3deb0c"; - sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5"; + rev = "33cf3d36662faa36c86c8d53e4d5a3922efa3eb8"; + sha256 = "04v5y04v4n06ig8zld6axrxpz07s70sn5ckxcy8gnz5qm0zvr7mx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaf524488c408483ea8f2c3a71174b1b5fc3f5da/recipes/highlight-blocks"; @@ -48364,12 +49072,12 @@ melpaBuild { pname = "highlight-indent-guides"; ename = "highlight-indent-guides"; - version = "20181106.1021"; + version = "20190107.1603"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "fc99ee753ac9d53ce91fb032f97430a551e04466"; - sha256 = "0czg07gjwf6r0bn6848yaq96v9y32aizdglmdp4d7vk7bryvcd1i"; + rev = "0b10f38c54ffc099861ce8463e16a1b07ddbb203"; + sha256 = "0fa41y9gdci60417zksj9bgjx1knwh781i3dfphkgr7qbx25iky7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -48796,12 +49504,12 @@ melpaBuild { pname = "historian"; ename = "historian"; - version = "20180619.1223"; + version = "20190110.1913"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "6be869f585b854eb849303c452ab4f91dab04fa9"; - sha256 = "07iw04aibmiz5fn97dafyk5k67yl525w6i1gwzazil4wb81q4b21"; + rev = "64f4ef8cd4e417dfa090138a2d4ea1e72fd4456a"; + sha256 = "0py43kml7fcf1k28pali7n9nhsjp003j02cpynqcz6hmk8zr7b48"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -49028,12 +49736,12 @@ melpaBuild { pname = "hl-todo"; ename = "hl-todo"; - version = "20181031.1209"; + version = "20190404.1434"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "24b9925b1b2c7ad6bf7b66800395f74abf035c5f"; - sha256 = "1bqi2kchcj58j1y3k439v6jk86cg73m0qwfyjz1396h0h2rspnnd"; + rev = "f7d97056d17ef7fc04f4fa0b65a703d1d1a5a6b8"; + sha256 = "07aj9zkr1142xdwmlrccpxpgyrzj9n2rdk74zcmn0jiryg8k8lnc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -49057,12 +49765,12 @@ melpaBuild { pname = "hledger-mode"; ename = "hledger-mode"; - version = "20181230.217"; + version = "20190222.801"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "adff3104a6fb7e5e9369221a4ff226273beafb2f"; - sha256 = "1n8vr85xnfw82dpahsyg1hiybfr9ky6c0pj9vywzn8sk1yil1szq"; + rev = "096fdbded583ee1d99719633222baa46231d85f6"; + sha256 = "1zf9d2z53c8n2mral05l55bd28y8xvrixvz4k2dw6zckxlhnfmiv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -49082,12 +49790,12 @@ melpaBuild { pname = "hlint-refactor"; ename = "hlint-refactor"; - version = "20170817.2148"; + version = "20190115.100"; src = fetchFromGitHub { owner = "mpickering"; repo = "hlint-refactor-mode"; - rev = "92c69aa01c65968e86c15db087bb1ea785e4736c"; - sha256 = "0khnn8qk0948hlq513i7nhf7vg09iwznmj3bgw1b5k5r8j6lhs0g"; + rev = "c4307f86aad6d02e32e9b30cb6edc115584c791c"; + sha256 = "1c71w9s34n0i7mm4njchxn6s3ri1y6mh3akgbg4nq41d42h8iap3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/hlint-refactor"; @@ -49475,12 +50183,12 @@ melpaBuild { pname = "ht"; ename = "ht"; - version = "20181216.337"; + version = "20190404.502"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "8ec3eb96ee63430fb24257e4aa8169b50cb7be12"; - sha256 = "0nhk8l0qp92ch3jzln66igcsjnkq4nzml35mxyljx0189w64s7dq"; + rev = "095fde55294bd20dc7f46d614e1b0504e3830cfa"; + sha256 = "1kfxcvrn8z87g99cihpkzriylzivnvf25ffqpyb9f2f0ri7xk1y5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -49895,12 +50603,12 @@ melpaBuild { pname = "hy-mode"; ename = "hy-mode"; - version = "20181124.1106"; + version = "20190310.1021"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "9b32a3c37aa6252c5f642e1f8fcba6d6fbbbeffc"; - sha256 = "08fcnn8s90782l1ljb3hxvdycvarv5nrlc9n63sfzjn0434bgk6z"; + rev = "d7b4609a0c2ecc2a64f4328e63cf0899d72d930e"; + sha256 = "0gh81qk4yhgq46fm9a1cjs26d5vj3ip03i474b7v4aa7bc327jp7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -49994,28 +50702,56 @@ , fetchFromGitHub , fetchurl , lib + , lv , melpaBuild }: melpaBuild { pname = "hydra"; ename = "hydra"; - version = "20181128.916"; + version = "20190405.315"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "67098cc9149854a95b589c3763843eabc82c9b2d"; - sha256 = "1bql4kyvsafyr0r78ybawhkwgjb3wld9acg7p0pzmmvk9izsji38"; + rev = "480ae6313763a6af6dab85ed629aff2e2037bef0"; + sha256 = "0zs9nc0mix3cqgcn5p5my5nk3826ly4ydrpx1qjgc7m2aj2smxgv"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; - sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/82d9e1bfd501ed2d1cd11319c5e1eb17482e8922/recipes/hydra"; + sha256 = "1s1hj70jjbira054q8ly1pcr0818hh91qnhj0zwbv7milmvv2wwd"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib lv ]; meta = { homepage = "https://melpa.org/#/hydra"; license = lib.licenses.free; }; }) {}; + hyperspace = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "hyperspace"; + ename = "hyperspace"; + version = "20190216.2236"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "hyperspace-el"; + rev = "b059349eb9af5756e590cf2e5baf9432b6a9b96d"; + sha256 = "0c49n8y7y5wg6zpzzr1hqzv6w8nbiywmalmnd3z22qzwb0qc0cbh"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0696a12acba676015640de63fc6e011128bca71c/recipes/hyperspace"; + sha256 = "0ya41c9bxvspj81n5209p9b4c9p1i6jcp710n9i9jawpahwpqlkw"; + name = "recipe"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/hyperspace"; + license = lib.licenses.free; + }; + }) {}; i2b2-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -50423,6 +51159,31 @@ license = lib.licenses.free; }; }) {}; + idle-org-agenda = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "idle-org-agenda"; + ename = "idle-org-agenda"; + version = "20190106.1044"; + src = fetchFromGitHub { + owner = "enisozgen"; + repo = "idle-org-agenda"; + rev = "bfdf1b4f4096acdd081b3549d6b838f4ca4f7d0d"; + sha256 = "0rv8nhd2mgdbmziz49lm4hcbfyhk1wb5k0l9zsyrgn50rs32akhp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/de55ad7d9b8b3bed6a646f526a7b20c272eb4e26/recipes/idle-org-agenda"; + sha256 = "12g18gqwb520iqvs4v6jv0fjxsa3m6an1lq13saa4gwqixja1rrv"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/idle-org-agenda"; + license = lib.licenses.free; + }; + }) {}; idle-require = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -50537,12 +51298,12 @@ melpaBuild { pname = "ido-completing-read-plus"; ename = "ido-completing-read+"; - version = "20180627.1944"; + version = "20190308.836"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "03bdf989a9af88d4eeed4003ae74c98baf58ff72"; - sha256 = "08d77ysbzd25rm8rjslckhqlsyim047c9zwq2ybbzqpjy3q52qfy"; + rev = "d56125deac540a2ab396d6d71f7c1eeae7f37588"; + sha256 = "11wn2xf7dbgfhwdrjazshf4c5im1yxnqpyvq8633fjc1cn9s7vxw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -50617,12 +51378,12 @@ melpaBuild { pname = "ido-flex-with-migemo"; ename = "ido-flex-with-migemo"; - version = "20181219.1657"; + version = "20190124.1937"; src = fetchFromGitHub { owner = "ROCKTAKEY"; repo = "ido-flex-with-migemo"; - rev = "3ad1d8248d238c47ead545478df7690e3f6d1d06"; - sha256 = "1zj2q97qxp07yfgl6k1fz5nrshryibf773czvrc8i9cm401bx235"; + rev = "676742cda0b7bb8a0bf6aa06f345cdc43c30cefa"; + sha256 = "0y54mf45540p4w021wgmym9gzm8i4hfx1a3bc94mafs6zw68vxqm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo"; @@ -50694,12 +51455,12 @@ melpaBuild { pname = "ido-hacks"; ename = "ido-hacks"; - version = "20150331.1209"; + version = "20190206.1353"; src = fetchFromGitHub { owner = "scottjad"; repo = "ido-hacks"; - rev = "b7e7514a0e011e4d767d1f5755c5eae9d85f83dc"; - sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx"; + rev = "d2153a3e8d23436ee07ecae2a106f434361a10c5"; + sha256 = "0rq5jmij691cccv4x8h8aiclnzx04v08axgz30prp6p71dxlrdms"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac3074d28e76133835366273219e180c6e75b18/recipes/ido-hacks"; @@ -51006,12 +51767,12 @@ melpaBuild { pname = "idris-mode"; ename = "idris-mode"; - version = "20181211.650"; + version = "20190228.1943"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "3e5b2a6406dfeab6c6b43169afd9dd8f31e14d9b"; - sha256 = "09n93blwsjyk5aww5ii2f01d8yq7nfq7zhv801j6kls8g4kvaj45"; + rev = "cb6aa30e76b6fdb7138db6d9673d5e8dc074177f"; + sha256 = "1b1aspkl442li8a6ahl8267wv4y8kdl42fi3w67ra0gpzj4788s8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -51107,12 +51868,12 @@ melpaBuild { pname = "iflipb"; ename = "iflipb"; - version = "20171113.1244"; + version = "20190312.1242"; src = fetchFromGitHub { owner = "jrosdahl"; repo = "iflipb"; - rev = "a5ad1fbd1173cff5228dab265515c92c0778f86a"; - sha256 = "0gyxd5d57j0x93mqnfwwdf28plp102xh0ag2d2iws7y1d5m99wm2"; + rev = "50b39e0bca46da43f60d69e6066ddff910bdb144"; + sha256 = "0xxs7b0k51kjy4za7cz7bnl5s3crn1h5kxd03zhir3gy2d5cpwrw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; @@ -51363,12 +52124,12 @@ melpaBuild { pname = "imenu-list"; ename = "imenu-list"; - version = "20180601.702"; + version = "20190115.1330"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; - rev = "04f0632f7b8c81be8747617768c57b66e5d60994"; - sha256 = "0lmcnbps7fbqcsimynil5xq9d7n4jmcclw1qprbj8yjk42lxz0d1"; + rev = "46008738f8fef578a763c308cf6695e5b4d4aa77"; + sha256 = "14l3yw9y1nk103s7z5i1fmd6kvlb2p6ayi6sf9l1x1ydg9glrpl8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list"; @@ -51434,6 +52195,32 @@ license = lib.licenses.free; }; }) {}; + immaterial-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "immaterial-theme"; + ename = "immaterial-theme"; + version = "20190301.2259"; + src = fetchFromGitHub { + owner = "petergardfjall"; + repo = "emacs-immaterial-theme"; + rev = "b7ad831e49f5f4512f216f1f99b2d0eba3cc0815"; + sha256 = "0p363khj7mz9dq0dm12ksd6aamrkmm5a7vcsp0j8cmbc6r6a060c"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a95d88bb00b1313da82929bc2733d726d2041d7/recipes/immaterial-theme"; + sha256 = "15gwqjfpls7lqc37s70vnhycnry5g9grn6shk2wpijrxfnmyqjhj"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/immaterial-theme"; + license = lib.licenses.free; + }; + }) {}; immortal-scratch = callPackage ({ fetchhg , fetchurl , lib @@ -51710,12 +52497,12 @@ melpaBuild { pname = "indium"; ename = "indium"; - version = "20181206.244"; + version = "20190305.1308"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "fd5de13204b3b5f0d2a598fbe74c5a6ac13125bd"; - sha256 = "1v2r9k589l3rsxvijs783dsk5fpl00hrpk6xffirc6rhbkij9bjh"; + rev = "09a97c0aabb9d972e86cd7453e3f9663ba896447"; + sha256 = "1zzc02k6745y32mbvca4nbl55gbshvrd6ya0i04v2q1vvlx30mi3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -51762,12 +52549,12 @@ melpaBuild { pname = "inf-clojure"; ename = "inf-clojure"; - version = "20180402.1403"; + version = "20190327.908"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "59868ff0433f7631c362ce25879bd4271d350ebc"; - sha256 = "1xh901krzwmvkj0rdq0hjbf41vsf92mr0w9vjb9ki660wnnjw8wc"; + rev = "16455abd28933af7c7d6f22dd41414a3c3c66d63"; + sha256 = "0qdrp48i6kn0fa1qjy8gf1c3asgl5dj012dhl1xd4vp3qmgshgrw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -51839,12 +52626,12 @@ melpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "20180521.648"; + version = "20190219.347"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "49d59a7897f594e3be74ecbddae83719f9a6c0f0"; - sha256 = "1bkv825n1316sisajzrqza3mz0pjc03r6bl40dhgqf8qyjkkcq3c"; + rev = "ca10d72e0c64fb7947246c77a409a5443f1f4ba0"; + sha256 = "0m2cavxg8ksji56vj87gwr9r23rk0w3mbafq86kq88ljhb1fbpx3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -52402,12 +53189,12 @@ melpaBuild { pname = "intero"; ename = "intero"; - version = "20181224.1111"; + version = "20190308.834"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "382bc27f28101f6ac98dd7f15ca80e7316831bf1"; - sha256 = "0n9bls8vnxqzwxz9vyn8pnbcxhhmqzbrkcmb64zrbjl5kmmmk0r5"; + rev = "8da81244783fbf03afb49660423c875f2e874fba"; + sha256 = "17vibxapzp4wf0dfc56x98wsf3wy98ghj5h10nyf7xcfwy6k0rja"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -52685,12 +53472,12 @@ melpaBuild { pname = "ipython-shell-send"; ename = "ipython-shell-send"; - version = "20180909.2146"; + version = "20190220.1446"; src = fetchFromGitHub { owner = "jackkamm"; repo = "ipython-shell-send-el"; - rev = "ff944b436db381e6772a26c09b0b20a097eb323e"; - sha256 = "14s6hxnkv7r3idzj7s6vnvifpc8prykzpm6nhb6149yymal4hjkc"; + rev = "0faed86faff02a361f23ce5fc923d0e9b09bb2da"; + sha256 = "1nx92rmxgrxy9hfi7f2ny3q4zqrzy6jalr85lall7r74aifprrkv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send"; @@ -52788,12 +53575,12 @@ melpaBuild { pname = "irony"; ename = "irony"; - version = "20181218.1441"; + version = "20190125.434"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "2136d457698754d56092a25fbe72f8cc6d7be8e2"; - sha256 = "145j9z6qg397s8g9y53nmvx0p379nx7gmwczq4hyzkgm92pfcm1q"; + rev = "93b91d746a5ae3ec99f9c7614522de08edc1426c"; + sha256 = "0pgdg13prr4j4dv7s7wfgrnn6h2z61aggqvlsqvid1vfr3xbg5wb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -52892,12 +53679,12 @@ melpaBuild { pname = "isend-mode"; ename = "isend-mode"; - version = "20171118.745"; + version = "20190201.32"; src = fetchFromGitHub { owner = "ffevotte"; repo = "isend-mode.el"; - rev = "88d4576e70e5874115c305ab2767d181dfda5985"; - sha256 = "0pnzy5000m34f20q97my8ahcsgr0fqyhmfzbmds5bc269vsnbr6g"; + rev = "94184d5eb4a7f96e60351d2580eb0d20f22ab72d"; + sha256 = "1wn7ji76pp2xpfh4yiayll5b0wlfxkb11bgk24hpx22bhjnw3ivj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef6e4dab78a4c333647a85ed07a81da8083ec0c/recipes/isend-mode"; @@ -52943,12 +53730,12 @@ melpaBuild { pname = "isolate"; ename = "isolate"; - version = "20181216.47"; + version = "20190205.1929"; src = fetchFromGitHub { owner = "casouri"; repo = "isolate"; - rev = "700aa3c7945580c876d29c3c064282c33ebb365c"; - sha256 = "0j96rzfabn6lgv9xxyndpq3d2nys5z1brrrd7bga786zzwlp78a9"; + rev = "3bb82f52b0df39c9b57fb68ba622b2906d0eecff"; + sha256 = "00h9d6d6l8cxih8ix6kckc6dhzmq9hbfmgfmfpmf6f67c4ikcv8m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8091f8d72c24a103f6dcaadc18bbec745c1c3d3/recipes/isolate"; @@ -52970,12 +53757,12 @@ melpaBuild { pname = "isortify"; ename = "isortify"; - version = "20181205.604"; + version = "20190315.1304"; src = fetchFromGitHub { owner = "proofit404"; repo = "isortify"; - rev = "5b79751aed815d151c13a8def8a487e786684e3a"; - sha256 = "0x4l5pq9vgv9kb8kcwpzb1vy7wqlq17w0g31q8yj17dqn5v59x19"; + rev = "4d8ecfcadf58ea51368e66ecf6f2a95a95953fcf"; + sha256 = "0gslib1r9d9dqd9r89dfg8npkybjw2bjdrbs0z2qcnfa82x4fq4z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; @@ -53072,12 +53859,12 @@ melpaBuild { pname = "iter2"; ename = "iter2"; - version = "20181020.802"; + version = "20190113.624"; src = fetchFromGitHub { owner = "doublep"; repo = "iter2"; - rev = "3b418e05e93ea380baf905de14efda4c174f779c"; - sha256 = "16mmqnwip3cixsmmij4dnjc8h323z280fk51w5rmwnnb0qmfzp66"; + rev = "fc1fcea5379bc7728a25dd81546886213e3db6fa"; + sha256 = "1gvm5gfgmcw4mibi8899x9ry1zqm3ij6yl0dnmdqmv9dbv1zlqp2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; @@ -53180,12 +53967,12 @@ melpaBuild { pname = "ivy"; ename = "ivy"; - version = "20181223.1202"; + version = "20190407.1029"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "201c5d78c4985fb803eb681cca0ccc5a4f90b717"; - sha256 = "1vwki00v52gikrm908sw5mj5rqvywk7acy52358dy8gb5h54syd5"; + rev = "11b00073cb348aedf1d648a991bab71e20178268"; + sha256 = "1pylfgjrgcapya3dmivcaq5vnqx6h8lrq3xnx7sq11sw5fn6sw0n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -53212,12 +53999,12 @@ melpaBuild { pname = "ivy-bibtex"; ename = "ivy-bibtex"; - version = "20181030.1442"; + version = "20190214.809"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "af05ccb498d89550644cc01c80628053d4d2d73f"; - sha256 = "0m2yn7n7i5kn31m72006n58qw8qhklylna0l2yv4maf46k527xxw"; + rev = "72cdad743706f4bed185f7be918f67a8c3dcb59f"; + sha256 = "17f2gf4rsg3fqsj4kwiyi7cnr1q4xiam8b31kv2p1smh4qw8yfnh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -53270,12 +54057,12 @@ melpaBuild { pname = "ivy-erlang-complete"; ename = "ivy-erlang-complete"; - version = "20180715.2144"; + version = "20190406.1036"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "6dad91e4951ed6fd8886bfee587144da18b57049"; - sha256 = "1padq39s8k4p16bgxi0cyy1q0rqa89w38a0nzkc3kvnq3iycixlp"; + rev = "f3a7088ba62746932ac0084e254e4235b93febcc"; + sha256 = "0sdxcx1ihb51khi5chdm80mzwh8ygfs86pndgh5gq8dzbqpi2ax4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -53297,12 +54084,12 @@ melpaBuild { pname = "ivy-explorer"; ename = "ivy-explorer"; - version = "20181221.427"; + version = "20190318.908"; src = fetchFromGitHub { owner = "clemera"; repo = "ivy-explorer"; - rev = "783816afda31d1b75487b906257e23e273bad6fa"; - sha256 = "1y3igqvmikz21ikzhmrmz2mpmk1pw6x2bk2d2i4z6l580fhz0h5y"; + rev = "5bf3b915bdb78f58fc657e616262d967266a4500"; + sha256 = "1nfabcphfsbza4zrw4f23ajv6bh4jrma0k9ygphv7pzg7hc48jf8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b590a6e0d11fda3d93e4d92f847138f8968b332/recipes/ivy-explorer"; @@ -53380,12 +54167,12 @@ melpaBuild { pname = "ivy-historian"; ename = "ivy-historian"; - version = "20170715.2120"; + version = "20190110.1913"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "6cc124987e18501a1f6f9a384144a22424be3ad8"; - sha256 = "1r2p8fqbc1ms9wrhkxqqmmi8cyba1xdsy9yk2yq1rrivhqpl9fq7"; + rev = "64f4ef8cd4e417dfa090138a2d4ea1e72fd4456a"; + sha256 = "0py43kml7fcf1k28pali7n9nhsjp003j02cpynqcz6hmk8zr7b48"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -53408,12 +54195,12 @@ melpaBuild { pname = "ivy-hydra"; ename = "ivy-hydra"; - version = "20181212.855"; + version = "20190328.845"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "dd8a947997158bb107f250ff2e38278d1266ba0b"; - sha256 = "0c1l3jaz8ynwd3dx3i2s76srywxnmih8jalfzx4i2xhc9896ldcj"; + rev = "c56ad2a551d8915525201590ef38a658bbeeb54b"; + sha256 = "0fmi5dk30xa6ra6br09abxhvha8rx9l28qkajfj5namk5id3s388"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -53482,6 +54269,34 @@ license = lib.licenses.free; }; }) {}; + ivy-omni-org = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { + pname = "ivy-omni-org"; + ename = "ivy-omni-org"; + version = "20190308.1936"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "ivy-omni-org"; + rev = "ab18ca56759aa3428ca017da223dd2eb17feb078"; + sha256 = "1c5mk3dbbjan3fh5sy03dhhdmjawbrnqdf6m1sdkpv379hf9py2f"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4eaad7323462d6c7fd343ede0d2df8c67885e542/recipes/ivy-omni-org"; + sha256 = "1mxdglp0frplv75bik2fl2ybbl0yqfd5r70alcgx1zmba18kaj20"; + name = "recipe"; + }; + packageRequires = [ dash emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-omni-org"; + license = lib.licenses.free; + }; + }) {}; ivy-pages = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -53575,12 +54390,12 @@ melpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "20181226.2132"; + version = "20190407.544"; src = fetchFromGitHub { owner = "tumashu"; repo = "ivy-posframe"; - rev = "3d98dbde1d9b1b170b87828d34d068c358de591d"; - sha256 = "0i8ak4yp97zljz0mg2icyziis5xdp44qzkddb86n0vfjglc5kry3"; + rev = "3aabf14e24c407c39ee5af85e18cb26f1f157af5"; + sha256 = "04pv0mcl69cys7lcsyr1ms45wjq5xcq9q23d5r351h8qn3q4bcwf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe"; @@ -53603,12 +54418,12 @@ melpaBuild { pname = "ivy-prescient"; ename = "ivy-prescient"; - version = "20181220.1624"; + version = "20190313.2133"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "c395c6dee67cf269be12467b768343fb10f2399f"; - sha256 = "0zh0g9vxgqbs48li91ar5swn9mrskmqc0kk7sbymkclkb60xcjs9"; + rev = "6a729df6e97af2bbbdce4a4536a237e47e51555d"; + sha256 = "0j55qbwmqn89q8ngzaq6pryp9xxdag99ggvs24n0yw6qwpw7v2h5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient"; @@ -53658,12 +54473,12 @@ melpaBuild { pname = "ivy-rich"; ename = "ivy-rich"; - version = "20181220.34"; + version = "20190316.2315"; src = fetchFromGitHub { owner = "Yevgnen"; repo = "ivy-rich"; - rev = "7b0fc52a6ebb9b53aef04f68672d25337c2a4540"; - sha256 = "04n8whm00p1qhvwq3cz75qjxkx9sw4in9djsawmpsi63cqm78czx"; + rev = "16af79860493f924319ccb6c3588a61aded94948"; + sha256 = "0c9jqppmywijyjh0b5fv5p1jricj6vrvkrnfm7na02zh26rjx1qj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/ivy-rich"; @@ -54007,11 +54822,11 @@ melpaBuild { pname = "jack-connect"; ename = "jack-connect"; - version = "20141207.407"; + version = "20190311.1220"; src = fetchgit { url = "https://bitbucket.org/sbarbit/jack-connect"; - rev = "b00658dfe3d5d67431c18ffa693d5a3705067ba0"; - sha256 = "1a33z07m9rh42pbcjv7sd640gf6jjzs4yn6idx52g8i5vzns0dkh"; + rev = "3be5f03ba39ffab65e974cf1624cf38588639dcb"; + sha256 = "1lb7z060jrbr0ijzif5p3qg70lg21h1a6jyzyfqfhwf2iwa3mkcj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0f5c5f8051f3046baebb08f41b0ca0bf0d73c85/recipes/jack-connect"; @@ -54082,12 +54897,12 @@ melpaBuild { pname = "japanese-holidays"; ename = "japanese-holidays"; - version = "20160927.2318"; + version = "20190317.520"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "japanese-holidays"; - rev = "4207ee349356837ebfbf0badb6c42f256412c833"; - sha256 = "1n4imcnwqdixd8ybc06hmmh6l28gv0c6mvrpwg7fh9lgsvmgbxb3"; + rev = "f04662cf1e96a2ef9fd7be43e9723fe355025d50"; + sha256 = "0zlmr48wpccd1y5xxyzfrc1n7g7j3pjnhx7v0ms57plk9wbz1yp2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80088028a1322e99e5fc50bebe08fcb6d1a2a44d/recipes/japanese-holidays"; @@ -54447,12 +55262,12 @@ melpaBuild { pname = "jdee"; ename = "jdee"; - version = "20180831.800"; + version = "20190217.229"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "8451b811b11d8cb428bafab31752e93180a3c724"; - sha256 = "08rjr1lr1hq47bpc6iy1ib24vky9zlpj9q5gdvb6cd4zzvlm2qw7"; + rev = "1b1bdf01864d38173c9972234b02f81b47781757"; + sha256 = "08nspkv8gxhiqyqyjlv0gf59ccfrkddxd0664dzygnz9dzannhrs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -55132,12 +55947,12 @@ melpaBuild { pname = "js-import"; ename = "js-import"; - version = "20180817.356"; + version = "20190218.519"; src = fetchFromGitHub { owner = "jakoblind"; repo = "js-import"; - rev = "c98e74a0b43d6ccb8764cf572cdde95ca27f5633"; - sha256 = "1qhigx8lgp044348wr8lwidbn0xcs4j7jrm8qjva5zryjvbxy881"; + rev = "2ab3b120cc94ebf4bee2d959c8869440bc4c7484"; + sha256 = "1fv8lpjanyn6chf502lz0j438hfxhqz1b0z2kxsd4jgy20ixchmg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-import"; @@ -55212,12 +56027,12 @@ melpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20180724.101"; + version = "20190307.849"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "2ed3cc070c7819556c9c89826b0f5c4629b104ef"; - sha256 = "08168z2figb7x99jwixmzrqcdi7iv7c1x1w8gf1k082c4yf5qlmg"; + rev = "7db4871cf50fab1a1086680ead2c70d1e454be6a"; + sha256 = "1rg263ry06wny5lcmmlzaafq5bqy9llik8ymhbak7gmjypb699fq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -55346,12 +56161,12 @@ melpaBuild { pname = "json-mode"; ename = "json-mode"; - version = "20180718.109"; + version = "20190122.2022"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "ffc92b1eefc54963703b43be140f4c8c8ad348f7"; - sha256 = "186m03fhbv8v8kz5nmhrsakhl2mh0hn365yrx36i28i8mbnwzah7"; + rev = "0e819e519ae17a2686e0881c4ca51fa873fa9b83"; + sha256 = "0m4i6b5qmakdc0h8npsyajdp06jq03cb1c5rkj6x0khnjw9fv2fl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -55373,12 +56188,12 @@ melpaBuild { pname = "json-navigator"; ename = "json-navigator"; - version = "20171220.19"; + version = "20190131.231"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "json-navigator"; - rev = "7a1fec93500c46ccba4086d10115d8188607d0d0"; - sha256 = "03gjvzlyf90sh2q735qfbbjyqx4z9c3yc8jjp2sjpmp5fjvdm9yf"; + rev = "f4cde60c4203fc70cc7ff22ed1d6579159ce2598"; + sha256 = "0xrjbx6rkm8a6pmzhdph0r6l468hj827dvvq2hxhcm8v5gk6m690"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; @@ -55609,12 +56424,12 @@ melpaBuild { pname = "julia-mode"; ename = "julia-mode"; - version = "20180816.1417"; + version = "20190407.1419"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-emacs"; - rev = "ec01995f60486480cf2240bbd3b9a2ff3fa9e0f0"; - sha256 = "18lgdr07mllxmjrqyzx9z2js9ajj4pfz407r1ph6fjliyv2c61p5"; + rev = "8449c95a05ab5d75a48192c2da7f0e7f4d16714c"; + sha256 = "02v1hw7h460ypwn45n3jv6d06jcsg2hm5l764ay22116znvaz9n7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/julia-mode"; @@ -55635,12 +56450,12 @@ melpaBuild { pname = "julia-repl"; ename = "julia-repl"; - version = "20180923.424"; + version = "20190124.259"; src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "d8b94c6dbfa47fd51540b9d5b1bb0c2dfce3ebc2"; - sha256 = "027ib0i5af23s3kxsfbxh3jgw944crry0v4c7yxz9l8r8p3wpq1k"; + rev = "54b4aa31d96e6945d07304dcb189289e2f8be1b4"; + sha256 = "1jjygzz3v9iw7ixvfqvy0faa4nkg2dl5qp8jd3yxbawyx6g304n9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -55835,6 +56650,36 @@ license = lib.licenses.free; }; }) {}; + jupyter = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , simple-httpd + , websocket + , zmq }: + melpaBuild { + pname = "jupyter"; + ename = "jupyter"; + version = "20190406.1040"; + src = fetchFromGitHub { + owner = "dzop"; + repo = "emacs-jupyter"; + rev = "53c2ffdd513206cbe45f44b848dc053de2c17db1"; + sha256 = "1fwq8zvsjc8y4jvqnq5aa03an2pffayaiq92h39bbmf8hv59b6xd"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a63a933e193a52e60950331ec982c5f5cdfaa5d9/recipes/jupyter"; + sha256 = "0p83mkvip1gn5ag2j6s68wzfgg2sf15iyxh7ylads3yw44h26wvi"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs simple-httpd websocket zmq ]; + meta = { + homepage = "https://melpa.org/#/jupyter"; + license = lib.licenses.free; + }; + }) {}; jvm-mode = callPackage ({ dash , emacs , fetchFromGitHub @@ -56107,12 +56952,12 @@ melpaBuild { pname = "kaolin-themes"; ename = "kaolin-themes"; - version = "20181231.1440"; + version = "20190405.39"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "8c5667dc5622019d21c4e999e0c8e031c9593686"; - sha256 = "1wnk9q5pxncv6m41mhg8gh13y02vz8w8l0sbmf5rjvn8vl9ik7x7"; + rev = "dcaf5b5d7f2bbfe0ac8d224b4dbb24a68775314b"; + sha256 = "06qnpnm67d89jkl504kyqd724pab6jlha9zkd1b95rj17b54ng8l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -56392,12 +57237,12 @@ melpaBuild { pname = "keycast"; ename = "keycast"; - version = "20181223.1908"; + version = "20190316.1835"; src = fetchFromGitHub { owner = "tarsius"; repo = "keycast"; - rev = "c855511785d6e843f584e6ffdc54b4ac3f7a62d0"; - sha256 = "1xk9flcj4f37lqiizq1lgq0x1v64yhfqldaa9sq64nzwib5cp9z1"; + rev = "fe416461b15543138ad4fef8ef5e2c364a6b5b2c"; + sha256 = "15q2kc7mlmr856ldh6bkba26zq8fwia26cv1gsqwj3jmhml6mlq1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; @@ -56520,12 +57365,12 @@ melpaBuild { pname = "keypress-multi-event"; ename = "keypress-multi-event"; - version = "20180817.153"; + version = "20190108.2130"; src = fetchFromGitHub { owner = "Boruch-Baum"; repo = "emacs-keypress-multi-event"; - rev = "64e3037fa4520b6bca2141f1217d3fa988e01a91"; - sha256 = "0ppkmbk9i7h038x577v2j67y37c7jlwssay80rv83hl4lwb5ayvb"; + rev = "9de65a27e10d8ae47aa6d28c02c3eb82ee8c0b2e"; + sha256 = "1ybbayxfix63rwc8p5kl4wxxlk6vg53abw40fqrlkbc6qrr7nm5c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd02baaf1d49d55b066695d8fa9887c454bb1750/recipes/keypress-multi-event"; @@ -56565,6 +57410,35 @@ license = lib.licenses.free; }; }) {}; + keystore-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , origami + , s + , seq }: + melpaBuild { + pname = "keystore-mode"; + ename = "keystore-mode"; + version = "20190316.700"; + src = fetchFromGitHub { + owner = "peterpaul"; + repo = "keystore-mode"; + rev = "65ffee8834cb171c53e917ae8c183db6f646f471"; + sha256 = "1lzjqzbaq0wd9gims4mj8rga8wmj4kvig63cvnygd93f0sbbirkk"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7870d808fc19096ed6ecde5e9297b28254466210/recipes/keystore-mode"; + sha256 = "1r1my7jgjv2zvkhdwd8ml6489x48gzanz4lvdiw5m2hymb53fdg6"; + name = "recipe"; + }; + packageRequires = [ emacs origami s seq ]; + meta = { + homepage = "https://melpa.org/#/keystore-mode"; + license = lib.licenses.free; + }; + }) {}; keyswap = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -56616,6 +57490,32 @@ license = lib.licenses.free; }; }) {}; + kfg = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "kfg"; + ename = "kfg"; + version = "20140908.2238"; + src = fetchFromGitHub { + owner = "czipperz"; + repo = "kfg"; + rev = "ffc35b77f227d4c64a1271ec30d31333ffeb0013"; + sha256 = "0y8s2zfz1r1nfwkkfyxc3vfmlagp9wg8i3zpyj3jcifilxq6i63v"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2990f45632697ce23e7cd9db807d8ae2d3bf61d2/recipes/kfg"; + sha256 = "0kj79wwj2ih2ba57y3hl2l9pwjpsqns5waa8vi5g7agmqva0mh5b"; + name = "recipe"; + }; + packageRequires = [ f ]; + meta = { + homepage = "https://melpa.org/#/kfg"; + license = lib.licenses.free; + }; + }) {}; kibit-helper = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -56702,12 +57602,12 @@ melpaBuild { pname = "killer"; ename = "killer"; - version = "20120808.422"; + version = "20190127.1610"; src = fetchFromGitHub { owner = "tarsius"; repo = "killer"; - rev = "7bbb223f875402a7b2abee4baa5a54f10bd97212"; - sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x"; + rev = "ace0547944933440384ceeb5876b1f68c082d540"; + sha256 = "06nzxd9nc1d569354xj7w88i0y5l99pyag691aribsh771rxbfz4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd8c3ec8fa272273128134dea96c0c999a524549/recipes/killer"; @@ -56808,12 +57708,12 @@ melpaBuild { pname = "kiwix"; ename = "kiwix"; - version = "20170927.120"; + version = "20190324.2052"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "86dbead6c0017beefd92a0b64a0bb5f5d12c5b16"; - sha256 = "142mm1wy8zvlkzairnc1rjdi1lsq1asfk4zdbs1aria1nxz1sx6x"; + rev = "c662f3dc5d924a4b64b7af4af28f15f27b7cea1e"; + sha256 = "0i11sfnqvjqqb625cgfzibs6yszx891y4dy7fd6wzmdpclcyzr8z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix"; @@ -56903,7 +57803,7 @@ license = lib.licenses.free; }; }) {}; - kodi-remote = callPackage ({ elnode + kodi-remote = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl , json ? null @@ -56914,19 +57814,19 @@ melpaBuild { pname = "kodi-remote"; ename = "kodi-remote"; - version = "20181204.1326"; + version = "20190322.1303"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "4b39b3088c909f05bb60d3b8eb763a43db8eed50"; - sha256 = "1mcmwcpxr4d3i9208kazn1fjyn8sy47hr9459j45bvicqz466dm9"; + rev = "861d81af05b061e1343124753d8493e5a21baf7b"; + sha256 = "1cb1s3ksscva8fw1ss8z6nc530g00njrs2kk3flqisnc41l6njsq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5"; name = "recipe"; }; - packageRequires = [ elnode json let-alist request ]; + packageRequires = [ cl-lib json let-alist request ]; meta = { homepage = "https://melpa.org/#/kodi-remote"; license = lib.licenses.free; @@ -57042,12 +57942,12 @@ melpaBuild { pname = "kotlin-mode"; ename = "kotlin-mode"; - version = "20181121.2022"; + version = "20190116.1255"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "002dd1497ce7fb7266729cb2c9284cc945988411"; - sha256 = "14gdg93cnkbmb2fwia8d8pqp81xcjk78slfqgw5hd9gc3js9pk8a"; + rev = "0e542ae2f78420618df8b0123dfe168a37dce333"; + sha256 = "1rv3vxw3dx477sapfd0hj3pkl3x0sihdsyl671azbcr02z67xl6p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -57136,29 +58036,57 @@ license = lib.licenses.free; }; }) {}; + kubel = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit-popup + , melpaBuild }: + melpaBuild { + pname = "kubel"; + ename = "kubel"; + version = "20190314.1007"; + src = fetchFromGitHub { + owner = "abrochard"; + repo = "kubel"; + rev = "b8e1c67635dadaec3a289fa28111f6fcb817ef10"; + sha256 = "1dk44xq1bwlji48bbw1l4i4mqszsp1shfmmfs4q6gxyjs0hzbwpg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f1c7ff1c44946f232730066d6c8c25d5b41ffda7/recipes/kubel"; + sha256 = "1rm85bwpsqj600jvri508nn5i17ynyd84aanf8cqqxk5d2wf9x1n"; + name = "recipe"; + }; + packageRequires = [ emacs magit-popup ]; + meta = { + homepage = "https://melpa.org/#/kubel"; + license = lib.licenses.free; + }; + }) {}; kubernetes = callPackage ({ dash , emacs , fetchFromGitHub , fetchurl , lib , magit + , magit-popup , melpaBuild }: melpaBuild { pname = "kubernetes"; ename = "kubernetes"; - version = "20180706.520"; + version = "20190327.1744"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "kubernetes-el"; - rev = "2b5ce22b12bd8a569cb0a8019a395173e3a13523"; - sha256 = "19abr8q9mz3g5i0jb5j6p3jll93jrpvzgj14q2l81c4dng0yamdc"; + rev = "5839c89b7187573346813bc3dd6b43b5acdda7cb"; + sha256 = "0wmadjlrcnjv10cmxkmb02n3fvns7hghlk0zcpxjis2gfmng9px7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes"; sha256 = "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9"; name = "recipe"; }; - packageRequires = [ dash emacs magit ]; + packageRequires = [ dash emacs magit magit-popup ]; meta = { homepage = "https://melpa.org/#/kubernetes"; license = lib.licenses.free; @@ -57191,6 +58119,33 @@ license = lib.licenses.free; }; }) {}; + kubernetes-helm = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , yaml-mode }: + melpaBuild { + pname = "kubernetes-helm"; + ename = "kubernetes-helm"; + version = "20190131.1920"; + src = fetchFromGitHub { + owner = "abrochard"; + repo = "kubernetes-helm"; + rev = "1d50cb87600630e02bd52894a480627630084636"; + sha256 = "03z0mqg4lyvcnb33c1s3z9l0m47c1ahf45vaz80nh5sz3b4maii3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/269c73e26b3d0cc51bbac8b63bb3782f7428ab40/recipes/kubernetes-helm"; + sha256 = "0rik7qz5m2hxylmdsjdnrlj52sm7c669milxxp5i1a1c44621xa6"; + name = "recipe"; + }; + packageRequires = [ emacs yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/kubernetes-helm"; + license = lib.licenses.free; + }; + }) {}; kubernetes-tramp = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -57303,12 +58258,12 @@ melpaBuild { pname = "lab-themes"; ename = "lab-themes"; - version = "20181015.1120"; + version = "20190320.1127"; src = fetchFromGitHub { owner = "MetroWind"; repo = "lab-theme"; - rev = "8b717c1bf6c702e0bae2537df9ef2147d0d3a60a"; - sha256 = "1nr8x3r86bfg6bryl98pl5kwjs6pn42mxddvg3zs3zqa6aj5gszb"; + rev = "06b55ef3d82a8ad23189caf8de76ef81fc0aba31"; + sha256 = "0dgs2gp5q3hfp8j1gbdkf26jwjjw04ggx34zrv35wg8yr26ah440"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5817cb4cb3a573f93bacfb8ef340bef0e1c5df4/recipes/lab-themes"; @@ -57431,12 +58386,12 @@ melpaBuild { pname = "langtool"; ename = "langtool"; - version = "20180409.316"; + version = "20190303.1427"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d93286722cff3fecf8641a4a6c3b0691f30362fe"; - sha256 = "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga"; + rev = "81f2b8a07b29bbdd558db4b68dd904f4c0eb10a4"; + sha256 = "01w765n5bib060f0hci34f0vchf90b4r8gr1ng2c4yx20dvdjnqh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -57476,6 +58431,33 @@ license = lib.licenses.free; }; }) {}; + language-id = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "language-id"; + ename = "language-id"; + version = "20190207.257"; + src = fetchFromGitHub { + owner = "lassik"; + repo = "emacs-language-id"; + rev = "9145c75eaa41a7a9deda928f704b99db056d3e9d"; + sha256 = "10dwrb610jdal6ifpj34mmy8qqbca2sgfmvn4p4qpcc967sv4f1r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d03af6375bc7ba4612c43dea805d7f392f046f87/recipes/language-id"; + sha256 = "0p7hg005bmzy38sv2881fq1x2i7yjdhfjbki4y2av485c418rqz8"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/language-id"; + license = lib.licenses.free; + }; + }) {}; lastpass = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -57538,12 +58520,12 @@ melpaBuild { pname = "latex-math-preview"; ename = "latex-math-preview"; - version = "20170522.1455"; + version = "20190123.2"; src = fetchFromGitLab { owner = "latex-math-preview"; repo = "latex-math-preview"; - rev = "775887a89447dd19541b121161cc02e9799d0d3a"; - sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq"; + rev = "90fd86da2d9514882146a5db40cb916fc533cf55"; + sha256 = "063vnjhnxm2z9shkdv1j8kwyf37syczfkzxzh5z7w7aidvx55jzj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview"; @@ -57884,12 +58866,12 @@ melpaBuild { pname = "ledger-import"; ename = "ledger-import"; - version = "20181211.2039"; + version = "20190131.1205"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "ledger-import"; - rev = "17fe337f79601b95fb1ff980da65b446da4bffa1"; - sha256 = "0xv6g9b2gw3ajzhljd4dpv10k2rj3w92nfmwkxwmwc8pr4rzyh27"; + rev = "2c199fcc8671c2ec82e62cea7716289426b7407c"; + sha256 = "0szi5k05qja28nx0rnl3amh3qf2f470sycdjgmpazgqh4zpkngsp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a1e2a9546b8b40f5f880197cb8166a6a715451f/recipes/ledger-import"; @@ -57910,12 +58892,12 @@ melpaBuild { pname = "ledger-mode"; ename = "ledger-mode"; - version = "20181230.1320"; + version = "20190317.912"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "3ec8506e3daafb32ebf0de7d177759ea63e83092"; - sha256 = "1w7793bkyqmx7cdjgb7cl5avjc7kfgkx9xsjr5k6wwbk8nv50xpz"; + rev = "c59bbfcc3274d113dec68121786546979f33dad0"; + sha256 = "0p7dp31jlia1qdz15lqqzaf8laa847qcsgn5p79nl82kbzkxvq13"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -58169,12 +59151,12 @@ melpaBuild { pname = "leuven-theme"; ename = "leuven-theme"; - version = "20181201.307"; + version = "20190308.734"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "030658ab409cfe927514120ac13ffd716d41b04a"; - sha256 = "1h21byiz30g5l0fs234c71dk1nf8zz3qkmgqynga7wyv1am6r5x4"; + rev = "916c0f3b562b5b0e4f4294b83decda941fb183b1"; + sha256 = "1garn9rkn1jmv1w329qdw0mbn11j467kfp64902ncajl3590x2ly"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -58297,12 +59279,12 @@ melpaBuild { pname = "libgit"; ename = "libgit"; - version = "20181222.322"; + version = "20190323.1055"; src = fetchFromGitHub { owner = "magit"; repo = "libegit2"; - rev = "57a9f07725ff8215403dc453582294f490f40392"; - sha256 = "1fqy7bh0zgvbbgz43yghpfxz5xwi25n5vafr8nkfl4xr24klyck6"; + rev = "f80d380156a1ba2a9caf7e964cb96acccde8b514"; + sha256 = "0azq7ni5z2fpl43s63zalnf2n3y55dsq4dp1v2yhq9j6sm5ds1di"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/993a5abe3a9e8b160f0d68283eeca6af033abc79/recipes/libgit"; @@ -58348,12 +59330,12 @@ melpaBuild { pname = "libmpdel"; ename = "libmpdel"; - version = "20181015.2353"; + version = "20190124.614"; src = fetchFromGitHub { owner = "mpdel"; repo = "libmpdel"; - rev = "76711d7c32fe617647098f01d4fee9b3c1eaab46"; - sha256 = "0n3fm7dxwf53lb60mwaf6z5vmmzax3q15a4lrk1ra4w4snlr0x39"; + rev = "a0100e020347ccc319ec18c687353dc521c64328"; + sha256 = "0vm4j5n2h74c0kyn61lx9fbxj39gvd22yh7a3grbcp1i94wkjm8x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/libmpdel"; @@ -58426,12 +59408,12 @@ melpaBuild { pname = "line-reminder"; ename = "line-reminder"; - version = "20181215.2324"; + version = "20190407.809"; src = fetchFromGitHub { owner = "jcs090218"; repo = "line-reminder"; - rev = "f7d4a1e542404f7c3574bffc3034f39869e587d9"; - sha256 = "06y2wizyxh2bh2ia2v42qpi6r1x82v7vnifdsimkyflg236082cf"; + rev = "9de2c301f433453dc0ff06e7c78f580dd6f5314f"; + sha256 = "1cza4bi1plw3r4j2bxkm4w57db9nxvcf3p8xfvicipsv556k934r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/456f760f7f7d4151e18f08b2f1154c5880423b21/recipes/line-reminder"; @@ -58580,12 +59562,12 @@ melpaBuild { pname = "link-hint"; ename = "link-hint"; - version = "20180519.1430"; + version = "20190312.1604"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "23df5fa36ab182452be6b772475eab67b846dd92"; - sha256 = "0b7i2jasc5bsphix9fhvmi3ddj42f5n5liczrrfv4p9k14px3b10"; + rev = "d74a483652486260c052941fedeadddb1ea71f88"; + sha256 = "0dghxd165fbds6czy9bfwpid3i4irgp3q08n9mg57sfifi0cmij0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -58801,12 +59783,12 @@ melpaBuild { pname = "lispy"; ename = "lispy"; - version = "20181210.951"; + version = "20190404.822"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "d1f3a66a5f15c33418b8115162c94be94a2b47a3"; - sha256 = "07mm9ixj2ghsyh61zxhxgwjkg95l0hmgx0g5xapy31jdvmqq1h4n"; + rev = "18557185e2ed71502fd96ee7a176ddec7df2e626"; + sha256 = "13vnaqv4r50bjlyppxapg8pp6mc4ql0c5g2xkmmfklqagy2lja65"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -59116,12 +60098,12 @@ melpaBuild { pname = "literate-elisp"; ename = "literate-elisp"; - version = "20190102.2349"; + version = "20190109.521"; src = fetchFromGitHub { owner = "jingtaozf"; repo = "literate-elisp"; - rev = "69af3f1fdaabf38178603deb32e233a2190e24da"; - sha256 = "0dvlmivcm5cx8396gcnx6hxijvixpdyvd3zk8p0ly8p5g99mrpzx"; + rev = "0724b62d98cb9d9c7f3d171c322a1059648746f5"; + sha256 = "0nnfp8rj4avn462w3fwln8c7sai3psz7kp97r3iyq4v9wavgdni2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4c1c4da2a5571babda9a29a56b8972ad0687c0/recipes/literate-elisp"; @@ -59196,12 +60178,12 @@ melpaBuild { pname = "live-py-mode"; ename = "live-py-mode"; - version = "20181213.2159"; + version = "20190330.1041"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "c60962245d412cfeab2cc82c850e5432fa28f690"; - sha256 = "1jwlx5p96adgyibzbnpk2cvh9g7q3pkmjwjmk9lz8jargn8ga3ak"; + rev = "63140187ba2b68c2c55d91aa7a07b5c5d15422d9"; + sha256 = "0arhhl684p0nhxhc53sbhcc1rmv3v107s5j0ymwnfa4rnyahz2ii"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -59658,11 +60640,11 @@ melpaBuild { pname = "lognav-mode"; ename = "lognav-mode"; - version = "20180708.322"; + version = "20190217.832"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/lognav-mode"; - rev = "d6d39829ff0b"; - sha256 = "0hlc5gp5fdswkf8h2nz6ayndq8r7599skz846q19q29p6yj5wg0s"; + rev = "bec9f3eba66e"; + sha256 = "19axhlcny5i4hfrhxivalxrhpghy2czj92cflq0gb5b6ar6zgkyg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad86b93f4982a0c6291c771e12c8f42ace3b88f9/recipes/lognav-mode"; @@ -59904,162 +60886,30 @@ license = lib.licenses.free; }; }) {}; - lsp-clangd = callPackage ({ emacs + lsp-elixir = callPackage ({ emacs , fetchFromGitHub , fetchurl , lib , lsp-mode , melpaBuild }: melpaBuild { - pname = "lsp-clangd"; - ename = "lsp-clangd"; - version = "20180828.957"; + pname = "lsp-elixir"; + ename = "lsp-elixir"; + version = "20190105.1259"; src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-clangd"; - rev = "37ca521483e3ce5b63b97672916368dbf4566a67"; - sha256 = "1km0jphg3zhy8cf127jh819yc5vx88xifml9ic5xidzmy26gq6s1"; + owner = "elixir-lsp"; + repo = "lsp-elixir.el"; + rev = "9fd091c092144a09c0df2d477257c1f4c37bb985"; + sha256 = "0m5hxlx0cnx4rdcz5chxqp074z9h1wj1nvg8dzmilsnmg3kmsshx"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/71646b47e5f5702e80bf6c56f882d041074ef3c0/recipes/lsp-clangd"; - sha256 = "05dmzyb9xw2m4kck7y3cj8dm2542p3vi48lqs21gcrvm5vbrkx3g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c875a05e68d09ecf37f7e13149f2624c70164ea3/recipes/lsp-elixir"; + sha256 = "0mimb67swcq2yis0s6w2bkk7sgqv7lyvz1hrh48h2q6qr3ywmq0n"; name = "recipe"; }; packageRequires = [ emacs lsp-mode ]; meta = { - homepage = "https://melpa.org/#/lsp-clangd"; - license = lib.licenses.free; - }; - }) {}; - lsp-css = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-css"; - ename = "lsp-css"; - version = "20181218.2104"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-css"; - rev = "bb5ab8d63087b41ae66d9cfef41f6ee2cd088669"; - sha256 = "1v3rnsicjl1xmjsbbcv3yk51id2d3yvkpxzcisqgimlz28wrnla3"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a9d16c625893fce39d1253b101b826ba96e1f26e/recipes/lsp-css"; - sha256 = "05mm0pshs9jk3ls7mqicq4a5w66fg3mhi73mjx7kp5asqk64fim1"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-css"; - license = lib.licenses.free; - }; - }) {}; - lsp-dart = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-dart"; - ename = "lsp-dart"; - version = "20181021.1008"; - src = fetchFromGitHub { - owner = "twlz0ne"; - repo = "lsp-dart"; - rev = "c52d825aeebcad250890fe8ded1147df8f9499cf"; - sha256 = "0c3ii7np45bz6wlqzwn1bacdwa8r0880qygjb71ypf5ilq1gk40y"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da22fe98eb57e143077c4a7c4dbeba70120d527a/recipes/lsp-dart"; - sha256 = "0zv6spd1h2ijkix38hxvvblg37ybm65568gg8fv9qr8giw0bjfy2"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-dart"; - license = lib.licenses.free; - }; - }) {}; - lsp-fortran = callPackage ({ fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-fortran"; - ename = "lsp-fortran"; - version = "20180904.936"; - src = fetchFromGitHub { - owner = "MagB93"; - repo = "lsp-fortran"; - rev = "0c25c13a224dc8dd07294647efd355248e1b6c4e"; - sha256 = "0cbn28fw9q5qvw3h86195dxmcbsll9nc20216az0x808b2p8p24g"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/676b780c19f84b1967350c54a793fb33a18130d5/recipes/lsp-fortran"; - sha256 = "0qlfdiz8rxjmc2v2qxkjihb373364a0b2b4ccjljhv9xz4aia3bj"; - name = "recipe"; - }; - packageRequires = [ lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-fortran"; - license = lib.licenses.free; - }; - }) {}; - lsp-go = callPackage ({ fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-go"; - ename = "lsp-go"; - version = "20180913.2215"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-go"; - rev = "2327556e78682770a7a434610b08115f20ea5b1a"; - sha256 = "10n9vrf46rsacsibv9sh5s92lmr3lz7x2lbgxzf5xn1y1vlg02ap"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; - sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c"; - name = "recipe"; - }; - packageRequires = [ lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-go"; - license = lib.licenses.free; - }; - }) {}; - lsp-hack = callPackage ({ fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-hack"; - ename = "lsp-hack"; - version = "20181114.947"; - src = fetchFromGitHub { - owner = "jra3"; - repo = "lsp-hack"; - rev = "2a9025a331aa08ebc4ad3524fe69eaa6f624ceae"; - sha256 = "01vidax1ihs87c0zb4kvadbs12agdgjjj01dh48yz769gcn0p0qc"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a70d8442c653554d28dc87425913424ab42ab5c8/recipes/lsp-hack"; - sha256 = "1xfvk4hqs748b9dm8dirb2mdpnhq9mybgsbcj258yydr57d9zijs"; - name = "recipe"; - }; - packageRequires = [ lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-hack"; + homepage = "https://melpa.org/#/lsp-elixir"; license = lib.licenses.free; }; }) {}; @@ -60072,12 +60922,12 @@ melpaBuild { pname = "lsp-haskell"; ename = "lsp-haskell"; - version = "20181223.326"; + version = "20190328.2248"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "533970d5552c4820aa45901ba89565f3419d991c"; - sha256 = "0xah24q8c62kk0m5ivhx51a3h46vlc626qsh8rlysdsdv59121sa"; + rev = "33e3ac438338b0a78971cd26aa919482d290c51b"; + sha256 = "1ihc6djxsdrd0q9f79bs0qwxxhw3bnw1kxw2rq92drfnypqbiqcq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -60090,32 +60940,6 @@ license = lib.licenses.free; }; }) {}; - lsp-html = callPackage ({ fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-html"; - ename = "lsp-html"; - version = "20180629.25"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-html"; - rev = "478927767c3c2bd06b052807126e5d48be53755a"; - sha256 = "0833mrmbhfzm2xhf91wl7bp4h54h2qaxy4lidy05ngm407wbjypd"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/204acff0d1a8c6dc79ef34cc464435a1504d7c15/recipes/lsp-html"; - sha256 = "0fd53k8spfm2s618gvchr0jsbc0a0varklc05cdjvjxyxk04ssmc"; - name = "recipe"; - }; - packageRequires = [ lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-html"; - license = lib.licenses.free; - }; - }) {}; lsp-intellij = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -60153,16 +60977,17 @@ , lib , lsp-mode , markdown-mode - , melpaBuild }: + , melpaBuild + , request }: melpaBuild { pname = "lsp-java"; ename = "lsp-java"; - version = "20181221.816"; + version = "20190405.1133"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "34cebe5e9a1ca400b44fe872986f2d52cca7027e"; - sha256 = "0zysjw4hyphjgxx198r07yk823gpzmipl04m9favf0y4b3pbb7wk"; + rev = "311a0747e6d54acf1b9b14d5c1f967e6fcbb97c5"; + sha256 = "0p0j2rb44f4v3mnhs3633xwprxa3ya6i7bzdvrz8r89ccrv3zmig"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03cb07862c5f35487fb4fb3cc44623774724717/recipes/lsp-java"; @@ -60177,6 +61002,7 @@ ht lsp-mode markdown-mode + request ]; meta = { homepage = "https://melpa.org/#/lsp-java"; @@ -60193,12 +61019,12 @@ melpaBuild { pname = "lsp-javacomp"; ename = "lsp-javacomp"; - version = "20181210.1804"; + version = "20190124.955"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "0cdf9c2e4e66aa77cfb23ed9d12c296cfe7db872"; - sha256 = "0s1p5j62x0vjvh73fqym1zifda95ij6j9jddpb12rgalc6lfw9vw"; + rev = "82aa4ad6ca03a74565c35e855b318b1887bcd89b"; + sha256 = "0r0ig73hsa0gyx8s6hr1mbdgf9m1n2zh2v7yhq3405l4if08s5m6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; @@ -60211,61 +61037,6 @@ license = lib.licenses.free; }; }) {}; - lsp-javascript-flow = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-javascript-flow"; - ename = "lsp-javascript-flow"; - version = "20181218.2042"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-javascript"; - rev = "392f162ce675a56c60997e8b0b6eba384ccb456a"; - sha256 = "0cj9svzd10wxb83lan83k8r6qvcafnwcb7z70cpksywgs1a2xwml"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f9a28de5ce89080ba224e07734b3ba0b0992acd6/recipes/lsp-javascript-flow"; - sha256 = "1bydgcmgzbx2pqna19h1avrlrlfv6gvsii1n839q4bhiwn3452f7"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-javascript-flow"; - license = lib.licenses.free; - }; - }) {}; - lsp-javascript-typescript = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild - , typescript-mode }: - melpaBuild { - pname = "lsp-javascript-typescript"; - ename = "lsp-javascript-typescript"; - version = "20181218.2042"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-javascript"; - rev = "392f162ce675a56c60997e8b0b6eba384ccb456a"; - sha256 = "0cj9svzd10wxb83lan83k8r6qvcafnwcb7z70cpksywgs1a2xwml"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/97b6ddeb34297aacfefdd4c227ad520b70a12bc6/recipes/lsp-javascript-typescript"; - sha256 = "01i6dimwz5s143cbcfi2rflfgkj569avx103wnlbcfd87apj7813"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode typescript-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-javascript-typescript"; - license = lib.licenses.free; - }; - }) {}; lsp-mode = callPackage ({ dash , dash-functional , emacs @@ -60279,12 +61050,12 @@ melpaBuild { pname = "lsp-mode"; ename = "lsp-mode"; - version = "20190102.2247"; + version = "20190407.1213"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "2c1755d76387bed7c96a9c827753b6dcd9cf1a2c"; - sha256 = "10fk3mfyrvg706547nwhxrvimqsdpsmxipigmk9n2n8cmjr5k52l"; + rev = "ab418329df23590212ecfee313791c6c551223e1"; + sha256 = "0pwfpcdn2ijvpsm3i2kgk6r8m9f297xsvlz5x1fa57b4002j8vzl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -60297,33 +61068,6 @@ license = lib.licenses.free; }; }) {}; - lsp-ocaml = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-ocaml"; - ename = "lsp-ocaml"; - version = "20180610.1154"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-ocaml"; - rev = "5a8c776b6d75b502703243b3d628fccd813481b0"; - sha256 = "1431f8r8c4h8jbghggk1s2bwqr1qlxys3d52xsvf35bbk1gki5an"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml"; - sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-ocaml"; - license = lib.licenses.free; - }; - }) {}; lsp-p4 = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -60332,12 +61076,12 @@ melpaBuild { pname = "lsp-p4"; ename = "lsp-p4"; - version = "20180728.1215"; + version = "20190127.249"; src = fetchFromGitHub { owner = "dmakarov"; repo = "p4ls"; - rev = "be807f8bf12bc354d2649c654f853689e3113765"; - sha256 = "0qhyd39743gb4y7hxznvvq3iikcj5yi145snhfic7l1l7yvbqz97"; + rev = "084e33a5782f9153502d9b03e63d9cbbe81cdaeb"; + sha256 = "0id3rw2p35cs7ax85590qs16zybgrjcapsnly5ifzjk0a5k7548c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53f0da8b3d2903adeffdbc3d8df7d630bfd9ff71/recipes/lsp-p4"; @@ -60350,167 +61094,90 @@ license = lib.licenses.free; }; }) {}; - lsp-php = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: + lsp-scala = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild + , sbt-mode }: melpaBuild { - pname = "lsp-php"; - ename = "lsp-php"; - version = "20180331.944"; + pname = "lsp-scala"; + ename = "lsp-scala"; + version = "20190116.1332"; src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-php"; - rev = "3189a13c605e1615b7ce2cd12f09c1ed92a88178"; - sha256 = "1kv708yrx57j0cvz9vcam4rwfincgbbr7rdbxdmnfmwnx4ylgckg"; + owner = "rossabaker"; + repo = "lsp-scala"; + rev = "b68820cc7aaa9c4f818c4f7999188c20655c3be3"; + sha256 = "1zq2kjsdf88wi4i2my14hw8am9q5dpyfryak1mvp2hpy661hmy7k"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9fda03716433077e440c0fb8357207f7a348552c/recipes/lsp-php"; - sha256 = "0ds3hivkb7zxkz6crn6h9apvavvm899vwq4mkav4cbijsl4q33l0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd494da0c0c2e2e58afc26d8e79aeeea41c6ee09/recipes/lsp-scala"; + sha256 = "1r8ha0q9gphcs6ihqswgvbhs9b6v6n1pvlqxwjnjwpdhsr5fsw1p"; name = "recipe"; }; - packageRequires = [ emacs lsp-mode ]; + packageRequires = [ emacs lsp-mode sbt-mode ]; meta = { - homepage = "https://melpa.org/#/lsp-php"; + homepage = "https://melpa.org/#/lsp-scala"; license = lib.licenses.free; }; }) {}; - lsp-python = callPackage ({ fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-python"; - ename = "lsp-python"; - version = "20181107.2354"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-python"; - rev = "9b67b63c4c8c53c77eda8b8081b8d458e655ba55"; - sha256 = "15dbjvmcc38rpz6s9vpmgvjppjiyh6qr09zjb66as1sjnhxni11g"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; - sha256 = "0x8cyvkwp4znliiwf3qfrhnk80h8n1jfyyq0n5yfccsgk7gpm8qx"; - name = "recipe"; - }; - packageRequires = [ lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-python"; - license = lib.licenses.free; - }; - }) {}; - lsp-ruby = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: + lsp-sourcekit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , lsp-mode + , melpaBuild }: melpaBuild { - pname = "lsp-ruby"; - ename = "lsp-ruby"; - version = "20181218.2107"; + pname = "lsp-sourcekit"; + ename = "lsp-sourcekit"; + version = "20181216.650"; src = fetchFromGitHub { owner = "emacs-lsp"; - repo = "lsp-ruby"; - rev = "2d3e4e78c69f538bf00f66565278ea4aa686c863"; - sha256 = "0q0d3zsv49i93czph8k23z0dlcwrff5fanaq7x66ynwfg8cws0aw"; + repo = "lsp-sourcekit"; + rev = "99cac71aba68b2ae85c9295d71dda8bc513a85e2"; + sha256 = "0z2yj04if4dhqq2c7am5kzdapaj4l3k0blmy1cp55pr0fkhn8mpj"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/41422dbdee6ecc71a9e4b1520c705a6fd07c9c94/recipes/lsp-ruby"; - sha256 = "1pmmlbxqzzj8zyqyya1p8v6g5v0kisx00d1c5zqja4sqw2n82glr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a1e15078916dc053ca2413a6afae51df22321e9e/recipes/lsp-sourcekit"; + sha256 = "1n3lkpyk2mb8a5qc2h00d6dgbp4ws8pwzqljplnnm35sqg6an76k"; name = "recipe"; }; packageRequires = [ emacs lsp-mode ]; meta = { - homepage = "https://melpa.org/#/lsp-ruby"; + homepage = "https://melpa.org/#/lsp-sourcekit"; license = lib.licenses.free; }; }) {}; - lsp-rust = callPackage ({ dash - , emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , markdown-mode - , melpaBuild - , rust-mode }: - melpaBuild { - pname = "lsp-rust"; - ename = "lsp-rust"; - version = "20180305.508"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-rust"; - rev = "ecc889cc8735b280e0e6e84d2f4526b0048148b3"; - sha256 = "0wmci5lij5721xpfsj3mnvr3z1j8b9s0w76dhzd0lnyaknvyv1rs"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; - sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28"; - name = "recipe"; - }; - packageRequires = [ dash emacs lsp-mode markdown-mode rust-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-rust"; - license = lib.licenses.free; - }; - }) {}; - lsp-sh = callPackage ({ fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-sh"; - ename = "lsp-sh"; - version = "20180912.1858"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-sh"; - rev = "d9e94837ccbb54eafa381833d2a9a0089e01096b"; - sha256 = "11wq5cqg9b198gw0rhzv4sc12zp0gb1mvizhm42nsvcb6a1pfnjr"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/474cecd0b488da2585ff36d01ae453310ede478b/recipes/lsp-sh"; - sha256 = "13wwwh9mak1gbdcasjjwlngh4dya08cm5wqqhvs4a8caiika8byj"; - name = "recipe"; - }; - packageRequires = [ lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-sh"; - license = lib.licenses.free; - }; - }) {}; - lsp-typescript = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild - , typescript-mode }: + lsp-treemacs = callPackage ({ dash + , dash-functional + , emacs + , f + , fetchFromGitHub + , fetchurl + , ht + , lib + , lsp-mode + , melpaBuild + , treemacs }: melpaBuild { - pname = "lsp-typescript"; - ename = "lsp-typescript"; - version = "20181218.2042"; + pname = "lsp-treemacs"; + ename = "lsp-treemacs"; + version = "20190328.2351"; src = fetchFromGitHub { owner = "emacs-lsp"; - repo = "lsp-javascript"; - rev = "392f162ce675a56c60997e8b0b6eba384ccb456a"; - sha256 = "0cj9svzd10wxb83lan83k8r6qvcafnwcb7z70cpksywgs1a2xwml"; + repo = "lsp-treemacs"; + rev = "5b3f0d3242b272cc31b7620766ff7a7a3d997f20"; + sha256 = "1q7qn1m4qy70qghiq3ac3ri69hq3g0kfxp4sf3bzssh9v2yvxwcl"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e7903d6b51132c0d8ad209f13ffe915c1bc5a76d/recipes/lsp-typescript"; - sha256 = "1d1yrcgg1bdsikcb2j8cayhlh9hdnna3rc1pphq0kn81gk0rgbrq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9996b16461fe7c16b315ef30aa6b75c724f8fef/recipes/lsp-treemacs"; + sha256 = "1lgpph7mp4mhvg47fnl7janw2nh8wv1bwap69spgc3qprwbg2hd1"; name = "recipe"; }; - packageRequires = [ emacs lsp-mode typescript-mode ]; + packageRequires = [ dash dash-functional emacs f ht lsp-mode treemacs ]; meta = { - homepage = "https://melpa.org/#/lsp-typescript"; + homepage = "https://melpa.org/#/lsp-treemacs"; license = lib.licenses.free; }; }) {}; @@ -60526,16 +61193,16 @@ melpaBuild { pname = "lsp-ui"; ename = "lsp-ui"; - version = "20181225.2223"; + version = "20190328.2057"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "efdd4a883341bbd4d7ad216a2a50ba59c5a90f33"; - sha256 = "1ij0804srxwxph8m5y9y3fk9d264l912895ji65k6189fr82d4n7"; + rev = "d4088c7471bdb3ba95f2fb0b60277ad95b34a25f"; + sha256 = "0xmfxv68s0m0pwlbs05vx3y94pdwfyswqpzzji714nqzx1ixfqyb"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; - sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b7c78c9b07ede9949d14df74b188d4c1a3365196/recipes/lsp-ui"; + sha256 = "0fylav8b54g020z039zm1mx26d257715bfn9nnpw9i0b97539lqi"; name = "recipe"; }; packageRequires = [ dash dash-functional emacs lsp-mode markdown-mode ]; @@ -60544,33 +61211,6 @@ license = lib.licenses.free; }; }) {}; - lsp-vue = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-vue"; - ename = "lsp-vue"; - version = "20181030.436"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-vue"; - rev = "85567342323943b37bb4e90376d3fae740be4aeb"; - sha256 = "1s8bbrp2gvhjqzmw24sq58i1y3fzy93w4896rlb8ajqzjdl9j6n4"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9eb7699630fd7e11f38b4ba278a497633c9733/recipes/lsp-vue"; - sha256 = "1df3dva31livffy9bzassgqpps3bf9nbqmhngzh8bnhjvvrbj5ic"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-vue"; - license = lib.licenses.free; - }; - }) {}; lua-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -60578,12 +61218,12 @@ melpaBuild { pname = "lua-mode"; ename = "lua-mode"; - version = "20180323.321"; + version = "20190113.250"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd"; - sha256 = "1gi8k2yydwm1knq4pgmn6dp92g97av4ncb6acrnz07iba2r34dyn"; + rev = "95c64bb5634035630e8c59d10d4a1d1003265743"; + sha256 = "0cawb544qylifkvqads307n0nfqg7lvyphqbpbzr2xvr5iyi4901"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -61049,12 +61689,12 @@ melpaBuild { pname = "magik-mode"; ename = "magik-mode"; - version = "20181005.141"; + version = "20190305.1229"; src = fetchFromGitHub { owner = "roadrunner1776"; repo = "magik"; - rev = "d87b9a5be8fc56e48241e02bab4b4a2d347b999d"; - sha256 = "08l2mkgabd885sq8s4vg9xfiszwnh5b20kwds9glymkfi7rh0wvp"; + rev = "743c5160ff2993534014862538961515047ed357"; + sha256 = "0sggdkp01ryknmfv828lqc5lkpks2vlqrqc0hblynyxs8w0azmf8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/291cce8e8e3475348b446ba38833eb1e37d4db65/recipes/magik-mode"; @@ -61074,32 +61714,25 @@ , fetchurl , git-commit , lib - , magit-popup , melpaBuild + , transient , with-editor }: melpaBuild { pname = "magit"; ename = "magit"; - version = "20190101.1707"; + version = "20190405.1004"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "cc435005b07bd7ba17962ffa4e210b441e8a1a52"; - sha256 = "1aiqqdc8j81d16bvj978a6z50rfhl18j0grad7r9wnwd6bda64gz"; + rev = "e19833d9d639221ed78f310b800b464db5600a3f"; + sha256 = "05fmzpqzsfa22ghmbgkirii64i5473463nniik5ck51j5w3z1vd7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit"; sha256 = "03iv74rgng5fcy3qfr76hiy0hj6x2z0pis1yj8wm1naq5rc55hjn"; name = "recipe"; }; - packageRequires = [ - async - dash - emacs - git-commit - magit-popup - with-editor - ]; + packageRequires = [ async dash emacs git-commit transient with-editor ]; meta = { homepage = "https://melpa.org/#/magit"; license = lib.licenses.free; @@ -61114,12 +61747,12 @@ melpaBuild { pname = "magit-annex"; ename = "magit-annex"; - version = "20181119.1826"; + version = "20190217.2127"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "21cb2927d672cc6bf631d8373a361b1766ccf004"; - sha256 = "07r0d2i1hws63wfv1jys63r3lmrl4ywwi76gi7srwhzhqdr1af0n"; + rev = "2b6b51c2f295ffc724bac8e8fde9b161972f9cfe"; + sha256 = "0v5saypcc5s6z1sa6hc3hmigzh7bnmp3247n2a9g259w21f7bcwa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -61278,12 +61911,12 @@ melpaBuild { pname = "magit-imerge"; ename = "magit-imerge"; - version = "20181119.1855"; + version = "20190218.2153"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "5b45efa65317886640c339d1c71d2b9e00e98b77"; - sha256 = "02597aq00fq7b9284kq7s55ddrjb6xhh1l280gq3czi75658d3db"; + rev = "54f2e25eb5f9e9763a60808ecfc1edef7f276ce0"; + sha256 = "0i16s3kc5k1sr2fgq72n0nmrwqphrg5zppmvri653120nga7b5lx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -61390,12 +62023,12 @@ melpaBuild { pname = "magit-popup"; ename = "magit-popup"; - version = "20181204.1231"; + version = "20190223.1434"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "8eaa0becc2370484a432a8a19f40ce5e8d0f1642"; - sha256 = "13riknyqr6vxqll80sfhvz165flvdz367rbd0pr5slb01bnfsi2i"; + rev = "4250c3a606011e3ff2477e3b5bbde2b493f3c85c"; + sha256 = "073x1yf96b623yphylnf0ysannr91vawzgjdv1smkcrgd4451hr3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -61435,28 +62068,55 @@ license = lib.licenses.free; }; }) {}; - magit-stgit = callPackage ({ emacs - , fetchFromGitHub + magit-reviewboard = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , request + , s }: + melpaBuild { + pname = "magit-reviewboard"; + ename = "magit-reviewboard"; + version = "20190211.1444"; + src = fetchFromGitHub { + owner = "jtamagnan"; + repo = "magit-reviewboard"; + rev = "f3d5ed914243e3930f9c06f59021305e7e43e67d"; + sha256 = "0xlhy328h2wxklpy71dhy1fk7zv6hs2v4jrl1mm9x5mnrbrdfvxx"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f3715fa1df69350205e4269b7090c46b343d8bf0/recipes/magit-reviewboard"; + sha256 = "1sxqij3370vn6ap52lf4hdlcxfj9mj17sb5r4kk5msjbw3bzdmzr"; + name = "recipe"; + }; + packageRequires = [ emacs magit request s ]; + meta = { + homepage = "https://melpa.org/#/magit-reviewboard"; + license = lib.licenses.free; + }; + }) {}; + magit-stgit = callPackage ({ fetchFromGitHub , fetchurl , lib - , magit , melpaBuild }: melpaBuild { pname = "magit-stgit"; ename = "magit-stgit"; - version = "20180522.542"; + version = "20190313.455"; src = fetchFromGitHub { - owner = "magit"; + owner = "emacsorphanage"; repo = "magit-stgit"; - rev = "186e60489f5449d87d94aca24b9d65e2f26a3bc5"; - sha256 = "134555zdc7abrfl9hlyy3l3raljzn3kk4zfcmr70xkx2qjjdl9a2"; + rev = "d1ba02851071326bc2d58dd8e95093c666e3ceb8"; + sha256 = "00xrqcv3h5qbvi4klv23fdf2kcgfrzb2r77qmjilv5wsy6dlw71h"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; - sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/72a38bbc5bba53dfb971f17213287caf0d190db0/recipes/magit-stgit"; + sha256 = "1spli6yq258zwx95y16s27hr7hlc2h0kc9mjnvjjl13y2l6shm0i"; name = "recipe"; }; - packageRequires = [ emacs magit ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/magit-stgit"; license = lib.licenses.free; @@ -61471,16 +62131,16 @@ melpaBuild { pname = "magit-svn"; ename = "magit-svn"; - version = "20170213.433"; + version = "20190324.759"; src = fetchFromGitHub { - owner = "magit"; + owner = "emacsorphanage"; repo = "magit-svn"; - rev = "c833903732a14478f5c4cfc561bae7c50671b36c"; - sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9"; + rev = "f7dad9b0f6b81b23550ea5cca0f3219f184b746c"; + sha256 = "1dpljj5l0jf28xsynj9wsgbn6wh6llx0wxvigrv37ccvrz4k2fgg"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; - sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a1ff188d509aec104e9d21a640cf5bc3addedf00/recipes/magit-svn"; + sha256 = "1dww5fc5phai3wk9lp85h6y08ai3vxgggsqj78a3mlcn2adwwc01"; name = "recipe"; }; packageRequires = [ emacs magit ]; @@ -61498,12 +62158,12 @@ melpaBuild { pname = "magit-tbdiff"; ename = "magit-tbdiff"; - version = "20181119.1722"; + version = "20190219.2015"; src = fetchFromGitHub { owner = "magit"; repo = "magit-tbdiff"; - rev = "4273bfab1d2b620d68d890fbaaa78c56cf210059"; - sha256 = "0d1cn0nshxnvgjvl9j7wsai75pvsxmrmkdj57xdpyggwxgcpl1m4"; + rev = "48075990d10f7947191c24050e7012d99759f191"; + sha256 = "10nbkc49d15z9xzlskbc8fv4zckscini4favj8m2ikgfxdyd35h1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; @@ -61531,12 +62191,12 @@ melpaBuild { pname = "magit-todos"; ename = "magit-todos"; - version = "20181219.2058"; + version = "20190114.650"; src = fetchFromGitHub { owner = "alphapapa"; repo = "magit-todos"; - rev = "4383f95ea434b41131313eadffe77c2fe8369c5d"; - sha256 = "1i0xbx81s7hw7chspr22mv1jj1qm04dyk8inv2rypwjnp9kgwhya"; + rev = "14e5347c98f42166ad7061b8663d368bb0d4fba4"; + sha256 = "1czaf38w0z1pkjwmlhxrln9nmd3zp1j7gmhaf82bw15d8xcl4kbh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos"; @@ -61589,12 +62249,12 @@ melpaBuild { pname = "magithub"; ename = "magithub"; - version = "20190101.1549"; + version = "20190118.1347"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "d23713941690d25d47560e480d344c9e1123b3ae"; - sha256 = "0pkqrzy1762inbcgsfwq6i30c72qr98la2n1bhbyb2z7av72a7cb"; + rev = "18e66c284af911f3e3178550384d050536db42ac"; + sha256 = "00r2fp6zbs7321ixdbrh8fj3s6b1bg85hcc2jim6k8pdvssavz1x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e555b46f5de7591aa8e10a7cf67421e26a676db8/recipes/magithub"; @@ -61687,6 +62347,34 @@ license = lib.licenses.free; }; }) {}; + major-mode-hydra = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pretty-hydra }: + melpaBuild { + pname = "major-mode-hydra"; + ename = "major-mode-hydra"; + version = "20190226.1946"; + src = fetchFromGitHub { + owner = "jerrypnz"; + repo = "major-mode-hydra.el"; + rev = "2142be970874c679300e539a1d9d0f048eb72a7f"; + sha256 = "00hxv2nlzz4kgyzrldhqfnvnrhdcb82lm90xdbvn059f1v1zihn3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865917fcc75c4118afc89b8bcc20ebdb6302f15d/recipes/major-mode-hydra"; + sha256 = "0654wnsw38sca97kvp8p3k1h6r91iqs873gcjaaxd7a96sisvafd"; + name = "recipe"; + }; + packageRequires = [ dash emacs pretty-hydra ]; + meta = { + homepage = "https://melpa.org/#/major-mode-hydra"; + license = lib.licenses.free; + }; + }) {}; major-mode-icons = callPackage ({ all-the-icons , emacs , fetchFromGitHub @@ -62077,26 +62765,27 @@ license = lib.licenses.free; }; }) {}; - map-progress = callPackage ({ fetchFromGitHub + map-progress = callPackage ({ cl-lib ? null + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "map-progress"; ename = "map-progress"; - version = "20140310.1432"; + version = "20190127.1616"; src = fetchFromGitHub { owner = "tarsius"; repo = "map-progress"; - rev = "3167eb218510953fb97e7d50948a625eaa3f0005"; - sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1"; + rev = "1fb916159cd054c233ce3c80d9d01adfae640297"; + sha256 = "1hbk35l9aljp4jqg8cv67q6b2jbcx0g665j90fygxqibrf6r52a8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ed3335eaf0be7368059bcdb52c46f5e47c0c1a5/recipes/map-progress"; sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/map-progress"; license = lib.licenses.free; @@ -62110,12 +62799,12 @@ melpaBuild { pname = "map-regexp"; ename = "map-regexp"; - version = "20130522.1403"; + version = "20190127.1618"; src = fetchFromGitHub { owner = "tarsius"; repo = "map-regexp"; - rev = "b8e06284ec1c593d7d2bda5f35597a63de46333f"; - sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c"; + rev = "ae2d1c22f786ad987aef3e319925e80160a887a0"; + sha256 = "1ybhizafdhzm7fg8s6gm13fbrz1vnrc7ifq8gvrrm89wl3qi5z7f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/927314443ecc00d94e7125de669e82832c5a125c/recipes/map-regexp"; @@ -62216,12 +62905,12 @@ melpaBuild { pname = "markdown-mode"; ename = "markdown-mode"; - version = "20181229.630"; + version = "20190304.1919"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "da1c825433fd6e9a392754118a205e3eb7b39ac4"; - sha256 = "1pbm0nggdv30ik1823v0zyx65xdpdvx4q4vf6sxbxd22gvpvqx0q"; + rev = "115f77df9755c6a453f3e5d9623ff885d207ea82"; + sha256 = "0a26gz2m5v0jkawlqb723yiqsns4sg7inalr8fk1x08khnckkzyz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -62370,6 +63059,32 @@ license = lib.licenses.free; }; }) {}; + markless = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "markless"; + ename = "markless"; + version = "20190306.202"; + src = fetchFromGitHub { + owner = "shirakumo"; + repo = "markless.el"; + rev = "78632f86e3b5a1e3d74b2ab86f4c95b10e5eae94"; + sha256 = "1hmf5qlxpli61a9pwg09hbsdn1lg4l8czvrvw09js3vrbv7xh3ds"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5542e142d47f6f52839a44b8ee16327f88869f50/recipes/markless"; + sha256 = "1a5kp46xj4b5kgcypacxcwhjjwi4m7f6shdda8l8my3s3x8ji5bj"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/markless"; + license = lib.licenses.free; + }; + }) {}; markup = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -62511,12 +63226,12 @@ melpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "20180810.1920"; + version = "20190304.1944"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "e4482232a5bb2a3036664eba598bf12506fe0b6e"; - sha256 = "07fq3k62j9cz1567i2x11q1j9pwybb7qxwcilnnrphf4aibgq6kn"; + rev = "5095797ef32b922d2a624fa6beb970b5e9cf5ca0"; + sha256 = "0hwax6y9dghqwsbnb6f1bnc7gh8xsh5cvcnayk2sn49x8b0zi5h1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -62876,12 +63591,12 @@ melpaBuild { pname = "md4rd"; ename = "md4rd"; - version = "20181208.2112"; + version = "20190312.1940"; src = fetchFromGitHub { owner = "ahungry"; repo = "md4rd"; - rev = "c55512c2f7680db2a1e73db6bdf93adecaf40fec"; - sha256 = "0mvv1mvsrpkrmikcpfqf2zbawnzgq33j6zjdrlv48mcw57xb2ak9"; + rev = "443c8059af4925d11c93a1293663165c52472f08"; + sha256 = "1n6g6k4adzkkn1g7z4j27s35xy12c1fg2r08gv345ddr3wplq4ri"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d4a3b3337e16e68631409d1de0ce67ae22b837/recipes/md4rd"; @@ -62930,12 +63645,12 @@ melpaBuild { pname = "meghanada"; ename = "meghanada"; - version = "20181116.502"; + version = "20190225.625"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "4914ab1496d88251f179dc3b6158fc65e999804a"; - sha256 = "1mzl09fn3wxkhxpa4xzn306blzk07gdyzghf1d1vz3x6ll7r0gpk"; + rev = "7ea4885b79224c024f5cde4bb7d6b98c77b84eda"; + sha256 = "0zigc6f02qdv8fj5wfpw56dw1glk3q204qxyipazsv6pm62v0y01"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -62955,12 +63670,12 @@ melpaBuild { pname = "melancholy-theme"; ename = "melancholy-theme"; - version = "20170220.1248"; + version = "20190406.1618"; src = fetchFromGitHub { owner = "techquila"; repo = "melancholy-theme"; - rev = "a9e13ca7051731b3a2c2aece9f3e3033b9a5e41d"; - sha256 = "13wgh3w9wh1y1ynsbz4zi2vj14h8z1kj5vhq4w6szs0y0zzjb9zj"; + rev = "a5fb97b52c56c612474fec4ec45472fe13bd4c20"; + sha256 = "0syx0h8930j58bky14wnrba8iafzi3hdsb11kvsb48vdqv2minrq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme"; @@ -63088,12 +63803,12 @@ melpaBuild { pname = "mentor"; ename = "mentor"; - version = "20181029.1307"; + version = "20190407.1142"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "9415472470ff23ee9600d94123c51c455d63018d"; - sha256 = "05gfprcrh9p06arsni58nf60inlf1zbd18i678r9xd4q0v35k491"; + rev = "467c531f0c40ca924b3bb971e264727f7332e681"; + sha256 = "1hjfw59wlkkqff2r7m81hcin6px6sdw8bfh2mnz0cbfs1gw2y15i"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; @@ -63113,12 +63828,12 @@ melpaBuild { pname = "merlin"; ename = "merlin"; - version = "20181212.316"; + version = "20190323.230"; src = fetchFromGitHub { owner = "ocaml"; repo = "merlin"; - rev = "18f67a19dd340df8a7304c2b7b16c0baeb8e8117"; - sha256 = "1ck1h4d68px83l5vmm16p7qia7gcfxbi8ymc2w7y7an5f2158f7k"; + rev = "1ab2b90f4508855ac0caab51a6a5dad3e48cdb00"; + sha256 = "0cn46b2im7k2j3p8r34pmqmdrxxwls14l21mjjfll2fc329s3shr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9338298a79b7f2d654df90b0f553aeed1428de13/recipes/merlin"; @@ -63140,12 +63855,12 @@ melpaBuild { pname = "merlin-eldoc"; ename = "merlin-eldoc"; - version = "20180830.316"; + version = "20190314.106"; src = fetchFromGitHub { owner = "Khady"; repo = "merlin-eldoc"; - rev = "85dec436648f43c050048524fae7a3ad7ad4c019"; - sha256 = "1kpdz540j32hpjykyagpwvzh7cf4gx2rfp3pdq2agc7b3bsg2jyz"; + rev = "09760346e34ac22f2b55f43f0e36a2865c3b8026"; + sha256 = "12bba6f6qxi6azlafzhymqyaf57qi479n34crixmk8v69ivdch8y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/merlin-eldoc"; @@ -63216,12 +63931,12 @@ melpaBuild { pname = "meta-presenter"; ename = "meta-presenter"; - version = "20170425.1934"; + version = "20190318.859"; src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "7ba8d30e36ce6de6e563c7f3a41a24d288787c48"; - sha256 = "0m23qsbai8j0bx0px7v3ipw92i4y8maxibna6zqrw3msv1j3s7cw"; + rev = "3d8c762a7dd7ac39032a3601bd6a717f206e670d"; + sha256 = "0r9zzmglmkkmxcqh0pdlg279mpd524k2rwn56kyvj5i3i8zw9rpl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -63320,12 +64035,12 @@ melpaBuild { pname = "metaweblog"; ename = "metaweblog"; - version = "20171216.1840"; + version = "20190211.1838"; src = fetchFromGitHub { owner = "org2blog"; repo = "metaweblog"; - rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a"; - sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5"; + rev = "844c8b5b4483fa75378c4bec526d63cae0b211d9"; + sha256 = "0rxqkj7r38vr4qjnc2dric9sjdjm6vgnv0c9vfcb29v17hkg3aah"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/metaweblog"; @@ -63345,12 +64060,12 @@ melpaBuild { pname = "mew"; ename = "mew"; - version = "20180910.1823"; + version = "20190307.1729"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "91a78fd6c6d74d0881d68c51dcd9be8cae065c02"; - sha256 = "1ydiqafai6ji57p807iwlm3hzxqs19ghc5j3f19r6w17y65w06m1"; + rev = "0dacffb71bd0c8aa7e104658833c1d50776eb3a4"; + sha256 = "00qq5aysjxv3a1b0x6k5idxvam9g5jzbrmiy25x32wih6a6abg33"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -63396,12 +64111,12 @@ melpaBuild { pname = "mgmtconfig-mode"; ename = "mgmtconfig-mode"; - version = "20180222.1257"; + version = "20190324.1208"; src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; - rev = "f01eea33e9b396f1e7501944216271d0d9b8df6f"; - sha256 = "19grypbx6kxgdlqnj1h7rz2clvrwk98z5sk9dar0077ncp2k1f80"; + rev = "07f542b4d753fe2f182b5e139450217a633491f8"; + sha256 = "0nbj3fh3wsl9065mad04c7avc2pq4lqrdng1xkwdng6l361f2wak"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf3dd70ae73c2b049e201a3547bbeb9bb117983/recipes/mgmtconfig-mode"; @@ -63422,12 +64137,12 @@ melpaBuild { pname = "mhc"; ename = "mhc"; - version = "20180723.2158"; + version = "20190116.2146"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "2cd1e97fa2e32e7dfde5ee7878fb9a915fb6a3b8"; - sha256 = "1rr7205q2gwi8bw4hab7p7061bc15sqrj4mam02hlplg7dcj476q"; + rev = "a0a7e01587c47b11f4aa87ac977ca43298a75570"; + sha256 = "1wxyp4snkarbbrqb1a28hdf286cwf08v0fbi9pl9mw4q7sn598s2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -63527,12 +64242,12 @@ melpaBuild { pname = "migemo"; ename = "migemo"; - version = "20160924.741"; + version = "20190111.2116"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "migemo"; - rev = "e4744efae1b2fdea2bbd2ceaff0f6ea0bb739f5a"; - sha256 = "12p50kg2h78qi8892jj4g3wa4fjm7gjiqf6qw52zyx3kvgwxgxwa"; + rev = "09936ee27a5f3678fdf57b8a0faaa0ff150435cc"; + sha256 = "0wfik7y3ybh4yrrlpydawx5zw0syv7wm7b1mckz2rbv3d863z0n5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2424b0328a0198a03359455abdb3024a8067c857/recipes/migemo"; @@ -63602,12 +64317,12 @@ melpaBuild { pname = "mingus"; ename = "mingus"; - version = "20180712.2336"; + version = "20190106.643"; src = fetchFromGitHub { owner = "pft"; repo = "mingus"; - rev = "686d383f48b196c916c5fcb6ddc3bcff8a0c4b14"; - sha256 = "0vv6aqalbpshr0fadh248lirqa6a0dcixccby2kbvdsf79s7xzx8"; + rev = "4223be618f57f10f18114a74393a71955b568884"; + sha256 = "14i06i999wfpr0a0lvhnh6g4mm5xmawscjd9d7ibc055h94h3i2a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6699927f1ded5c97f2ce1861f8e54a5453264cca/recipes/mingus"; @@ -63778,12 +64493,12 @@ melpaBuild { pname = "minimal-theme"; ename = "minimal-theme"; - version = "20160608.322"; + version = "20190113.1332"; src = fetchFromGitHub { owner = "anler"; repo = "minimal-theme"; - rev = "430e0d3fc2044c16aa9f10961841febbd60df285"; - sha256 = "1rmcvdydgwppma1v2yajz6yzhns8bh3gdb09338jlk0nkp1akpfj"; + rev = "063b4d8ca33d55d04c341f0b2b777ec241a3e201"; + sha256 = "0lvg7iym6sxhgl4ab9a6x8c2mh2d32vkf0033bs3vphx657gra6l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/minimal-theme"; @@ -63958,12 +64673,12 @@ melpaBuild { pname = "mixed-pitch"; ename = "mixed-pitch"; - version = "20181119.1503"; + version = "20190307.1410"; src = fetchFromGitLab { owner = "jabranham"; repo = "mixed-pitch"; - rev = "9acced5c7797fe855550d0870e874bbf030169fa"; - sha256 = "1j4bm0sq2za4hix6fhfhsyzp1ji3y6ql5ipjll0b55nxxxmbs5cz"; + rev = "15bb9ec6d8be0812a46917205be6c3a1c78f68ff"; + sha256 = "1458sy5b6bis1i0k23jdqk6hfqg0ghk637r3ajql2g19ym48rf58"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/mixed-pitch"; @@ -64347,12 +65062,12 @@ melpaBuild { pname = "modern-cpp-font-lock"; ename = "modern-cpp-font-lock"; - version = "20180110.1231"; + version = "20190331.828"; src = fetchFromGitHub { owner = "ludwigpacifici"; repo = "modern-cpp-font-lock"; - rev = "9b10e1831bac34685be89e32e83ed969c4bac683"; - sha256 = "0csaky9k24hd3qjhb3kyraycvlsdkjhmw6bbd36z0q0ac56sd2sg"; + rev = "02f104701bc34c146d22e3143ae59ef362999098"; + sha256 = "14vxxvvm12jnq4llb759h8y4w3cv71d3xic1mbp0jmyd0j4dkqzp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; @@ -64523,12 +65238,12 @@ melpaBuild { pname = "monky"; ename = "monky"; - version = "20181120.1537"; + version = "20190402.825"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "monky"; - rev = "d5e787c153eeb35241c165cfda852d37f8dae562"; - sha256 = "1qpy6r0h1h62x7q76l2db9fx4dbiimn6j9d55cvmm3mn012gn4xw"; + rev = "bb2fbb43c9b1894160ca47560338a0be30cc0233"; + sha256 = "0ai8gcrd66jrhxmmwysfaqxpl0347qd9xdqys82284528hd89ms9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky"; @@ -64650,12 +65365,12 @@ melpaBuild { pname = "monroe"; ename = "monroe"; - version = "20180703.1046"; + version = "20190109.547"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "36fd5b250de51f8bfa62bbe6ce35e8690e0ad120"; - sha256 = "1aw823a5llv196rzqhqvh7bk2npwzy1fgaj24xv0x2g5fk9n85hv"; + rev = "2f472fdc09c1b36c291ddb5ed9aecc331fd7e082"; + sha256 = "1g9v7z2bk2vcknpff31y9pf6cw8xrb5hxsh8cjci7i5w2abp7qbj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -64676,12 +65391,12 @@ melpaBuild { pname = "moody"; ename = "moody"; - version = "20190101.1429"; + version = "20190203.947"; src = fetchFromGitHub { owner = "tarsius"; repo = "moody"; - rev = "3d4f407e61fd6d1c5019a76eeebde2c8069552c6"; - sha256 = "00f13w48sh3idjyb8jz8rxi2pg896zg98axqyad78p972rddqh09"; + rev = "e0975e844876f0962b2e9481c26739397bd23541"; + sha256 = "0jci21ycsyf1mblcv8vbii4wisw1zcs15q5xwld7ai24kgj70269"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; @@ -65170,12 +65885,12 @@ melpaBuild { pname = "mpdel"; ename = "mpdel"; - version = "20181223.803"; + version = "20190124.621"; src = fetchFromGitHub { owner = "mpdel"; repo = "mpdel"; - rev = "c84da6bacfd9cf49155e1857d3065a475a865d69"; - sha256 = "13gikwfnl2x29z56c3xzbk575cn7k7z8wykqin94s81mhlgylkk0"; + rev = "ad63914b95b5655b873341a778b98896d8de5ad8"; + sha256 = "1znv7mbdjhz6vggzyj7ys0014gsvqd16b0hgvngbhjdrk8cm5a5q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb25443752e18e47afc63d5497cc5052c388a607/recipes/mpdel"; @@ -65306,12 +66021,12 @@ melpaBuild { pname = "ms-python"; ename = "ms-python"; - version = "20181215.1914"; + version = "20190318.1929"; src = fetchFromGitHub { owner = "xhcoding"; repo = "ms-python"; - rev = "f8eb328109672ed3c710fb2209fe13e20107a500"; - sha256 = "0nvmrp86mil11p8yv27b1j44qj4whz607a4wlb9dy16g1w2dq5yv"; + rev = "5412bb664b5c8d7fca1a98ccb50ffc5a2592a75c"; + sha256 = "1wp1vhll9wsr5wpq6d2gjzc9nwvn6n61x80kmprr7m1mr6zav9bk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6373142d80e84db8dec47abd0cdc562352b16681/recipes/ms-python"; @@ -65442,12 +66157,12 @@ melpaBuild { pname = "mu4e-conversation"; ename = "mu4e-conversation"; - version = "20181218.13"; + version = "20190305.836"; src = fetchFromGitLab { owner = "ambrevar"; repo = "mu4e-conversation"; - rev = "e022770609b997573c9bd1424b0f52ae57f49300"; - sha256 = "00p5s64yzw92z9c36ppljgmx407n5i0y9gmiva082l0f170dppx9"; + rev = "fc3c9d3aca3cfae87001f95d505fab4fed597df0"; + sha256 = "06br06ld9brvki53jrw2zsarz1fnr4ajd7va9yb6y3sphphz0vc6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7638aecc7a2cd4b1646c6e32fe83e18ef212bbaa/recipes/mu4e-conversation"; @@ -65469,12 +66184,12 @@ melpaBuild { pname = "mu4e-jump-to-list"; ename = "mu4e-jump-to-list"; - version = "20180425.1132"; + version = "20190129.1548"; src = fetchFromGitLab { owner = "wavexx"; repo = "mu4e-jump-to-list.el"; - rev = "e336ffe84b55edaaf4e48040d4d9156a9f4c881e"; - sha256 = "0ff7a64vk0kd1sl52ncwj2xf3sh0kb0yln1cmdxdz0hyfsnc8d1h"; + rev = "b63360eab8975acce04e803a5919abbe2daf863c"; + sha256 = "1f7vxkv60smi2zjcg3bl8l7wjhrc35980wprmiy8568lvin6afbh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/mu4e-jump-to-list"; @@ -65656,11 +66371,11 @@ melpaBuild { pname = "multi-project"; ename = "multi-project"; - version = "20181230.1134"; + version = "20190217.832"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "2f03ef533b85"; - sha256 = "1hyr35kqmsj6mfrmg3glasz5wad5drzhpif1p6rh9kgypklq8rgj"; + rev = "13bd84412236"; + sha256 = "1i97m9iyslg34vbg2aqjy4hzad78qsi0jjkh83xgrdn0hax2x9wy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -65682,12 +66397,12 @@ melpaBuild { pname = "multi-run"; ename = "multi-run"; - version = "20181118.1514"; + version = "20190401.1458"; src = fetchFromGitHub { owner = "sagarjha"; repo = "multi-run"; - rev = "ce5ce0c56b56a9f47915dd8b83a94db353b548a5"; - sha256 = "1zh6fck20hn5nb3lbahkgkmdndid7s2kvg4g2lig9qrhzn83cl4b"; + rev = "74905979f35e06fff4046cd26542bcb1e4f08cb1"; + sha256 = "16ifp19qh5jy6vvqw2cyyym9sd810n2gdhpjl8vws2svnxrh1mba"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e05ad99477bb97343232ded7083fddb810ae1781/recipes/multi-run"; @@ -65808,12 +66523,12 @@ melpaBuild { pname = "multiple-cursors"; ename = "multiple-cursors"; - version = "20180913.537"; + version = "20190317.511"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff"; - sha256 = "0g4mqjahfya5n0hjw4z7ivd2g1kjbsr5h94d052qx6bcnmp66h3r"; + rev = "fc6a6a74626b8458f2a36d802165a7f74114fafd"; + sha256 = "0rya3zdbs9z8f8pqr1nbsri30m76iyr5fbi0wvh0y1xyr93y33j3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -65835,12 +66550,12 @@ melpaBuild { pname = "multitran"; ename = "multitran"; - version = "20181215.727"; + version = "20190402.1304"; src = fetchFromGitHub { owner = "zevlg"; repo = "multitran.el"; - rev = "e773138e1f24be805e9284fbedf0f237e01d1e6b"; - sha256 = "0j5if86rmg6zg2qcs7xln5inqn0a0bvbxzr8a5zznba79rpnwhy8"; + rev = "a0521a3455f95638ab4c37ac112026928eab09a2"; + sha256 = "0i7wy3g229yssf0n75cch4d3sk73br7673razws5dzrwhmmvi3nb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d665759fa6491b77103920a75c18a561f6800c1c/recipes/multitran"; @@ -65984,6 +66699,32 @@ license = lib.licenses.free; }; }) {}; + mutt-mode = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "mutt-mode"; + ename = "mutt-mode"; + version = "20190302.715"; + src = fetchFromGitLab { + owner = "flexw"; + repo = "mutt-mode"; + rev = "92763c5ff9abbf4ef91ce15fa7cc6b23da1cfa2d"; + sha256 = "0n04500kr4d3qg6g98nzmdjcdy7qqs5r7f9cbi50r15jr9ihsjvx"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9da58f247dee4f06cbcf6ed532134bc474d309/recipes/mutt-mode"; + sha256 = "0k1r2lsh8s054aapyf7diki00sxf1wdm01cavlqxbvv3zg2gym8d"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mutt-mode"; + license = lib.licenses.free; + }; + }) {}; mvn = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -66225,12 +66966,12 @@ melpaBuild { pname = "myterminal-controls"; ename = "myterminal-controls"; - version = "20170425.1936"; + version = "20190331.2104"; src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "59ff3a02e34969a2ac608906937cb65cb514f9f1"; - sha256 = "11b0m09n1qqhjbdmcilb1g1408k17700qn37m3wavjrcjvdhnd5n"; + rev = "df144b269bc274162602e50c692be20ac9b90547"; + sha256 = "02bd47rx2ykz5hhrf1szcqz7s9r5fxz7n3hnwlqap2r6xcv6cpvk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -66564,12 +67305,12 @@ melpaBuild { pname = "naquadah-theme"; ename = "naquadah-theme"; - version = "20180212.440"; + version = "20190225.627"; src = fetchFromGitHub { owner = "jd"; repo = "naquadah-theme"; - rev = "999056526db5095ce600c83672fc80cb744bd93e"; - sha256 = "1f10598m4vcpr4md6hpdvv46zi6159rajxyzrrlkiz0g94v8y6rl"; + rev = "430c3b7bd51922cb616b3f60301f4e2604816ed8"; + sha256 = "0z2dn05xgbdfw6rwgsq31rm5dr098dk411qk83fbx2bkdxxfr60w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/naquadah-theme"; @@ -67362,26 +68103,27 @@ license = lib.licenses.free; }; }) {}; - nimbus-theme = callPackage ({ fetchFromGitHub + nimbus-theme = callPackage ({ emacs + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "nimbus-theme"; ename = "nimbus-theme"; - version = "20181228.1243"; + version = "20190405.1111"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "49fd0442de38b3fc31ecabd88d455ecb9bb59f04"; - sha256 = "1lsi2846116fh16h46lw10xz5313h03k123kplfyq1p2ms4p0wwi"; + rev = "5d957b3e8939cebd008b113c8c4d581a66aba36c"; + sha256 = "0msdb2pyr51430crcnjvsfajd9j4cbk1l09f5r8z3nqadp5df6cj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; sha256 = "1hy4rc1v5wg7n6nazdq09gadirb0qvn887mmdavwjnnac45xyi18"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/nimbus-theme"; license = lib.licenses.free; @@ -67448,12 +68190,12 @@ melpaBuild { pname = "nix-mode"; ename = "nix-mode"; - version = "20181212.1342"; + version = "20190119.125"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "1512d02830fe90dddd35c9b4bd83d0ee963de57b"; - sha256 = "1sn2077vmn71vwjvgs7a5prlp94kyds5x6dyspckxc78l2byb661"; + rev = "1e53bed4d47c526c71113569f592c82845a17784"; + sha256 = "172s5lxlns633gbi6sq6iws269chalh5k501n3wffp5i3b2xzdyq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -67501,12 +68243,12 @@ melpaBuild { pname = "nix-update"; ename = "nix-update"; - version = "20180424.1748"; + version = "20190124.1135"; src = fetchFromGitHub { owner = "jwiegley"; repo = "nix-update-el"; - rev = "d92b2c190dbaeb16751be724fe381f8a796c424c"; - sha256 = "0lqhc7nnw96pz9alq75w6zmjb6carmaak1g2cf4csslqbihnbriz"; + rev = "fc6c39c2da3fcfa62f4796816c084a6389c8b6e7"; + sha256 = "01cpl4w49m5dfkx7l8g1q183s341iz6vkjv2q4fbx93avd7msjgi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c59e828d4cad3d75344b34b9666349250e53b6ea/recipes/nix-update"; @@ -67555,12 +68297,12 @@ melpaBuild { pname = "nlinum-hl"; ename = "nlinum-hl"; - version = "20170613.1748"; + version = "20190301.1317"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-nlinum-hl"; - rev = "46e26d1e3d5bfe9a3f79a5cce21f3c442ac10da8"; - sha256 = "1yi3rg6j8r0c7a70dghj838vfslwdvjcy6w7735pfbdb073mpzfs"; + rev = "dc6b365a58e06c7d637a76a31c71a40b20da8b56"; + sha256 = "1fvvyc77iggil9mzy8hd4vx8xw96bkfx6pmlb9ami428qp8r45g7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl"; @@ -67688,12 +68430,12 @@ melpaBuild { pname = "no-littering"; ename = "no-littering"; - version = "20181220.1409"; + version = "20190224.1309"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "4e7ecf017140bc522629cd2c977160f7cc2b8020"; - sha256 = "0xff3iy099msfdi09wvl2iqkxgndb3asffb2w2dak6wva2kf1z0d"; + rev = "974f105ea17729aa77a5bf1b4d70cb6e09b4cd6a"; + sha256 = "08bgcj8n72zcyzx1qlg4pksnp6ppnzw51a57fw677bri4awny6pi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -67717,12 +68459,12 @@ melpaBuild { pname = "noaa"; ename = "noaa"; - version = "20181218.1016"; + version = "20190202.834"; src = fetchFromGitHub { owner = "thomp"; repo = "noaa"; - rev = "47ee41e30194b1680aab0744b0d2fbeb3a74d893"; - sha256 = "0msg6gqbyd11dbnc5lcsnnd1knx79sb021h6wbiky70mnyy9anjl"; + rev = "532eb14328027ee29e124768feec23a8ef7ee798"; + sha256 = "1qc9im01fw7k9907a9d2a87hndyyn3sk1kw31cylsvrzsb7ss9f9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa"; @@ -68073,11 +68815,11 @@ melpaBuild { pname = "notmuch"; ename = "notmuch"; - version = "20181208.445"; + version = "20190331.920"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "1ac110c12e9efe7c873bf6ace7211b6d07393d98"; - sha256 = "1x43jfg1bzimhf3cmzpkzs0a8yla02zsdcl0fsdd1f7a8pzpsq5b"; + rev = "8e584392dce53d322b9403306991944c5578b1f0"; + sha256 = "1yi7f2fz3bl9x2n05iv6vsdvahyyxn6520wp7hs73cq75wqc174r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; @@ -68126,12 +68868,12 @@ melpaBuild { pname = "nov"; ename = "nov"; - version = "20181117.2350"; + version = "20190115.1054"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "3bb7a4038f0c2100df671c9f1f33b785ed4ae296"; - sha256 = "1s2av1yrzsqslgjfiislf9bljdk0rxpyq2vrbyralfnj2wvgpk9m"; + rev = "b720d91ca3b0a0fcb5387428716ea57f652c75b3"; + sha256 = "0yp8i4gnw4h2557793pjvxqwn8cjrzz0z5y21w8r8ffmw24x51if"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -68152,12 +68894,12 @@ melpaBuild { pname = "nova-theme"; ename = "nova-theme"; - version = "20180905.1211"; + version = "20190220.1638"; src = fetchFromGitHub { owner = "muirmanders"; repo = "emacs-nova-theme"; - rev = "932c83e6e06e795c2a380b69eee3913a3a805cea"; - sha256 = "1mawj1dxp2s9fqg24j0v5xfn0r6wrlvplbl4a71q553rsr3q63il"; + rev = "b37c4cf078a811f40e30dbb790fe26845d601cd9"; + sha256 = "1wxl6b14429kqvrm6mb2zmcxixcz7l4k8p5y408jr0yjdw3rlpki"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16457166c17fb1cc074a34c61e52ebc285c0eacc/recipes/nova-theme"; @@ -68326,11 +69068,38 @@ license = lib.licenses.free; }; }) {}; + nswbuff = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "nswbuff"; + ename = "nswbuff"; + version = "20190320.40"; + src = fetchFromGitHub { + owner = "joostkremers"; + repo = "nswbuff"; + rev = "362da7f3687e2eb5bb11667347de85f4a9d002bc"; + sha256 = "0l2xfz8z5qd4hz3kv6zn7h6qq3narkilri8a071y1n8j31jps4ma"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c0f7e952f3fbec691df51d19224f701e6530f16e/recipes/nswbuff"; + sha256 = "1fq2dp9jlhfl9rqw6ldh0xnm0hx9ama2wf87s51qgqxxdn9ngk8x"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nswbuff"; + license = lib.licenses.free; + }; + }) {}; nu-mode = callPackage ({ ace-window , avy , fetchFromGitHub , fetchurl , lib + , lv , melpaBuild , transpose-frame , undo-tree @@ -68338,12 +69107,12 @@ melpaBuild { pname = "nu-mode"; ename = "nu-mode"; - version = "20181021.1332"; + version = "20190404.1332"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "1c20826ee462ad991e8b9cdeedfacb6bf1c159bf"; - sha256 = "120ba0av9zczxncn97mlivjyaazlanrsisv6l8smhww0s7mvwhz6"; + rev = "d5fb4d26d1b0bb383ea2827cc5af5dfb2a269d2b"; + sha256 = "0nd7ypin9kl784iqffznld6kknghdjywqnjw5nwinfgkwhcrjpdd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -68353,6 +69122,7 @@ packageRequires = [ ace-window avy + lv transpose-frame undo-tree which-key @@ -68594,6 +69364,31 @@ license = lib.licenses.free; }; }) {}; + nz-holidays = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "nz-holidays"; + ename = "nz-holidays"; + version = "20190307.1437"; + src = fetchFromGitHub { + owner = "techquila"; + repo = "nz-holidays"; + rev = "b609dbb02e6824600b43d3976c8a428347c7df93"; + sha256 = "10z563jmgwz22jv720rssc3irbl9624icfp059pp0qirnlg2ibx0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4dfbe628247fc73d9a0963b7e9b92b07854817c9/recipes/nz-holidays"; + sha256 = "0h6dnwpinm3bxir1l69ggf483gjfglpi46z3ffiac3yl3h00j5m6"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/nz-holidays"; + license = lib.licenses.free; + }; + }) {}; o-blog = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -68644,6 +69439,34 @@ license = lib.licenses.free; }; }) {}; + ob-ammonite = callPackage ({ ammonite-term-repl + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , xterm-color }: + melpaBuild { + pname = "ob-ammonite"; + ename = "ob-ammonite"; + version = "20190218.2351"; + src = fetchFromGitHub { + owner = "zwild"; + repo = "ob-ammonite"; + rev = "c9832401f0f782aa5ca73c289c5aaa93076d77a6"; + sha256 = "1igy3c239gaxcby6ap2hhfk0kdh3g1mkfx8hh5f2c46ncv4zrhf0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/508358506a6994baf120be2acba86762f5727c6c/recipes/ob-ammonite"; + sha256 = "0wr7p3sfn9m8vz87lzas943zcm8vkzgfki9pbs3rh3fxvdc197lb"; + name = "recipe"; + }; + packageRequires = [ ammonite-term-repl s xterm-color ]; + meta = { + homepage = "https://melpa.org/#/ob-ammonite"; + license = lib.licenses.free; + }; + }) {}; ob-applescript = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -68680,12 +69503,12 @@ melpaBuild { pname = "ob-async"; ename = "ob-async"; - version = "20180816.853"; + version = "20190219.2310"; src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "2470490e6efb3f8efde1702f7986f6e31cc1ab6c"; - sha256 = "0p1m5bg9nv0pxlg880v6i12j1hiviw53rwn8yi0qgdi00vccszkk"; + rev = "73e57a9297849bb50336799ae7858777b6b386ee"; + sha256 = "1g2agc6qwklg5cxfgm28fc5swlw54sn66lqk7q0hjn1gdq9rdqdm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; @@ -68707,11 +69530,11 @@ melpaBuild { pname = "ob-axiom"; ename = "ob-axiom"; - version = "20171103.1548"; + version = "20190223.431"; src = fetchgit { url = "https://bitbucket.org/pdo/axiom-environment"; - rev = "38cea35e98997e0baf25ab6a1d70ac6daa83a73a"; - sha256 = "1g1br2va3qz4r0pxmg4254vyscwal6kl2vh0nzlgjpck7x19id5i"; + rev = "3fde83f160e785fe4647ddb849df3cc64b23d27c"; + sha256 = "0n102k1zch706kls2s196fcc84pjsc0mnhasb5vi27bhk229x8q5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/ob-axiom"; @@ -68782,12 +69605,12 @@ melpaBuild { pname = "ob-cfengine3"; ename = "ob-cfengine3"; - version = "20180102.1012"; + version = "20190329.1503"; src = fetchFromGitHub { owner = "nickanderson"; repo = "ob-cfengine3"; - rev = "2d15491e91ba84f5242610fdffafe31d4d68dc4a"; - sha256 = "1fp9ll4kp3qjyj0ai1fygrwzja7yblq7si8h7hsgwfmcr261d15v"; + rev = "96e74940351894512dca89cff473c46e74458587"; + sha256 = "04kdg0dwbzdr4pr7y55iiax9ba0y0is8prgn98y9gj9d383r2mif"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3"; @@ -69095,12 +69918,12 @@ melpaBuild { pname = "ob-go"; ename = "ob-go"; - version = "20181107.1141"; + version = "20190201.1240"; src = fetchFromGitHub { owner = "pope"; repo = "ob-go"; - rev = "237aded7aeb236573514fb26f23129852fd3c206"; - sha256 = "15a3m8hsnyarbpasv4hrzla7pfdfcarjwxdji52q1hb79r61nbs6"; + rev = "2067ed55f4c1d33a43cb3f6948609d240a8915f5"; + sha256 = "069w9dymiv97cvlpzabf193nyw174r38lz5j11x23x956ladvpbw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go"; @@ -69308,12 +70131,12 @@ melpaBuild { pname = "ob-ml-marklogic"; ename = "ob-ml-marklogic"; - version = "20170622.1133"; + version = "20190311.2023"; src = fetchFromGitHub { owner = "ndw"; repo = "ob-ml-marklogic"; - rev = "f678af0f440b3030e311ed6fbc444200be04da91"; - sha256 = "1fszg6bn927bi1dx4zgiq0wr7zxrjv8sjrwgn9mansbljszbmccm"; + rev = "adc16f6e4d056245fc8dc680383297e1c11d1e78"; + sha256 = "1kwazr0kixr64jggrh7gs172qcprz7ifg1zdm4cf0947nsspjnc1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic"; @@ -69516,12 +70339,12 @@ melpaBuild { pname = "ob-sql-mode"; ename = "ob-sql-mode"; - version = "20180426.1211"; + version = "20190212.1255"; src = fetchFromGitHub { owner = "nikclayton"; repo = "ob-sql-mode"; - rev = "8d36d312bec4a742bec8890373948a888cac18de"; - sha256 = "1q69acl5lrnac14r8mddvdphvfl4wphqilfgm8l2f5nzhi9cmn02"; + rev = "49dac3b64f9eaebe9d406e398f95a40b2993e6d0"; + sha256 = "0js5ygc43qi83jzfcri2nv71ii4q7a9yc1m4q34iyn0zli70r4gh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-sql-mode"; @@ -69752,12 +70575,12 @@ melpaBuild { pname = "objed"; ename = "objed"; - version = "20181229.1022"; + version = "20190407.1014"; src = fetchFromGitHub { owner = "clemera"; repo = "objed"; - rev = "d826c0f4969733e4f5275f564872e23b9a55f125"; - sha256 = "1j679h2sq0licmb2mjim1cb3kp9gdcmxl75flfsy29ng64w5yyqz"; + rev = "5aa473d7c276f1ed5956e51b7f7df4e35d0ec895"; + sha256 = "00gmssf91gp76b5rl0glggfwpilld7hg7w2fy6binvgjbn8ncr46"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4abc6d927a2bf238d23256adcc9f09a751c90374/recipes/objed"; @@ -70005,12 +70828,12 @@ melpaBuild { pname = "octopress"; ename = "octopress"; - version = "20181009.1651"; + version = "20190122.1707"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "octopress.el"; - rev = "d4d16f52278b14a271131a11e9cc0a94316de10e"; - sha256 = "1b69ssf4kjwjdmibrw0f7bpqx2703lz6p25n6mqr68z86c19gr0x"; + rev = "f2c92d5420f14fc9167c7de1873836510e652de2"; + sha256 = "0s5sv685h350zky46fr95bs1w814g8ksjndxwmgarldklxilsyji"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress"; @@ -70023,6 +70846,33 @@ license = lib.licenses.free; }; }) {}; + oer-reveal = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , org-re-reveal }: + melpaBuild { + pname = "oer-reveal"; + ename = "oer-reveal"; + version = "20190407.1005"; + src = fetchFromGitLab { + owner = "oer"; + repo = "oer-reveal"; + rev = "a42da802360d3dd90711e353ea83ac4c74f8bbc7"; + sha256 = "0yw9dnz33p8v6084fa2w3cvlcjpi5gi86aphpzfza42cxbc3wwss"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5982e377cd4cc2e72bfe4650c473c9f6b71085e3/recipes/oer-reveal"; + sha256 = "1j43in64p0janfr48v2llh888c337cv66yl6xswidnqysndfg6pg"; + name = "recipe"; + }; + packageRequires = [ emacs org-re-reveal ]; + meta = { + homepage = "https://melpa.org/#/oer-reveal"; + license = lib.licenses.free; + }; + }) {}; offlineimap = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -70108,12 +70958,12 @@ melpaBuild { pname = "olivetti"; ename = "olivetti"; - version = "20180531.37"; + version = "20190330.933"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "02272654f1d920ea2da5a4b553acd5e5cc096ab1"; - sha256 = "0f7i2f42mlr27d9wa9h2zvz0k0xyqvwndzgz81x8gsm0w1iv15k9"; + rev = "cb22f8ab14b7a7ad3b3650b0e36a1b61d1253950"; + sha256 = "149zf7cbd8jzj4a4rpi2vbg0z90zqsdiizb1yy579phg3v2s4b69"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -70331,12 +71181,12 @@ melpaBuild { pname = "omnisharp"; ename = "omnisharp"; - version = "20181205.1621"; + version = "20190227.2222"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "ec73a732c3bc903af33fe6ebc31d893ba45dd42c"; - sha256 = "0j2zgn81110lqd440fw2y4z9758l3hzkky1h0z0zxz69qhc2d4p8"; + rev = "be97227714bc14b625c5cbf6eaa9a2a74c940631"; + sha256 = "1b3zpckbhpada02yq6lzag8b1ayaw4py4i3rvq2lz5qbjpchhv5k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -70774,6 +71624,33 @@ license = lib.licenses.free; }; }) {}; + ordinal = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ordinal"; + ename = "ordinal"; + version = "20190104.621"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "ordinal.el"; + rev = "bfad160d7c4b6faecfe5ac986bb4858cf7149b59"; + sha256 = "1zmsac4jg3yvr3n7pkz8fhpgw9b6lqm9zcq3xh8zmb1x4ckf33z8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ea3dd6fe4cacc229dd1371cb66dd1cfd07321bf4/recipes/ordinal"; + sha256 = "19s27mv7kqcg9qxa844al7q1hk0qbiqh93g1n54r3b6s980dlgcv"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/ordinal"; + license = lib.licenses.free; + }; + }) {}; org-ac = callPackage ({ auto-complete-pcmp , fetchFromGitHub , fetchurl @@ -70967,12 +71844,12 @@ melpaBuild { pname = "org-board"; ename = "org-board"; - version = "20181124.802"; + version = "20190203.624"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "0ac7654e0dbab78dbc9897f8034ab349b4a4e1a7"; - sha256 = "18zgnwmv2b90v5p4cbj1krdc8vd7j5z1bcazl693sfx2hrs7j8r6"; + rev = "4fe9c9d67b5649c317df32fb027d5b61c37c15f3"; + sha256 = "1crr5rag71sgzddpmrxiqkal5csc19bkbfrsqrq3a7r1d91bb7y5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -71021,12 +71898,12 @@ melpaBuild { pname = "org-brain"; ename = "org-brain"; - version = "20181227.1604"; + version = "20190305.616"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "9a3b4dd8c3a7122d4db98c189d55519da82b3706"; - sha256 = "03fmimbbnz7jsk8yd8zj813r3mw1hv47i5m17qbbllzvb21zyp9b"; + rev = "62cf65d3586cfeecb6339adcacc0515a36bbcc63"; + sha256 = "0vjq1nnk5qq0362ccp367sxj1qwz0ahmb4qkfcz92fkpzhxch2v9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -71152,12 +72029,12 @@ melpaBuild { pname = "org-chef"; ename = "org-chef"; - version = "20181202.1421"; + version = "20190320.1617"; src = fetchFromGitHub { owner = "Chobbes"; repo = "org-chef"; - rev = "b55908c8a56bbb031ae88970db9ea64082f58870"; - sha256 = "0faamn0ngnpaz4xci5xympxr7g2w2gfnb066mikp5idigw24nlvi"; + rev = "22fc63ca946a3e684c4298e0482cec9acb1af0fb"; + sha256 = "1fnlazvj2fhhiv33b5f43d5h32c4n1sz7kav6g5gnb90sb6qnzly"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23b9e64887a290fca7c7ab2718f627f8d728575f/recipes/org-chef"; @@ -71206,12 +72083,12 @@ melpaBuild { pname = "org-clock-convenience"; ename = "org-clock-convenience"; - version = "20160830.1156"; + version = "20190130.810"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-clock-convenience"; - rev = "d4f98e95d75d78822ddfab6b67bc971516f9773c"; - sha256 = "0s69jqadrgsmlv74386i900gr6xr3kgr5x1n75gqf4rsdmhx4s5d"; + rev = "7d14699a15ad6c5b9a63246a11188c77f8800e94"; + sha256 = "05r6jgh8ys4ihpns7g64n4zbnvyy5fvndf9v7zinq2nk6grb393q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ed929181cdd28886ca598a0c387a31d239b2e/recipes/org-clock-convenience"; @@ -71381,6 +72258,34 @@ license = lib.licenses.free; }; }) {}; + org-d20 = callPackage ({ dash + , emacs + , fetchgit + , fetchurl + , lib + , melpaBuild + , s + , seq }: + melpaBuild { + pname = "org-d20"; + ename = "org-d20"; + version = "20190120.1417"; + src = fetchgit { + url = "https://git.spwhitton.name/org-d20"; + rev = "0154efc1f20fca5c1c0bedd59920512d0f72b7a1"; + sha256 = "0rapd9rwazpb1fpzp93b0may9qyhf6drx9vqqb1pvigav3j892hi"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/98bf91038196dfb59c491c9ed96c6b6a0cb311a9/recipes/org-d20"; + sha256 = "158n900ifb1mfckd0gjmb9gpzibh8a2x56flbn2r035gcdbb7wc5"; + name = "recipe"; + }; + packageRequires = [ dash emacs s seq ]; + meta = { + homepage = "https://melpa.org/#/org-d20"; + license = lib.licenses.free; + }; + }) {}; org-dashboard = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -71441,12 +72346,12 @@ melpaBuild { pname = "org-dotemacs"; ename = "org-dotemacs"; - version = "20181121.2045"; + version = "20190116.1355"; src = fetchFromGitHub { owner = "vapniks"; repo = "org-dotemacs"; - rev = "c0a5c0c51b1612828dde9aec419ae1d9a2852bf3"; - sha256 = "1rr1z6h010k067j3qgxw1wbxwa2ac4j9lrl584cxghyzi90jjl6p"; + rev = "5f504f36af6bcb9dbe9869c7ed54851d3db742e7"; + sha256 = "0pxphad9qxssqxr50g0mf20b7247xjp9a6fmb494bj8yv6wnn9m9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1847184312c8c95e7e81e5b3b73e5621cc2509/recipes/org-dotemacs"; @@ -71467,12 +72372,12 @@ melpaBuild { pname = "org-download"; ename = "org-download"; - version = "20180925.828"; + version = "20190404.605"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "07b98eb4f7252e3f64a306c09dfb618be6ac181d"; - sha256 = "1k1i6h0g00qa6bdiscx6k0b6xcwrijfmnhx4pz8pg8sjy5a3yp6k"; + rev = "055c92e56ac156dddd3185fd7d088d8b5a27e7d2"; + sha256 = "1xfl6jyrw023filx0xj8gdmfkz7fx3r51l4gpxw9ca8b88yljxlf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -71768,12 +72673,12 @@ melpaBuild { pname = "org-gcal"; ename = "org-gcal"; - version = "20181208.1120"; + version = "20190401.1041"; src = fetchFromGitHub { owner = "kidd"; repo = "org-gcal.el"; - rev = "7250742f3aef99611a792046f0a03bb1e053775c"; - sha256 = "18j671361li92zqij28nvyyisy10rr8kfikip8q0n46q7l9f5mx4"; + rev = "3874040bd86050db60b982bb62acafb69b6a4d9b"; + sha256 = "1dffrws0rvxvsg9jqjx239zxssd6sskqv3x58mm5vvhna423cm67"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d97c701819ea8deaa8a9664db1f391200ee52c4f/recipes/org-gcal"; @@ -71873,12 +72778,12 @@ melpaBuild { pname = "org-index"; ename = "org-index"; - version = "20181210.644"; + version = "20190330.35"; src = fetchFromGitHub { owner = "marcIhm"; repo = "org-index"; - rev = "5ee01abdf4386e74ffed0743290eb3f6be794f76"; - sha256 = "0638sx2vlsrdip5gr7mi2860bvpb743660hq1cz7ifkf77jbah68"; + rev = "4b6f5f743bcdba14e2c2fd71a32caa21b11ef739"; + sha256 = "08a9wj77bhi6y19xnvibcz7x5wbg8ismfppzxz45kmydniwzpli9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/org-index"; @@ -71957,12 +72862,12 @@ melpaBuild { pname = "org-journal"; ename = "org-journal"; - version = "20181114.2314"; + version = "20190329.1315"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "3ae2e7d7e372dee08143282a9137bf4dfc946645"; - sha256 = "1sqn68l1rlyypz3839hghrpwzcdxvqwr50dbfad5827garflg3m4"; + rev = "bca2c39c692f7c58dbbe03698748187f87822043"; + sha256 = "1zlbi1d4kny0sf9g4drqk1q4zdm91l2xmlvzz360nwm8ha88nx29"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -71975,34 +72880,89 @@ license = lib.licenses.free; }; }) {}; + org-journal-list = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-journal-list"; + ename = "org-journal-list"; + version = "20190221.1252"; + src = fetchFromGitHub { + owner = "huytd"; + repo = "org-journal-list"; + rev = "2b26d00181bb49bff64b31ad020490acd1b6ae02"; + sha256 = "0bcj9b7c4pyyvxlgnysl5lhs9ndp60xwizd85zrkd2mh2m8sbq9v"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7c0186e507b6b309a35abb076988da740cee8f84/recipes/org-journal-list"; + sha256 = "1aw6pf747n3z00xg8viakckm0bb6m9hnrkxphhhsfvqqgwfpzkb9"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-journal-list"; + license = lib.licenses.free; + }; + }) {}; org-kanban = callPackage ({ dash , emacs , fetchFromGitHub , fetchurl , lib , melpaBuild - , org }: + , org + , s }: melpaBuild { pname = "org-kanban"; ename = "org-kanban"; - version = "20181222.618"; + version = "20190323.944"; src = fetchFromGitHub { owner = "gizmomogwai"; repo = "org-kanban"; - rev = "a1994228c669ba23f20310d03d2dc58a2a3be6e6"; - sha256 = "0c6w9zh0l7x8gmmw64daswh1a8r23d0hzdz9piy1xz850xhkvp0f"; + rev = "03387a779167c4acbc04d4970cd33c52a2ca0bcd"; + sha256 = "0arjx1a7skdlmagyy0bbxwc134dn951y99yv4jg6l64j1f31y0yg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41"; name = "recipe"; }; - packageRequires = [ dash emacs org ]; + packageRequires = [ dash emacs org s ]; meta = { homepage = "https://melpa.org/#/org-kanban"; license = lib.licenses.free; }; }) {}; + org-kindle = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , seq }: + melpaBuild { + pname = "org-kindle"; + ename = "org-kindle"; + version = "20190314.2139"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "org-kindle"; + rev = "612a2894bbbff8a6cf54709d591fee86005755de"; + sha256 = "1h3pbjiy5v8lp3p6dry4jk3pvdp7hpkc517d3w9ldhz6nmaiccgg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/29d08205620d51d4d76e3a4a6124884b5a6b9db7/recipes/org-kindle"; + sha256 = "17sxvyh3z5pn2353iz2v6xjxp98yxwd4n7wkqsa9nwihsw5mmrrw"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs seq ]; + meta = { + homepage = "https://melpa.org/#/org-kindle"; + license = lib.licenses.free; + }; + }) {}; org-link-minor-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -72121,12 +73081,12 @@ melpaBuild { pname = "org-make-toc"; ename = "org-make-toc"; - version = "20181216.305"; + version = "20190103.2112"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-make-toc"; - rev = "592fdc30f54775c0fc8c2a503305f71f95765b3e"; - sha256 = "175q6yvikarpasyva23i7asq4aiv0cygvc35bkg66sks3dq0fwl5"; + rev = "9adeaf9da23fd3f7600821526f7e41f4ed17dd4a"; + sha256 = "122fvv6waq70qcccgwnmyfmci48k8zc7vzmagadypmw8grgdjdx2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df87749128bcfd27ca93a65084a2e88cd9ed5c3f/recipes/org-make-toc"; @@ -72148,12 +73108,12 @@ melpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "20181023.1614"; + version = "20190402.321"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "1e792ef0616069b3ec74a4b7d96fced8c9c6eb8a"; - sha256 = "182ifw3rdblmk6hrrybmz7g6dm9k4kxnqg89drmicfy0qvn4h059"; + rev = "0db41d5b4e9ef9df640e7212a22708ce636b3986"; + sha256 = "0lcn69vzx5987yz4byxvnk8z7nc2bbww7my6v0hxqkra9xh0iqlm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -72339,12 +73299,12 @@ melpaBuild { pname = "org-noter"; ename = "org-noter"; - version = "20181106.1541"; + version = "20190307.926"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "8e5d8eacffe251a4b6ab55f6cb36e0830f5fe8dc"; - sha256 = "0pz1rxfvbvdgv6nqgx5cdk858wqqrir11mxacqh6fs87yvbp1y33"; + rev = "f6f7a8d3af1c3e7e26173b245ba4a95e3cf03074"; + sha256 = "092d8icw5pny685yqkm0c5bx6d7axgh6rcvnc3yri84dlbdzpfbv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -72519,11 +73479,11 @@ melpaBuild { pname = "org-parser"; ename = "org-parser"; - version = "20171002.2136"; + version = "20190206.2121"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "105050acee08"; - sha256 = "1y1ikk950awxhvx4d930ymqa8ds6a0wlywzx09jvrnkvbisd4l63"; + rev = "8610aef8dc87"; + sha256 = "0vqh37y2b0dc8p9c04ici1h9n9ghd1jizcr1c2zvp75cyqsz09wv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; @@ -72590,6 +73550,36 @@ license = lib.licenses.free; }; }) {}; + org-pivotal = callPackage ({ a + , dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { + pname = "org-pivotal"; + ename = "org-pivotal"; + version = "20181216.636"; + src = fetchFromGitHub { + owner = "org-pivotal"; + repo = "org-pivotal"; + rev = "d18e91a9f4480b0b25c1b6283ff6522e15276d62"; + sha256 = "1f1n461h8wa7rx3z728dws0sfkgdvww3jjwq120q0dfyjibcfjri"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1257d38bbd3a9944135b000e962f30ab28f5464/recipes/org-pivotal"; + sha256 = "1gv4968akh2wx92d7q1i1mpl9ndygkq8ssdwg6cf19wp8mk18088"; + name = "recipe"; + }; + packageRequires = [ a dash dash-functional emacs request ]; + meta = { + homepage = "https://melpa.org/#/org-pivotal"; + license = lib.licenses.free; + }; + }) {}; org-pomodoro = callPackage ({ alert , cl-lib ? null , fetchFromGitHub @@ -72671,6 +73661,32 @@ license = lib.licenses.free; }; }) {}; + org-pretty-tags = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-pretty-tags"; + ename = "org-pretty-tags"; + version = "20190327.1447"; + src = fetchFromGitLab { + owner = "marcowahl"; + repo = "org-pretty-tags"; + rev = "6ac9c35e489dbe3a2e9c3101b49d8b0ea77cad23"; + sha256 = "0scar1938xlr8c3zsbfw5z8mzrrr3255qisl9rjyh4kw80vai8bs"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9ad60399420764d4ef5d6acddae9241205937e78/recipes/org-pretty-tags"; + sha256 = "19cxfjl6c0yhsc7kfjd6imckcvzdsaws3yd1s3nazhnkm3kan3h4"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-pretty-tags"; + license = lib.licenses.free; + }; + }) {}; org-preview-html = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -72710,12 +73726,12 @@ melpaBuild { pname = "org-projectile"; ename = "org-projectile"; - version = "20180531.1942"; + version = "20190130.639"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "e57023c0e33e4a0f848fcfec1902e13e6a92f711"; - sha256 = "03svxxx6jh0c5517yvp7g5lfvjn3n4r169j589iii0fcjp4qri3n"; + rev = "0291ef425c96d02d634fc7e199146d7c3da0455b"; + sha256 = "0ljpvykz9s92j9ixkxbwxj5lw0prslmq3ipw0plgzzz3rvf4j75a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -72818,12 +73834,12 @@ melpaBuild { pname = "org-random-todo"; ename = "org-random-todo"; - version = "20180312.104"; + version = "20190214.1257"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "8357350a66bbc4e0e5cb590acc104d39870cf736"; - sha256 = "1cl1abgflbnnmvakb1z69rpr2gsm3hyg20iggwl6pn2fl0pf5wf5"; + rev = "4f7677af740e8f3f7cfaf630ae2e594a125af760"; + sha256 = "1xk4vp2138p58jdxn51vnmpnij5bzc2jbpq7y8avdcv0p7618fdc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -72841,28 +73857,85 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , org }: melpaBuild { pname = "org-randomnote"; ename = "org-randomnote"; - version = "20171210.557"; + version = "20190403.933"; src = fetchFromGitHub { owner = "mwfogleman"; repo = "org-randomnote"; - rev = "c544202d6cba1c1618ed39b2a45fa0ffc5f83e60"; - sha256 = "1ny7qq3av43kbzd9q2rsqi04sg7n9snaqss3nazr80mpswx906dx"; + rev = "f35a9d948751ad409aa057bfb68f1d008fdf9442"; + sha256 = "01nf3h5sg74lph1hjj7q77pxn6xxv4zq9cjnd97a7bfbpilq86a0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d92cb392b23701948176ba12516df5ae6608e950/recipes/org-randomnote"; sha256 = "06i42ig7icap1i1mqzv5cqwhnmsrzpjmjbjjn49nv26ljr3mjw0b"; name = "recipe"; }; - packageRequires = [ dash f ]; + packageRequires = [ dash f org ]; meta = { homepage = "https://melpa.org/#/org-randomnote"; license = lib.licenses.free; }; }) {}; + org-re-reveal = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , htmlize + , lib + , melpaBuild + , org }: + melpaBuild { + pname = "org-re-reveal"; + ename = "org-re-reveal"; + version = "20190405.959"; + src = fetchFromGitLab { + owner = "oer"; + repo = "org-re-reveal"; + rev = "871b37110dfc806b9183ec9c9550942bba190d0f"; + sha256 = "1f1n2lbql1ik69b4bqwm0y9hpgf4glbk6k7jcd0xd62fq8x1yigc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3e6c90a6b9004fbf0fbc08556f8effbcde8b468/recipes/org-re-reveal"; + sha256 = "05p8iml0fapi4yf7ky45kf7m0ksz917lxg7c4pdd9hjkjmz29xn9"; + name = "recipe"; + }; + packageRequires = [ emacs htmlize org ]; + meta = { + homepage = "https://melpa.org/#/org-re-reveal"; + license = lib.licenses.free; + }; + }) {}; + org-re-reveal-ref = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , org-re-reveal + , org-ref }: + melpaBuild { + pname = "org-re-reveal-ref"; + ename = "org-re-reveal-ref"; + version = "20190301.704"; + src = fetchFromGitLab { + owner = "oer"; + repo = "org-re-reveal-ref"; + rev = "7b13e1ab54eecebd92e73bf52a0d504816e5702d"; + sha256 = "0na74q70zn8zh22vc7r3d7r8pnv2610pg28chdvbrn92l0m8i1fw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/391ef29288507aa2b0ad5d568419b66e5a883b2f/recipes/org-re-reveal-ref"; + sha256 = "0dd5b4g8ih98ma25jwlvdwgfadc75qcxr9zm74x5r6pr87amcb7n"; + name = "recipe"; + }; + packageRequires = [ emacs org-re-reveal org-ref ]; + meta = { + homepage = "https://melpa.org/#/org-re-reveal-ref"; + license = lib.licenses.free; + }; + }) {}; org-readme = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -72928,6 +74001,33 @@ license = lib.licenses.free; }; }) {}; + org-recur = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { + pname = "org-recur"; + ename = "org-recur"; + version = "20190304.235"; + src = fetchFromGitHub { + owner = "m-cat"; + repo = "org-recur"; + rev = "28abdfcfdbcda36702ce568ccd8a5f3e40797d16"; + sha256 = "0gk54251dh73srgxcfqq49q2daf5mp63lzl9c876wcixk5g6qmj6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cbdf8c9a3c7c289ce13542a12769a7f3d7f53d72/recipes/org-recur"; + sha256 = "0qlpwia2dg4l00jahc3si0mi27gv6zlvkbdx0rq37dh61dabgkiq"; + name = "recipe"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-recur"; + license = lib.licenses.free; + }; + }) {}; org-redmine = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -72971,12 +74071,12 @@ melpaBuild { pname = "org-ref"; ename = "org-ref"; - version = "20190102.1046"; + version = "20190318.858"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "a1e2fc2326a376aeef0c0ce7e2aa99d8950f75cb"; - sha256 = "0bc1iq18lv18a280ia053s4ajykj2n5jghxdkihb0352gzzs6clx"; + rev = "e73bcc5bc07555f5eed4b63d14e4f209bb877c20"; + sha256 = "17ijwzmzclp0gfscy42ir2j997l34smf868j1f6kr00snyagzjxk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -73026,6 +74126,33 @@ license = lib.licenses.free; }; }) {}; + org-reverse-datetree = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-reverse-datetree"; + ename = "org-reverse-datetree"; + version = "20190404.2002"; + src = fetchFromGitHub { + owner = "akirak"; + repo = "org-reverse-datetree"; + rev = "99e7ae3d0860dfe0f4d647ceb045f8b00bf1fe77"; + sha256 = "1ji8c2480ib48n1lq4ypgq524slgzfszpxwsv1q2wyqnjzbc2csv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a08612af18bb620955f7b5450eba3f44cdb60673/recipes/org-reverse-datetree"; + sha256 = "0fiwba8hh9617d1zqvxxz2l8p2iq56lkv5c16q7prc69m0s5zhjb"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-reverse-datetree"; + license = lib.licenses.free; + }; + }) {}; org-review = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -73130,34 +74257,6 @@ license = lib.licenses.free; }; }) {}; - org-send-ebook = callPackage ({ cl-lib ? null - , emacs - , fetchFromGitHub - , fetchurl - , lib - , melpaBuild - , seq }: - melpaBuild { - pname = "org-send-ebook"; - ename = "org-send-ebook"; - version = "20181016.100"; - src = fetchFromGitHub { - owner = "stardiviner"; - repo = "org-send-ebook"; - rev = "b4913a709f9206115c3e3ea73e217029cc0fb3de"; - sha256 = "13bivxqgi5z7iyzw37zl168x8iip6g0yhbl5yywkdfj51z81alr7"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook"; - sha256 = "0gvnrl4rfqn3zd0wmj4bhd63zkjk68lwwcgmsqrfw7af22wlfv3d"; - name = "recipe"; - }; - packageRequires = [ cl-lib emacs seq ]; - meta = { - homepage = "https://melpa.org/#/org-send-ebook"; - license = lib.licenses.free; - }; - }) {}; org-snooze = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -73184,6 +74283,33 @@ license = lib.licenses.free; }; }) {}; + org-sql = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-sql"; + ename = "org-sql"; + version = "20190402.2035"; + src = fetchFromGitHub { + owner = "ndwarshuis"; + repo = "org-sql"; + rev = "3793b270d5cd5ec047d7a32f2b34033592ffddf9"; + sha256 = "0hlp4qdpdh5a1jnj8mas8vnmfd5j7g6vkyczblgi2f5vvfvls0v6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/012573a35a302e9bb6f127cf28ac04f93796400e/recipes/org-sql"; + sha256 = "15alnx74pmr6jc2yx2c1dbpk0fbdzil8bffj7cfj7ywj2xadmzpg"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/org-sql"; + license = lib.licenses.free; + }; + }) {}; org-starter = callPackage ({ dash , dash-functional , emacs @@ -73194,12 +74320,12 @@ melpaBuild { pname = "org-starter"; ename = "org-starter"; - version = "20180917.505"; + version = "20190406.314"; src = fetchFromGitHub { owner = "akirak"; repo = "org-starter"; - rev = "a1274f901366a39c2eeeaa36644c0bdd9837374b"; - sha256 = "157h9z8wxbbqlil7ka7awnqhk9d9qa7qnsc17vza7m8v4c9bsz54"; + rev = "4fa28564cab2acfde56ca815882caa9e715c848a"; + sha256 = "1vjv2y3g02v5sg88z0kqig3jn0ryvck9s2syzdjpfsxp2jwbsw7a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bdd9c835184ef1a6fabfaf7adb56a51514b75ea/recipes/org-starter"; @@ -73220,12 +74346,12 @@ melpaBuild { pname = "org-static-blog"; ename = "org-static-blog"; - version = "20180527.2348"; + version = "20190403.526"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-static-blog"; - rev = "f69d2fd6671fb250fbd87df5efa898a7bf5b9bda"; - sha256 = "1h9c96rbxxk1jypib5f9pfi5zkimkvhxi61j0sps6r39435dd3w7"; + rev = "0269bbaa6de78a3fce8d926f54bb6e7b975f9c3a"; + sha256 = "1f1v73x58fd80hwm0pfmjp4fijcx2y6zvcpas1ys3sjl2230z8s5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; @@ -73247,12 +74373,12 @@ melpaBuild { pname = "org-sticky-header"; ename = "org-sticky-header"; - version = "20170422.2135"; + version = "20190406.1613"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-sticky-header"; - rev = "a435bffa3d155bdc2ad536f4da869f884e38773e"; - sha256 = "1gq0xcb1824kgjcfy868sf0a6xv4qmnzl4pmv8zlp8jb5d1ghlic"; + rev = "2847035ec559a46bd7b555f220f819c88371d538"; + sha256 = "0g6hdg11jzzpw7h0f6p795l5aj6pag2nhhfbx90cg28j61d28vwh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9a600bd156eb766ba5ce37e16f3e8253f37ee8/recipes/org-sticky-header"; @@ -73277,12 +74403,12 @@ melpaBuild { pname = "org-super-agenda"; ename = "org-super-agenda"; - version = "20181218.427"; + version = "20190314.2321"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-super-agenda"; - rev = "4cd4a36cd0cabcf4ba4c6c11fff8ef879a5cd016"; - sha256 = "089y20zi5jy92zx66b4wkcfqpb3py5yn2lvfdmsmnlkg49h6sika"; + rev = "eaad1198590de9346ccf374ae835c76667e5c653"; + sha256 = "03grvmqrpnpw47pbanr6cs3h8bygijwf0bin7j1q622fi16x3bx6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda"; @@ -73333,12 +74459,12 @@ melpaBuild { pname = "org-sync-snippets"; ename = "org-sync-snippets"; - version = "20170824.1128"; + version = "20190318.1044"; src = fetchFromGitHub { owner = "abrochard"; repo = "org-sync-snippets"; - rev = "0f264a032d371d7dbb4a7cbaf0ea2f91b5a629ca"; - sha256 = "0j680cla1zlxkwnslxwnxd5h6v1vvwr9byi1aawm9gxvz11x7vsj"; + rev = "50cefe5a37196ed1af3d330d6871c3b37fa90d41"; + sha256 = "13d1adymxn3b579syyaszgg98h3kh3hwn97pdfzghfli1cd9fb9y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets"; @@ -73493,12 +74619,12 @@ melpaBuild { pname = "org-timeline"; ename = "org-timeline"; - version = "20190103.401"; + version = "20190213.1106"; src = fetchFromGitHub { owner = "Fuco1"; repo = "org-timeline"; - rev = "46246d612a184f6debe343c5011546ca8153ba4f"; - sha256 = "0bg1llfrq8q3p14f7hwzvnw46kqk30n3j53n3qsfw7ljmiq552c4"; + rev = "aed995c1db6c8bfd9db0a75a978f5e261aab38e5"; + sha256 = "1jz44lag1j4rawqjpcgb9zrs88vfi7vjgdh756hs2ln7i1cnvgh5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/298bd714f6cefd83d594b0eea731a01fb2faf1ad/recipes/org-timeline"; @@ -73630,12 +74756,12 @@ melpaBuild { pname = "org-trello"; ename = "org-trello"; - version = "20180330.2331"; + version = "20190304.100"; src = fetchFromGitHub { owner = "org-trello"; repo = "org-trello"; - rev = "e2e8a3d45057645e4caae7d46a79d2d9be2894bd"; - sha256 = "12yw54hg1lhfxw6mvxjsvbiv7cg1zwm3ccsl7g127vbf0yp2dhrl"; + rev = "f02e92f5d7be03289f774875fc4e6877fe7b1aaa"; + sha256 = "0c0f6wf7d86nq3kwvjr429ddxz3q3aylm2apahw19hxx212vipb3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello"; @@ -73656,12 +74782,12 @@ melpaBuild { pname = "org-variable-pitch"; ename = "org-variable-pitch"; - version = "20181206.651"; + version = "20190128.1251"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "d5a1038b4b2820c2bdfeba577300732b9780f5d0"; - sha256 = "0gr0spsmhm17fml045zim0g3yxmrhnmlz28is3v16bina4azwqg1"; + rev = "05bd1d5db68df144bc7552a460371d94a2cb5b3c"; + sha256 = "0v3swpbhi27nlwcav3iwanckqzirjvz6gl49if8kskmp8pdvy5fs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9632b7e98772b584d6420f8d0f9652d67118e05e/recipes/org-variable-pitch"; @@ -73737,12 +74863,12 @@ melpaBuild { pname = "org-web-tools"; ename = "org-web-tools"; - version = "20181230.2323"; + version = "20190115.952"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-web-tools"; - rev = "fe9e4ce4896eee757fe4a2b6116d47fb3c7f1012"; - sha256 = "1p1nic5i2z1ryr6c45lv2sgyzx80arib3723hzl0g9cp46fi9dbm"; + rev = "d98fe92f71705662a9c56ad01f04ddf23ac7cb19"; + sha256 = "0igninqrb9l54g0fqfcp9h30k5xgc1amz522fwmx78fpr3rw258b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools"; @@ -73756,7 +74882,9 @@ }; }) {}; org-wild-notifier = callPackage ({ alert + , async , dash + , dash-functional , emacs , fetchFromGitHub , fetchurl @@ -73765,19 +74893,19 @@ melpaBuild { pname = "org-wild-notifier"; ename = "org-wild-notifier"; - version = "20181128.259"; + version = "20190312.1013"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "12fd7a4994ee386b71b7d81f621ead7face60014"; - sha256 = "0pnsz3w5h3x7si1s8fqlnnvsrwn2qnc6lr7rpfgmsvm3xqcgvrp0"; + rev = "db143f812ed65f5ab6c75d0d686b73da20300b32"; + sha256 = "17p2r8y6ihl51i6r1gh0lfxyqnsfx0098ylzx7i0fb8slffjbk2i"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; name = "recipe"; }; - packageRequires = [ alert dash emacs ]; + packageRequires = [ alert async dash dash-functional emacs ]; meta = { homepage = "https://melpa.org/#/org-wild-notifier"; license = lib.licenses.free; @@ -73817,6 +74945,7 @@ org2blog = callPackage ({ fetchFromGitHub , fetchurl , htmlize + , hydra , lib , melpaBuild , metaweblog @@ -73825,19 +74954,19 @@ melpaBuild { pname = "org2blog"; ename = "org2blog"; - version = "20171218.1911"; + version = "20190308.2042"; src = fetchFromGitHub { owner = "org2blog"; repo = "org2blog"; - rev = "04ea7e80497ab7f7bc0d097f1807d3a085074812"; - sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps"; + rev = "bd6dd6b1b3ce57a72e7c229d3f035fc7c0d3860b"; + sha256 = "0c7viqq8cxkd6xxbvq53dbp1slsjjxs2fb2lyi3njfg18v5c6fks"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/org2blog"; sha256 = "15nr6f45z0i265llf8xs87958l5hvafh518k0s7jan7x1l6w5q33"; name = "recipe"; }; - packageRequires = [ htmlize metaweblog org xml-rpc ]; + packageRequires = [ htmlize hydra metaweblog org xml-rpc ]; meta = { homepage = "https://melpa.org/#/org2blog"; license = lib.licenses.free; @@ -74032,12 +75161,12 @@ melpaBuild { pname = "organize-imports-java"; ename = "organize-imports-java"; - version = "20181228.113"; + version = "20190304.1047"; src = fetchFromGitHub { owner = "jcs090218"; repo = "organize-imports-java"; - rev = "11a4c4cceb0a787d3d8ae22dc54b55bfd59bea72"; - sha256 = "0bfp2pn9jvrpgrymg8xlpn0ccd7whsazsjzmwsdb2cs5azbrq1py"; + rev = "e201750cee13876dbea2fba8508ade1b9f76b29a"; + sha256 = "0lnsxa3aiyaww62z4y07ciwak2gxv881qraz6sl5csfjdmbycii1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad0242f941ff44b4897c94d336bc0af498582dd7/recipes/organize-imports-java"; @@ -74088,12 +75217,12 @@ melpaBuild { pname = "orgit"; ename = "orgit"; - version = "20181211.1108"; + version = "20190304.1007"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "ea79e0567ae65fc922fcb05da0f7f4af8eae1973"; - sha256 = "1ywavzki510rslsgfm0cnn3mlh644p61ha2nfb715xhkg7cd3j9g"; + rev = "2456436a7e64d26bcf455b3890a586acaa3e7f93"; + sha256 = "1i52dq2ynddb1irgigr5mdwfbfd3bvm1f29jnzd7nlc0nk186nvh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -74765,12 +75894,12 @@ melpaBuild { pname = "outshine"; ename = "outshine"; - version = "20190102.1437"; + version = "20190313.453"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outshine"; - rev = "1c3e1306a8ad20c201aac1ffabb005be86ea8c62"; - sha256 = "0dm7z4zl484vyxv2aiy8pvgkrmnxgzcp2jxixcq00f9nlv4mmb7x"; + rev = "210cc88bf9ee2fca2a283e4de89d4abe849d706b"; + sha256 = "0wi5kjsi3mbj4h64m09dgyzn67dmbxvrlib7vnc6p3qacqmzlmn9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; @@ -74817,12 +75946,12 @@ melpaBuild { pname = "overcast-theme"; ename = "overcast-theme"; - version = "20180315.1243"; + version = "20190326.946"; src = fetchFromGitHub { owner = "myTerminal"; repo = "overcast-theme"; - rev = "faafe7c19106cb4db29ba716d117fbb6ebdda3f4"; - sha256 = "1kjvx2wjb9ksdr7w0c4xnvqa4sbplj6rwlh85lbmcg8lwkb1s2sy"; + rev = "769078cb4a6ea87a31fcea0218c06e1ec689b97c"; + sha256 = "044g4y8ykh41b3ybxsgsrqvnkq8i1q8q8livh64b2qqrrjzq6mxg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme"; @@ -75058,12 +76187,12 @@ melpaBuild { pname = "ox-hugo"; ename = "ox-hugo"; - version = "20181106.1550"; + version = "20190317.2148"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "7fb284ec4b7f47ff1286598220650c5b24b56b45"; - sha256 = "159anw8vdkm4s72jih48y5nrbq9rz6ii3dja12d444hg2idiimza"; + rev = "86a6196a431df4a9f81dbd00657e20a03c622c03"; + sha256 = "098gwyrzkr8fj54jfdirc1m9rbcr2rsmi1klm0fv6hzfh8di1j93"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -75399,6 +76528,33 @@ license = lib.licenses.free; }; }) {}; + ox-rfc = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { + pname = "ox-rfc"; + ename = "ox-rfc"; + version = "20190310.2321"; + src = fetchFromGitHub { + owner = "choppsv1"; + repo = "org-rfc-export"; + rev = "b0345990036a2322609a6fa360deba079d7001fe"; + sha256 = "05962hwww6wkbd9p4svnc5ynbsgnnfryf900nr65qap41bzxfa3y"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f49159d6a379bf435e2af8920176fd84693a60/recipes/ox-rfc"; + sha256 = "0vqh923223rmhy39p4lwmdv6azba7cddkc1zi5pp3zpcijmhxzk4"; + name = "recipe"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ox-rfc"; + license = lib.licenses.free; + }; + }) {}; ox-rst = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -75768,7 +76924,8 @@ license = lib.licenses.free; }; }) {}; - pack = callPackage ({ emacs + pack = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -75776,19 +76933,19 @@ melpaBuild { pname = "pack"; ename = "pack"; - version = "20181228.2137"; + version = "20190312.249"; src = fetchFromGitHub { owner = "10sr"; repo = "pack-el"; - rev = "ef811927254b0fea170e2f2ddb94f6dd7c356dde"; - sha256 = "0bza802nzncmpnnzzrfqk4b8svbmgjnhrl28mvagi42wci19qf0x"; + rev = "6a41f8db54e0cf0e6b1219bd6745a7c09c7bd6b3"; + sha256 = "0vha9kbdak14p96m43h9qcp9fxqsbsx9lj0qj48rh8wp97nczi3s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96f55c1f15ca24134da378a1ea31f7bb31c84ea9/recipes/pack"; sha256 = "0lwdhfrpqwpqqg3yhcyj11jv2mm8k9k54qdxlhdi8sxj1fdxmanw"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/pack"; license = lib.licenses.free; @@ -75802,12 +76959,12 @@ melpaBuild { pname = "package-build"; ename = "package-build"; - version = "20181125.1820"; + version = "20190313.2140"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "12b1b0670fb6d1e1a646bd7282e8df61e878c016"; - sha256 = "0zfqn63i0bar16ifs4c8lnldrsmk85sbgs3nh1972f2xwxc2rmr5"; + rev = "d023f14b78feddf890cb7e1ded47704c9e2b0303"; + sha256 = "16zrgg2jxnsmiza448067nggbdy78xgn90cz2mcvxqnpvgkrc1kz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -75854,12 +77011,12 @@ melpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "20181228.1510"; + version = "20190307.1612"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "4c90df4919f7b96921a939b3bd88bedfd08d041e"; - sha256 = "0nhznvsl3l3v7w5x2afw0ay31r6jrdvgr1ys9mhcmd1fsk57bj2r"; + rev = "e494a1a9027e73fa07fc42236b953792ce0a32bf"; + sha256 = "0vwr1v491a0hp6dx5ipsf5zd3zmi7igd1j59wzl6njmq9miarzy1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbfb0250a58b2e31c32ff1496ed66a3c5439bd67/recipes/package-lint"; @@ -76227,16 +77384,16 @@ melpaBuild { pname = "pamparam"; ename = "pamparam"; - version = "20180415.48"; + version = "20190122.612"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "8fa25d06fb2ae6d992e738a10d8b2150e109d9bf"; - sha256 = "0p50cfmwgwahb1czqvgx2kvnd3k46zl0pybvxlyf45y4c4kr8wjp"; + rev = "3593cea568da1b479e408180a75890e53d047429"; + sha256 = "0ayvkzxwncx9gqw9j0c06fy9x2i5fs9nbc77fprxcifiz7kl3x9s"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; - sha256 = "0xwz1il9ldkfprin3rva407m4wm7c48blwfn4mgaxmqafy4p0g9f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/03de45e491e970cc5733950a825b98545b5ac24b/recipes/pamparam"; + sha256 = "01n35a3fnwbb7w2qpk8b5f9wwmr6d5jcjzcv6gnc1768a43p9yzf"; name = "recipe"; }; packageRequires = [ emacs hydra lispy worf ]; @@ -76245,6 +77402,32 @@ license = lib.licenses.free; }; }) {}; + panda = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "panda"; + ename = "panda"; + version = "20190401.2306"; + src = fetchFromGitHub { + owner = "sebasmonia"; + repo = "panda"; + rev = "a7f2045cc568a5ec8b97734abdbb8618990748ca"; + sha256 = "0a6ravwfjaf70mkkpd174y6w1hp2q18wjl5mmpa9gzyfa0c27v1q"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/69800de45dda180450ed9d47a24181b659d9d1ae/recipes/panda"; + sha256 = "04app7ni9q04v7pi1ppi5qgx5klcpawflmbsj58y33gz29di1zjk"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/panda"; + license = lib.licenses.free; + }; + }) {}; panda-theme = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -76306,12 +77489,12 @@ melpaBuild { pname = "pandoc-mode"; ename = "pandoc-mode"; - version = "20180917.21"; + version = "20190211.1312"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "d594ce399fc75eb553a6d8572713b827f744d95b"; - sha256 = "1n3rbjvaqf6gzqgqsfcn989cwhi2kva4dr9xy0vdhqxikwm5gkaq"; + rev = "d135bb5b8874f1b16c053215ecb29e22f0f79657"; + sha256 = "1gmw78vjl82xlb4ajfiaf4q6hg35xadhjcvy7kyzr0kzs1zkkk4n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -76357,12 +77540,12 @@ melpaBuild { pname = "paper-theme"; ename = "paper-theme"; - version = "20180429.1515"; + version = "20190124.1028"; src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "ffe03506694c94de0444995f973a925deccc400a"; - sha256 = "02wcvka96zdlq3myfar7dqywfil2b77bc6ydmgcphwn3as3kl08r"; + rev = "b19b37be332bada6b18d4d895edf6ce78ab420c4"; + sha256 = "0i97l8fdrjjb6dzfcqgss5yj4ibkiaxnj32sm6nyr2s7bijkvi4x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; @@ -76416,12 +77599,12 @@ melpaBuild { pname = "paradox"; ename = "paradox"; - version = "20181027.1534"; + version = "20190406.1609"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "798bdabdca6575d677631b1c482e975c9372d536"; - sha256 = "15xxfy947sgm8lcg1pghi8i0n0galzfsvvib8bfmgi4zs7dkvh0g"; + rev = "7ccf2403b5d056bd6cbf75c110420e3f5f0e8c0b"; + sha256 = "1vq1qj8gif2215z4zqxlkqqn9qcb1v5rpzphhrcn6lwvl20qfja0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -76621,12 +77804,12 @@ melpaBuild { pname = "parrot"; ename = "parrot"; - version = "20181026.912"; + version = "20190311.1625"; src = fetchFromGitHub { owner = "dp12"; repo = "parrot"; - rev = "e9fe686408214884b20c65284a6a595e1c755794"; - sha256 = "079k4j0lcaj0lff1llp29bj5ah2b59byw9lw3jjw9wkl9px87r0m"; + rev = "4d77eafc6bfacfe45dae805ceca101331d3d08d0"; + sha256 = "0lqcw0scn2jcs15vybd1x7k7hiykrcsvimqj58s45m2pnaia57ql"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b393ffb9b7691e8fc99bee5fc676463038a68d/recipes/parrot"; @@ -76726,12 +77909,12 @@ melpaBuild { pname = "parseclj"; ename = "parseclj"; - version = "20180602.1306"; + version = "20190327.151"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "parseclj"; - rev = "dc0d165b0a8633f5b11ed9175a6e421c52f4d314"; - sha256 = "1ra1z9xp8v4qsw00dzr3w7a9qznj2laarc3s09n1wnr8xbp6nwxk"; + rev = "dec638c5ca02deac7b83718828279c5d0b49725f"; + sha256 = "15ylphnmk4dyrympi143g08jan8na31ncdzsifjhh68kisw7xzl4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2a977779a7ee49f57b849b14e581210a7f47d61/recipes/parseclj"; @@ -76744,6 +77927,34 @@ license = lib.licenses.free; }; }) {}; + parseedn = callPackage ({ a + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , parseclj }: + melpaBuild { + pname = "parseedn"; + ename = "parseedn"; + version = "20190331.358"; + src = fetchFromGitHub { + owner = "clojure-emacs"; + repo = "parseedn"; + rev = "8f0582da3f1dbce24e93aee7ca26eefea6053f43"; + sha256 = "0lfs8pbqb30iw3zbz0f1lz4g4ryqf737vz1pf01wdf6kwy6qdrf0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/462a022a83186b8c70e888cc8df42601777504dd/recipes/parseedn"; + sha256 = "0lb0qkvsga90ysa3a1pn8ydf108lsq2azxzzm7xvxbgk0d1xzhjp"; + name = "recipe"; + }; + packageRequires = [ a emacs parseclj ]; + meta = { + homepage = "https://melpa.org/#/parseedn"; + license = lib.licenses.free; + }; + }) {}; pasp-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -76913,12 +78124,12 @@ melpaBuild { pname = "password-store"; ename = "password-store"; - version = "20181031.740"; + version = "20190405.1930"; src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "d29a389a40524c684595f51bb937f66958bc14ea"; - sha256 = "17g43i0if9nggcq6005iyxxy9my8s15ihc2nzwjgqzhy3svh5xvn"; + rev = "5c9f614cc43c963a49b695abef8cb9be3f146e85"; + sha256 = "00sllhdr9xcb30x93aqh0j8pp7gqcn57yawkkx7jb8bbdmqkimcg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -77328,12 +78539,12 @@ melpaBuild { pname = "pcmpl-args"; ename = "pcmpl-args"; - version = "20120911.2224"; + version = "20190223.813"; src = fetchFromGitHub { owner = "JonWaltman"; repo = "pcmpl-args.el"; - rev = "2ba03b3125ada8037585e545b88bd85b79da5c37"; - sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy"; + rev = "7bc360c2e5f84e2fc4024a9783c164b4df174acb"; + sha256 = "1gigcf9xh8a4478wr35smglz1csxamnjs82kqb45kbl9cndsz22s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pcmpl-args"; @@ -77378,12 +78589,12 @@ melpaBuild { pname = "pcmpl-homebrew"; ename = "pcmpl-homebrew"; - version = "20181229.616"; + version = "20190212.1918"; src = fetchFromGitHub { owner = "kaihaosw"; repo = "pcmpl-homebrew"; - rev = "ad74a52b80823f2264962bbe392701da2577ee60"; - sha256 = "03wf8js64rgwc29phmqwd9q6aahlnnjwawc5hp11gv9bdaz61mx5"; + rev = "bebc91c1a0392173f2d1ca2127da137565d79b4d"; + sha256 = "11f5xmdlym32j00rkqgwzcnawqwx5i2j7f92n3133r1f7w4gkvix"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/pcmpl-homebrew"; @@ -77538,12 +78749,12 @@ melpaBuild { pname = "pdf-tools"; ename = "pdf-tools"; - version = "20181221.1113"; + version = "20190308.2344"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "a4cd69ea1d50b8e74ea515eec95948ad87c6c732"; - sha256 = "0m9hwihj2n8vv7hmcg6ax5sjxlmsb7wgsd6wqkp01x1xb5qjqhpm"; + rev = "9a63f3909e5a331b6974deb03abd2c4bad42c2d9"; + sha256 = "11i4kbwclwyvznyd9q69fq36fjasvs72ziz0555hl3fjbbq0n71q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -77692,11 +78903,11 @@ melpaBuild { pname = "pelican-mode"; ename = "pelican-mode"; - version = "20180604.1507"; + version = "20190124.1536"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; - rev = "209ad24318e1f28675da430aa10ef3467694b9ac"; - sha256 = "1hiyl2iy2pa38bfr0z4axxmq3b79c31djyxqchx5mwzl9427dfsr"; + rev = "a69934885c7a3b303049e2418333b3915b8f8fb8"; + sha256 = "0wxmm9x07f0g31k68pfkds7m8d2jivcnc5m6a3dxfhygz20wc5n4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; @@ -77819,12 +79030,12 @@ melpaBuild { pname = "persistent-scratch"; ename = "persistent-scratch"; - version = "20180929.713"; + version = "20190128.1043"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "2e6678a837db85e68da713bbd4772c7fb88d83d4"; - sha256 = "0ipr2cnw5b26q560c82mm6bmkx9clw1mrndycs2qz894y53dzlmk"; + rev = "71371a7ce9846754276350fd577dc7543eb52878"; + sha256 = "0n638krbrs2hx97cgkb5nc0fbrd8wsbmb7mz3ym5mx5pvdyxnlgv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -78034,12 +79245,12 @@ melpaBuild { pname = "pfuture"; ename = "pfuture"; - version = "20180922.615"; + version = "20190322.52"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "c06e78b37ac3fba72ea446f11da38a6a5cba428c"; - sha256 = "0239s4n8na7jxkc51zy8lnwdcncvr0l692sy0lha7pp0a620zc2d"; + rev = "766cfb7d2df8ebc6144fb644d4d858f66657f60d"; + sha256 = "1zjkpanfxhdfq75dy5x2m541qxpcnh67d7aiijdgkb0g5v3yb61d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -78504,12 +79715,12 @@ melpaBuild { pname = "php-cs-fixer"; ename = "php-cs-fixer"; - version = "20170506.1133"; + version = "20190207.326"; src = fetchFromGitHub { owner = "OVYA"; repo = "php-cs-fixer"; - rev = "2e28b82d192c6f420ecb8cbef04256f3c9c47c4b"; - sha256 = "1lh37z4z09nz4wfp8ly94dwrmjsqpg6phw5r8y4gjhfnfbgpq4b9"; + rev = "6540006710daf2b2d47576968ea826a83a40a6bf"; + sha256 = "089x26akvkfm772v8n3x3l5wpkhvlgad2byrcbh0a1vyhnjb2fvd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer"; @@ -78556,12 +79767,12 @@ melpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "20181227.1807"; + version = "20190401.1042"; src = fetchFromGitHub { owner = "emacs-php"; repo = "php-mode"; - rev = "553977a423442f2b8a98de954ce62d224c7949f4"; - sha256 = "186l88y4mlljdrnw4a114caa6wm5726dkvipva2k3i2bpww828c5"; + rev = "bcde734c37ca36e6c2a925038760247b09ca8825"; + sha256 = "0shrssfjbqykpyz8kmchizgcl2m29bxp1n1331csi0lnqkb9v540"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e41dc09413eaa93704e7d9f55bd2bd01f658806/recipes/php-mode"; @@ -78663,23 +79874,24 @@ , fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , php-runtime }: melpaBuild { pname = "phpactor"; ename = "phpactor"; - version = "20181223.16"; + version = "20190402.1916"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phpactor.el"; - rev = "c468ab22d3d291b03a7a0b2b929dcb1dfe0f4714"; - sha256 = "162zzsm2hmfvdkf7vv8nh628d5156f2hbcv1ds8fjzb93r09h0aw"; + rev = "5dc331636786bdcee9ce2868d4d313c40aca1303"; + sha256 = "0qwklrsd8hxjvcddjj4ks3p24nyc3rcsxs9hyn3jphxww2igjbiv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor"; sha256 = "0w2iszi74y3s6rcn6p2ic545cg319y4jpy83npbh5m98y8jma84m"; name = "recipe"; }; - packageRequires = [ cl-lib composer emacs f ]; + packageRequires = [ cl-lib composer emacs f php-runtime ]; meta = { homepage = "https://melpa.org/#/phpactor"; license = lib.licenses.free; @@ -78719,12 +79931,12 @@ melpaBuild { pname = "phpstan"; ename = "phpstan"; - version = "20181203.208"; + version = "20190227.842"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phpstan.el"; - rev = "abf5c786da4e6a0112aae2ee533ef4003a034497"; - sha256 = "0kkxq59cn13m16q8sjv1byz414h4jwms5li758afc167jqcyz82c"; + rev = "1151b8d418af532fdf0732b9793b479c64a364e3"; + sha256 = "0wb9pshgcrq2w9d9fpkywz299ihcb9fffh3fdk8rm1r8irylrjkh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan"; @@ -78801,12 +80013,12 @@ melpaBuild { pname = "pickle"; ename = "pickle"; - version = "20180627.1937"; + version = "20190122.948"; src = fetchFromGitHub { owner = "ahungry"; repo = "pickle-mode"; - rev = "568570b7d376026fbcb7c3df1ad8f605bd14c820"; - sha256 = "0dg44js5l1p93h73x7zh4znr0iwgmms7qr4v4594ab6sg7cc54jm"; + rev = "0d0b1925b7b79e2c80a1877351e3c6ce52935c4b"; + sha256 = "0hbymja9109fzw34ra5iyxvhfv0x8ffr8sayqihdfmrs2ymh045z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cb71882f074d3fef1f5a7b504dafcb6adff8ed4/recipes/pickle"; @@ -78826,12 +80038,12 @@ melpaBuild { pname = "picolisp-mode"; ename = "picolisp-mode"; - version = "20150516.155"; + version = "20190104.2320"; src = fetchFromGitHub { owner = "flexibeast"; repo = "picolisp-mode"; - rev = "1a537b14090813f46cbba54636d40365e1a8067e"; - sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115"; + rev = "39e54f31b5d10483aac2765bf5cc4ad92f9e4467"; + sha256 = "054hmmpcxg56r9qhk006mm7y6b2bb6pjxk48fbynhbwmhwnn79ps"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe116998dadeef6e61c0791efb396f9b8befa5d6/recipes/picolisp-mode"; @@ -79159,23 +80371,24 @@ , fetchurl , lib , melpaBuild + , pyvenv , s }: melpaBuild { pname = "pipenv"; ename = "pipenv"; - version = "20180718.2247"; + version = "20190307.355"; src = fetchFromGitHub { owner = "pwalsh"; repo = "pipenv.el"; - rev = "05e98e80be2dd92f14ffb9f6048f98547a9f0253"; - sha256 = "1gdy31nlxac1c500jpcnvgb32lcg0xfqgiiyci4s958cwn1yn704"; + rev = "189cf5a4d425b6bdcd26742a460cf12cc540f524"; + sha256 = "0dcd7gmjs5s17h55nnpyppxg3zf96p3w8bsb9sk2wy1jwxn566cm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; sha256 = "110ddg6yjglp49rgn1ck41rl97q92nm6zx86mxjmcqq35cxmc6g1"; name = "recipe"; }; - packageRequires = [ emacs f s ]; + packageRequires = [ emacs f pyvenv s ]; meta = { homepage = "https://melpa.org/#/pipenv"; license = lib.licenses.free; @@ -79423,12 +80636,12 @@ melpaBuild { pname = "plantuml-mode"; ename = "plantuml-mode"; - version = "20180816.312"; + version = "20190316.458"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "82ab084c8631e70b089448ace72525f647af4f10"; - sha256 = "0jcsbswpg41r27i5xb5lvw17n1kndwl8df9iwyhpm26jh2i2hpyv"; + rev = "2b84a2df523904c180a3556c851f59beb0e070d7"; + sha256 = "0l4nxda55ipbrzy0nj59d1vf97m2h9ydviq9r7hiw4mjfq31lzsv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; @@ -79932,6 +81145,33 @@ license = lib.licenses.free; }; }) {}; + poet-client = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , request }: + melpaBuild { + pname = "poet-client"; + ename = "poet-client"; + version = "20190123.2254"; + src = fetchFromGitHub { + owner = "wailo"; + repo = "emacs-poet"; + rev = "bca73c57f1daa33eec7763adcbc9733f65f9864d"; + sha256 = "129xc278kryh097y4jxqkzbsw6y39b8yxxq5sp7y0a1cm10gwdwj"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a0b003773edaa728ed49f0de2ca64a00cb60d13a/recipes/poet-client"; + sha256 = "11yj57915ly8j2byp5c395lip73iv1chrzxdlxilhnll1brvmaw0"; + name = "recipe"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/poet-client"; + license = lib.licenses.free; + }; + }) {}; poet-theme = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -79939,12 +81179,12 @@ melpaBuild { pname = "poet-theme"; ename = "poet-theme"; - version = "20190103.302"; + version = "20190127.1420"; src = fetchFromGitHub { owner = "kunalb"; repo = "poet"; - rev = "c9495b5e7815682582d5b7a439823bbbbfedfb53"; - sha256 = "0mqcph0bygsl97bzbqrbvs1732nfvjjk09zlkwl3vw34fdxgsmg9"; + rev = "e16d47de40c9ec434adb8b861223f0bf95495240"; + sha256 = "1nf34m5agygd93q45bsi3zxbzf9jyz11hncwyi6q8mnanxr2imfa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/40bbe29dee56f7989d8e87c03f4842e2b191acc3/recipes/poet-theme"; @@ -80041,12 +81281,12 @@ melpaBuild { pname = "pollen-mode"; ename = "pollen-mode"; - version = "20181021.1830"; + version = "20190309.2138"; src = fetchFromGitHub { owner = "lijunsong"; repo = "pollen-mode"; - rev = "3b57f40f78eb4458e7be41dc4051f9cf0ff6982e"; - sha256 = "0ddi08v94vjrvf6nwk18mppfp17d934r0wksw1h34szi7qf05hx7"; + rev = "819edf830e9519f8ca57e9cef31211e3f444d11a"; + sha256 = "0c06kfbyk2g0kxwlh6g3r7ij06ip6x9ni0bin24drwr0qj2vis2d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/pollen-mode"; @@ -80070,12 +81310,12 @@ melpaBuild { pname = "poly-R"; ename = "poly-R"; - version = "20181024.1354"; + version = "20190323.1424"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-R"; - rev = "b9236aab9043747bf764703e7b84f3c6bb526dec"; - sha256 = "0dipnlk79mnlw3mw9n7cp6dl0j1nfhaf04j8w4mhp4afpkfwbr3c"; + rev = "3d90219d7e099ba65449681700ffc62cf88d9cc4"; + sha256 = "1327rqdhc0xaad2k5rjwma6wwky72a8bfqmw1wqy0d4wzbn2wbrf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-R"; @@ -80133,12 +81373,12 @@ melpaBuild { pname = "poly-erb"; ename = "poly-erb"; - version = "20181019.702"; + version = "20190317.723"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-erb"; - rev = "61fa4640a1cb08120c2c70bfc32029cc79b31b79"; - sha256 = "15k2gmjkn9w5gn7njh8nyr8whhn8xc1hcqqn2as2p1b6m2jh0xcl"; + rev = "5339b0ba665cbf62dc09571e9fbc5e824c5bf5e4"; + sha256 = "13bvgh0y4nlwxyxph7xs1m9akwb9cln2s5bnnn6fhwhgamsbqcvi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-erb"; @@ -80161,12 +81401,12 @@ melpaBuild { pname = "poly-markdown"; ename = "poly-markdown"; - version = "20181010.1437"; + version = "20190317.652"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-markdown"; - rev = "bf41bd2f30066573f562c674d38b9e42a43ed016"; - sha256 = "0w2xy1cksik332qs1i26imxiyd89vbfy3ff7di4b3l14cxz6ybra"; + rev = "852755d339197ea5b2197b64a97d0b9c03b94e9c"; + sha256 = "00y510ky587frzpzbyi82rqngi8ifnfzd5r15lh9w34v3dxjif6f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-markdown"; @@ -80188,12 +81428,12 @@ melpaBuild { pname = "poly-noweb"; ename = "poly-noweb"; - version = "20190102.1138"; + version = "20190317.652"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-noweb"; - rev = "69d3d9720755fe7dd8f248534e6cac786cbf947e"; - sha256 = "0kpw9czl9p39h5qi1cg3059q19499lnd8vwj9hqy7ki01qb6fdw2"; + rev = "1ce8d4f5c69376255e7be03fd03aa3b3bc00cfb5"; + sha256 = "00n86lyrgffznspryc5h9bgqz5m0c0zwsxf9mlli62jf6c3wsd1q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-noweb"; @@ -80215,12 +81455,12 @@ melpaBuild { pname = "poly-org"; ename = "poly-org"; - version = "20181213.950"; + version = "20190320.1337"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-org"; - rev = "588f298eb64b79fe450c56b0e5fd1282cd75eb1e"; - sha256 = "05dimsivc9lraiw7zx4kjz7l3d4cim5sm4y3mhimgmipsk2ps0np"; + rev = "28421de2993de4da1e1db3b34a1215ce3ccc1d8b"; + sha256 = "14f2752j55gj9is4prcx601km716vsq1fg25157bniiwd42vinqs"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-org"; @@ -80233,6 +81473,33 @@ license = lib.licenses.free; }; }) {}; + poly-rst = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , polymode }: + melpaBuild { + pname = "poly-rst"; + ename = "poly-rst"; + version = "20190317.735"; + src = fetchFromGitHub { + owner = "polymode"; + repo = "poly-rst"; + rev = "62a5cb9403f48f5c060244903ba0d14cb6822f6c"; + sha256 = "1m2w9rlgpvdki083vyl9916fjb7dl7rd418kha3la46wks7z8ca5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d3fb89f58903245a8df75060ddd695a05cedb322/recipes/poly-rst"; + sha256 = "08sdnjb5zvlynyxkmajn1j9gnjdjj81ycid9ziydvrb7hb88x2m4"; + name = "recipe"; + }; + packageRequires = [ emacs polymode ]; + meta = { + homepage = "https://melpa.org/#/poly-rst"; + license = lib.licenses.free; + }; + }) {}; poly-ruby = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -80270,12 +81537,12 @@ melpaBuild { pname = "poly-slim"; ename = "poly-slim"; - version = "20181010.1438"; + version = "20190320.1342"; src = fetchFromGitHub { owner = "polymode"; repo = "poly-slim"; - rev = "2216d7edf315ab8df1e01c2a826041bcdb8bcd01"; - sha256 = "0wcfacd5wpi52glfz4snxh8ghff2qlv8d1jwj890297ikmk7mn1g"; + rev = "1b9fe0fc9fb7f65975be22322d17dc49bdac7c4a"; + sha256 = "1czjanp9h4l7jry2gkb7596zhdmh3m29931npfdk1fb0lafrqhik"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-slim"; @@ -80296,12 +81563,12 @@ melpaBuild { pname = "polymode"; ename = "polymode"; - version = "20190102.1110"; + version = "20190406.303"; src = fetchFromGitHub { owner = "polymode"; repo = "polymode"; - rev = "c2d950a46c2851a94b7f7c506c572de08acdfd53"; - sha256 = "0r14dga0bxdl4zwwgpvk185axi64w9fsn301slv009756mkbysni"; + rev = "0327dcac0f25e175e26f3774c24683d6bd6fc7a0"; + sha256 = "0g0mkvk0ky8akm7bpf78n2zm4a52m89aiq0bfc2y87dgpbnvjyp4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/polymode"; @@ -80348,12 +81615,12 @@ melpaBuild { pname = "pomodoro"; ename = "pomodoro"; - version = "20150716.1046"; + version = "20190201.1352"; src = fetchFromGitHub { owner = "baudtack"; repo = "pomodoro.el"; - rev = "4a299b8f5e6623010224dcb3e524ff288c6a082c"; - sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z"; + rev = "6cd665ceeaca1f70954aa4caef6f085179f94c69"; + sha256 = "08z2nja3bhjgg6k7bb0cr8v02y8gaxkmxmfcvvgiixw3kfrnkpwn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b5c2c50eb87952d01c1b338b7d3e4b3a4546555/recipes/pomodoro"; @@ -80740,12 +82007,12 @@ melpaBuild { pname = "posframe"; ename = "posframe"; - version = "20181214.453"; + version = "20190407.549"; src = fetchFromGitHub { owner = "tumashu"; repo = "posframe"; - rev = "405b5a07aa2cb923f7657a98c7deaf601f5e09a5"; - sha256 = "0nxlzx5f7sysc27gllixri6q7j0vh02lji371cx7idgnzdfrzv2s"; + rev = "11c2fa2d6e0236f20c83da86c37b005c64b8c5cb"; + sha256 = "1m1vgv3ps99xdrvya7w7jlfm068ik3wswpl2hnr858vmyjp4ggi6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; @@ -80844,12 +82111,12 @@ melpaBuild { pname = "powerline"; ename = "powerline"; - version = "20180321.1948"; + version = "20190322.1913"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "af5ef31a33c3589a9be0b2a55a2741582e605efd"; - sha256 = "0zynj4pl9717xbj8g1mac3haiybdndb034bnqk03bb42iyrwy767"; + rev = "6ef4a06c3c583045accbc957b6f449b7c0c57cd8"; + sha256 = "1ybm5y03if4wbzhx5p05wwgf2d8l2c4vwi22d0ygvlwrzfk8n5dl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -80897,12 +82164,12 @@ melpaBuild { pname = "powershell"; ename = "powershell"; - version = "20181011.1251"; + version = "20190113.45"; src = fetchFromGitHub { owner = "jschaf"; repo = "powershell.el"; - rev = "c9a20e5a8b02dc5d7ccd2b1974eba28a9348ad5e"; - sha256 = "1y8bph4133n4pcvsplni0ahg14ny27vl03jxf5lhhqkh06miqqsg"; + rev = "87cba2c5e0510bda3915b8324ae67ac52adcae31"; + sha256 = "1dlyl8h539y75av144869ckz7difgmc1y2a2ngym7i6id22j1plp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell"; @@ -81029,12 +82296,12 @@ melpaBuild { pname = "prescient"; ename = "prescient"; - version = "20181220.1624"; + version = "20190227.1043"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "c395c6dee67cf269be12467b768343fb10f2399f"; - sha256 = "0zh0g9vxgqbs48li91ar5swn9mrskmqc0kk7sbymkclkb60xcjs9"; + rev = "9d15739133bac00ae222c98211a6735f41d88f86"; + sha256 = "17ci1kdrw5j0h284i7akmjqnw465fawz5n2bqwqlpvzd6ghc2z8b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient"; @@ -81149,6 +82416,36 @@ license = lib.licenses.free; }; }) {}; + pretty-hydra = callPackage ({ dash + , dash-functional + , emacs + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "pretty-hydra"; + ename = "pretty-hydra"; + version = "20190226.1946"; + src = fetchFromGitHub { + owner = "jerrypnz"; + repo = "major-mode-hydra.el"; + rev = "2142be970874c679300e539a1d9d0f048eb72a7f"; + sha256 = "00hxv2nlzz4kgyzrldhqfnvnrhdcb82lm90xdbvn059f1v1zihn3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865917fcc75c4118afc89b8bcc20ebdb6302f15d/recipes/pretty-hydra"; + sha256 = "0gp4cbffpa17svs7fzxighyly7c8brsn3avv3hqvd590kkz3fkri"; + name = "recipe"; + }; + packageRequires = [ dash dash-functional emacs hydra s ]; + meta = { + homepage = "https://melpa.org/#/pretty-hydra"; + license = lib.licenses.free; + }; + }) {}; pretty-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -81156,12 +82453,12 @@ melpaBuild { pname = "pretty-mode"; ename = "pretty-mode"; - version = "20160614.1146"; + version = "20190209.1302"; src = fetchFromGitHub { owner = "pretty-mode"; repo = "pretty-mode"; - rev = "500085206e25b98d00b9ec996f91c87ba569c4ce"; - sha256 = "0m7ii971zxlz8a9yx2ljf9fmd8k6hc9w1q8mi5xi32v9viccjabs"; + rev = "26119b4e28e294980bd16564a13c73dc963b98cc"; + sha256 = "08sr73469zh0cn14lf3w2x4n7yf203pgr4hs3a218a5n51dksla3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/pretty-mode"; @@ -81649,12 +82946,12 @@ melpaBuild { pname = "projectile"; ename = "projectile"; - version = "20190101.837"; + version = "20190402.2319"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "823c0aa9ffd1e8e03b20efe97c16cfb66e2c56c5"; - sha256 = "16y0zcqydfag4igwcbljqymkwjgjxdh97ii616wgdsyjgk9xxd4h"; + rev = "5bd9db6f4b0a9e1c27136561b134a4d119552cdb"; + sha256 = "1k9r5ssm4wavypd8m5mb64fgia68jzpkk1p0p598qcywvbxlbw35"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -81732,12 +83029,12 @@ melpaBuild { pname = "projectile-git-autofetch"; ename = "projectile-git-autofetch"; - version = "20180418.1636"; + version = "20190103.1235"; src = fetchFromGitHub { owner = "andrmuel"; repo = "projectile-git-autofetch"; - rev = "55855886bccb5a22fbeb2b1c86ef2e9ff4de9067"; - sha256 = "11h6ix7j145azg69kha46g2ggrmqff178p1krp12wv07iv3sijj6"; + rev = "c6b4b99046122bc965e25cd20c737483d84fa8cc"; + sha256 = "08hs4pbx0bw9lsfkc9za66am9ayyshlys5jrdh2aln1rfxrrr6hj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; @@ -81792,12 +83089,12 @@ melpaBuild { pname = "projectile-rails"; ename = "projectile-rails"; - version = "20181009.617"; + version = "20190110.208"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "af0f826f2e1b1aad4e31e089e5fc7b5937e82359"; - sha256 = "110mkg0wk1xcy8r031vyrbp5q9nz88jas94lgzqslbdh7ifj0907"; + rev = "78f5cbe2c212ce19d4732212c46472d1c412659f"; + sha256 = "09aby7yxk28rqz0vaps889idl5n41wj72pa0dr7bqmidq8i5jv4h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -81959,12 +83256,12 @@ melpaBuild { pname = "projector"; ename = "projector"; - version = "20180724.1122"; + version = "20190107.1325"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; - rev = "d4aad9449960457932c19123c7ea2d60a67d1cca"; - sha256 = "1zj9kg99allzb1hlz646hhhq3d0spvs26hc3y3pxykr58s611lrv"; + rev = "b7ee3f78e54525c969316c3c717ec3b83f074b00"; + sha256 = "09c8cfpz4i4vs7b0q4srg52spjwc1carr8n52xggk6dc5gbrg5wd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector"; @@ -82039,12 +83336,12 @@ melpaBuild { pname = "promise"; ename = "promise"; - version = "20180409.252"; + version = "20190405.105"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-promise"; - rev = "f623fa7466983fd1ba7034371f599434c03da723"; - sha256 = "1ffk5scab9whn27xz4wyik5vl235ngvhx30fd05abq97d6l7hndl"; + rev = "f237a52200b514d642a5e89f1437b0245f063e5d"; + sha256 = "0k8bdz5lnipyj1bnyf3vwaqyd1y7wc6mxavqigv435r04520fmx7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; @@ -82116,12 +83413,12 @@ melpaBuild { pname = "proof-general"; ename = "proof-general"; - version = "20181226.1500"; + version = "20190212.633"; src = fetchFromGitHub { owner = "ProofGeneral"; repo = "PG"; - rev = "fb3b75dab55b6e6befffc53e136422558be5faa0"; - sha256 = "1gxribixgx2s86kk98qxjb5i2lh3842qgr5lwzgnrrp0yqrh4i9w"; + rev = "8f90ac961c22099a615c03ed07576aaef820e06d"; + sha256 = "07rwy1q0pii1k7z18hpfs768w07n7qg0wrvcqkrjfii3hx19vbwf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/135c8f2a04739145b500b8742a697907e398d270/recipes/proof-general"; @@ -82299,12 +83596,12 @@ melpaBuild { pname = "proxy-mode"; ename = "proxy-mode"; - version = "20180520.2030"; + version = "20190129.1608"; src = fetchFromGitHub { owner = "stardiviner"; repo = "proxy-mode"; - rev = "1cf689c2408945081215550589936a7eaab14987"; - sha256 = "0xvc33xwrdh71kmv1g85gb28ba7yx8cz6257dgh6sx7ligz7cmvd"; + rev = "a6c55e97dbe4ec4df9dc21d234cabe806dce3a29"; + sha256 = "13xa19k0xyqq03ypih0lrkm97l2c5zha8mwl264h9vamn81i8vm2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25224d3bcdb625314e931d5acc22f60c7192a84b/recipes/proxy-mode"; @@ -82317,8 +83614,7 @@ license = lib.licenses.free; }; }) {}; - psc-ide = callPackage ({ cl-lib ? null - , company + psc-ide = callPackage ({ company , dash , dash-functional , emacs @@ -82333,20 +83629,19 @@ melpaBuild { pname = "psc-ide"; ename = "psc-ide"; - version = "20181002.619"; + version = "20190326.1410"; src = fetchFromGitHub { - owner = "epost"; + owner = "purescript-emacs"; repo = "psc-ide-emacs"; - rev = "01a158b77210fec9c1bfc0caffaf08fccc0412ac"; - sha256 = "00lhidhi5m7lxpq2bm9prfzz35kgkjwyl27lmlyc49gh1ky4g19q"; + rev = "a10cc85565f330ee277698b27f3f715fef2e1ce2"; + sha256 = "1nj8g31zys86p2kb1yrx9w0657qg3ckz5awfwz5wd5w1axxigk23"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; - sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9eb5ff1de1d207317df052ecbd65dbe0f8766f5d/recipes/psc-ide"; + sha256 = "0gvq4cmmnbh4afzhmpqmizlvyr2fmd88jwdcac3w4b25fvhzr8hp"; name = "recipe"; }; packageRequires = [ - cl-lib company dash dash-functional @@ -82362,29 +83657,28 @@ }; }) {}; psci = callPackage ({ dash - , f + , emacs , fetchFromGitHub , fetchurl , lib , melpaBuild - , purescript-mode - , s }: + , purescript-mode }: melpaBuild { pname = "psci"; ename = "psci"; - version = "20180418.533"; + version = "20190307.1624"; src = fetchFromGitHub { owner = "purescript-emacs"; repo = "emacs-psci"; - rev = "3f5ef1141a97c4b5507204d48e8aeccd553e4591"; - sha256 = "1g06hqr23mg8457azkjp7wjsqavj48c0mjck0igi6mc2rh310930"; + rev = "3c10918a3a1d1dc613c222801deb465d4fbb2143"; + sha256 = "14dj7jsyamkr05dqqlks8p12nb94gw0pj4dmnh1p771020b8drw0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9"; name = "recipe"; }; - packageRequires = [ dash f purescript-mode s ]; + packageRequires = [ dash emacs purescript-mode ]; meta = { homepage = "https://melpa.org/#/psci"; license = lib.licenses.free; @@ -82471,6 +83765,35 @@ license = lib.licenses.free; }; }) {}; + pubmed = callPackage ({ deferred + , emacs + , esxml + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "pubmed"; + ename = "pubmed"; + version = "20190316.1651"; + src = fetchFromGitLab { + owner = "fvdbeek"; + repo = "emacs-pubmed"; + rev = "195e5f6e0cb7b5c20723c2b6adc3ac19543cfcdc"; + sha256 = "0c37kk8lzhlywlg7gagk62c7k21zy6cg9lhz0jy5sab1icrdzps5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee84560c15e7389e902fb4a4c548c08be231de82/recipes/pubmed"; + sha256 = "048kh442dnzgwz4wml2a5griav8zyrfzn5b43n9ky84pm7lgcxp3"; + name = "recipe"; + }; + packageRequires = [ deferred emacs esxml s ]; + meta = { + homepage = "https://melpa.org/#/pubmed"; + license = lib.licenses.free; + }; + }) {}; pug-mode = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -82505,12 +83828,12 @@ melpaBuild { pname = "pulseaudio-control"; ename = "pulseaudio-control"; - version = "20180627.450"; + version = "20190331.18"; src = fetchFromGitHub { owner = "flexibeast"; repo = "pulseaudio-control"; - rev = "1da372ec79f5d2fb901d1f9f0679fee8848fd011"; - sha256 = "02xrsms2pjqdk6327midi61i5vg2h9cq5jwaxv43ldm68wl7hi6k"; + rev = "638a02b0b59cd9662abbbb9dc947d0fed115b72d"; + sha256 = "0kiqm9vcp2gi4a4c7isgffppx4bchf03vwlx8h70yhfycns2v0bk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; @@ -82635,12 +83958,12 @@ melpaBuild { pname = "purescript-mode"; ename = "purescript-mode"; - version = "20181028.138"; + version = "20190227.1345"; src = fetchFromGitHub { owner = "purescript-emacs"; repo = "purescript-mode"; - rev = "a6c7e4cc5ea29cf96478490a57d495e745d6e054"; - sha256 = "0x6w9sgvq3xxxv4fni94acr2q683p81k7ipd7sc27yv8zzj2giyv"; + rev = "43d8d205506d10ef829e77079fc4b8c569998f44"; + sha256 = "0xbqy408532gnknfj78cnp9raqcmfk4scaxym7nzb8ffh2bd721n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55462ed7e9bf353f26c5315015436b2a1b37f9bc/recipes/purescript-mode"; @@ -83205,12 +84528,12 @@ melpaBuild { pname = "pyim"; ename = "pyim"; - version = "20181109.550"; + version = "20190405.2125"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "8648d467d79b3bf1c3a99623f9329939cacc40da"; - sha256 = "16rma4cv7xgky0g3x4an27v30jdi6i1sqw43cl99zhkqvp43l3f9"; + rev = "a80a203b7149d927a92d9bc27278117df44f05f2"; + sha256 = "1z6yinn5azn4g1g6y4p55a579xm3rhhn9sxbmjlpd2ff66ahi8z3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -83282,12 +84605,12 @@ melpaBuild { pname = "pyim-wbdict"; ename = "pyim-wbdict"; - version = "20180929.2158"; + version = "20190201.1500"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim-wbdict"; - rev = "55c7eed02c3253de12c71b925b8d9ef23425b64c"; - sha256 = "0sc0zjp2k190vd8fyzild7ndvfpg528qdlgs1xl9jdkrjnwb85l0"; + rev = "9799b689643052078f53d69342a82315251490f4"; + sha256 = "1rqlckmlmwmnqvk8bbcyvwr54p6x9b1fph5f17anzlvwffdjsw5c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict"; @@ -83462,6 +84785,32 @@ license = lib.licenses.free; }; }) {}; + pytest-pdb-break = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "pytest-pdb-break"; + ename = "pytest-pdb-break"; + version = "20190307.2255"; + src = fetchFromGitHub { + owner = "poppyschmo"; + repo = "pytest-pdb-break"; + rev = "9966507e1a3f2c4a5249ee96a93790cca82d91c5"; + sha256 = "1is1v28bqk43dqmhjggxlfxz3l7va4686k8y2hxmhrl80hg54182"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7d5d5e81818dad55edda73fbeca8c5021b932/recipes/pytest-pdb-break"; + sha256 = "0dxn53y9zjlip0bjynjql984wrf39pmg5fsx1qgsrj1bw78xqw26"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pytest-pdb-break"; + license = lib.licenses.free; + }; + }) {}; python-cell = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -83469,12 +84818,12 @@ melpaBuild { pname = "python-cell"; ename = "python-cell"; - version = "20181028.1440"; + version = "20190217.1023"; src = fetchFromGitHub { owner = "thisch"; repo = "python-cell.el"; - rev = "2faa78b3f4faa12f09f9864ebd854ae7d4e95fd0"; - sha256 = "13b1ym3bncahyarbiqib5qhkyn3s6brq78kmfl7xvgjvfqfsb8pl"; + rev = "665725446b194dbaaff9645dd880524368dd710a"; + sha256 = "1rjh16jacp98i0l78ij5lfp5f0b42qhfzms2x8zwr9j2aj1csy2h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0549866c5e96f673ec9dec298e7ff9d5779d443b/recipes/python-cell"; @@ -83595,12 +84944,12 @@ melpaBuild { pname = "python-mode"; ename = "python-mode"; - version = "20181223.1133"; + version = "20190313.409"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "f039fa485b3446c8afa73ac461174871ba8a229c"; - sha256 = "171hrzfyc4i4wlxsyf9pn4i990dyji6lsfpajsqzmhcvq1dkbiph"; + rev = "e916afc06f2a9bc1f02d93081ee0ee1ec2e8740b"; + sha256 = "03vc619iq7hd5q7m5rlxlq7h1irc288x2hr6gnm58b711gyax5fk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -83741,12 +85090,12 @@ melpaBuild { pname = "pythonic"; ename = "pythonic"; - version = "20180920.1615"; + version = "20190214.1016"; src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; - rev = "6a5a2a365e4ea6fc5adfa96359418c437aa351c8"; - sha256 = "04x27zhj6yc2lvl79cns365a6w1psvamrzx5vmcqmi4imfp4g8a4"; + rev = "16c16202b76d33edd6a95814b2a9c298437f9832"; + sha256 = "1j8jslc0p85kl1fgl108ccvavqcvjda7hsc4ks9avill18w3dm5h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic"; @@ -83972,11 +85321,11 @@ melpaBuild { pname = "quelpa"; ename = "quelpa"; - version = "20190102.2350"; + version = "20190217.450"; src = fetchgit { url = "https://framagit.org/steckerhalter/quelpa.git"; - rev = "2593394b293d633fabe0583fc1f00bc19bee5978"; - sha256 = "0h8zlc5zns6q26kjvc3rbw4s3dbjxjpaf79pwf2aayvs8xy3p8h5"; + rev = "716048b5ee048797551a59a4bd121026486db214"; + sha256 = "05926kvgp7mbdmwlfn2sdqzxg0b5nxr41m08p8mywfwjqjvnsvw8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a496196d405c152600d44ef4aa28557f489c542c/recipes/quelpa"; @@ -83999,11 +85348,11 @@ melpaBuild { pname = "quelpa-use-package"; ename = "quelpa-use-package"; - version = "20180812.329"; + version = "20190210.1038"; src = fetchgit { url = "https://framagit.org/steckerhalter/quelpa-use-package.git"; - rev = "90fc1eadf3f7ff3a3bef07d229a807aba2f7beef"; - sha256 = "1ij5fqnd0ypn66v8b4s2577b47ninmk085hnjjc4fav6a5gd5csr"; + rev = "6f3cc87caa6cb8795079c5cab3c6665970859098"; + sha256 = "129pigh1njn50s1lq81blcn54bkb6hwrlxg0sk7m1zsf6rybw0rf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a496196d405c152600d44ef4aa28557f489c542c/recipes/quelpa-use-package"; @@ -84049,12 +85398,12 @@ melpaBuild { pname = "quick-peek"; ename = "quick-peek"; - version = "20180525.711"; + version = "20190208.715"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "quick-peek"; - rev = "3cc57cc12f4b5f27a18cc5fb0c32c3a943c16158"; - sha256 = "0wrgdny402z95234kn86k17qn1v3sg8bfdn48y9mg52dk7wnsxvf"; + rev = "fd8a6c81422932539d221f39f18c90f2811f2dd9"; + sha256 = "18jr3syd7jd809qq1j61zwaaclmqn24qyb0mv0q8sj6ac4vzl1c3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68f59a3048ec6196b138b6584a22ce70baa38284/recipes/quick-peek"; @@ -84196,6 +85545,32 @@ license = lib.licenses.free; }; }) {}; + quilt = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "quilt"; + ename = "quilt"; + version = "20190303.2140"; + src = fetchFromGitHub { + owner = "jstranik"; + repo = "emacs-quilt"; + rev = "161ce2d8ba225bccef0ea8ae4937251b8ccaa892"; + sha256 = "0r9j71rc2jcwfr6yqg8qx4fwypqg1d7p31af258ixygs3qy69x14"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28ad2d71574c1995287371cfd73648871b9271f0/recipes/quilt"; + sha256 = "0fgni5khjbxy28i2vdwhcvs0z0yx43ll0c4s8br4w7q9s0nlcvmv"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/quilt"; + license = lib.licenses.free; + }; + }) {}; quiz = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -84263,12 +85638,12 @@ melpaBuild { pname = "racer"; ename = "racer"; - version = "20181212.1825"; + version = "20190319.1756"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "7e1c0166ace3d56ba8914e1d07cb9faf0580b7b5"; - sha256 = "1psgx6nwbh5ac2l0ky8zh36zbv6rrwr03zhnwj506z7hv5mxdgby"; + rev = "9d8984ef384932e0e7647ecb057db7ad1e9833f1"; + sha256 = "10q26bkv26fgdcvs6cn2vb2i4359yn7a4n3r7vs8qfpnck7i0j8x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -84291,12 +85666,12 @@ melpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "20181205.1929"; + version = "20190405.745"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "8180205ef83893e2a99e40168194b6d01b8e3281"; - sha256 = "0bnmrjlh82p2p09avjmlixyvqqsc5m70p3yybp3mlqbvib2vjs26"; + rev = "b2681c50afd180ed3a89345e015926eb31dba30d"; + sha256 = "038f03y8nmzfjdbxcyfg6sd6y9zimlc9yvcs9lggvps1ni2y4j58"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9af8dea03aba378f21c6109faf48278b4d2bf59f/recipes/racket-mode"; @@ -84341,12 +85716,12 @@ melpaBuild { pname = "railscasts-reloaded-theme"; ename = "railscasts-reloaded-theme"; - version = "20181030.50"; + version = "20190307.2359"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "ae77bc04fe5a948f418ec8693f6ff2c9ea757c50"; - sha256 = "1vn9cw343w9vvxhzqi85vyqnj6kxcv99qvva4xjvy1sf65i24wy4"; + rev = "c6a1cf13a164f22b026b0959527c3b98c2b1aa49"; + sha256 = "00clkjrp2nfchhznilxjb56bcdv1an50cawnz6747ck22x0ycbfn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -85035,12 +86410,12 @@ melpaBuild { pname = "real-auto-save"; ename = "real-auto-save"; - version = "20180802.2147"; + version = "20190224.646"; src = fetchFromGitHub { owner = "ChillarAnand"; repo = "real-auto-save"; - rev = "fb1477244fe365cc79c6946507fde2caf71af600"; - sha256 = "0g4a3cmfngx59byn22ihq6izpjg1srpgn3gkx13jdsxdwxrwbg14"; + rev = "824ad04121493723b08838c8b96559947dca7ed9"; + sha256 = "1szpjv04rp9x9ph44a5s56a2y96z5x474bccsjnmn6yhingh5qik"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/real-auto-save"; @@ -85065,16 +86440,16 @@ melpaBuild { pname = "realgud"; ename = "realgud"; - version = "20181210.1125"; + version = "20190121.1643"; src = fetchFromGitHub { owner = "realgud"; repo = "realgud"; - rev = "2ae8fbf087aa7f1ecb51f7ecaa71cc54094ff5e0"; - sha256 = "1jzvf5ngcs3vqh7m6iym8k41y4fq6y28b7dkljk0jm0jqfhvypx8"; + rev = "1da5f2b5161bd5d5671b38ab182084e2d89e7c45"; + sha256 = "19ijc3v1wz01631hyc3x1bgx9kczhdzc99jlxxfq9y5yr8p1s2qa"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud"; - sha256 = "0wbcclgd23d91c7lx8yx7qigcbc0ywr4hjh7h49pi2avy1cm2q0v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a21be3673962d5706f12efa5179a5426bdce82b/recipes/realgud"; + sha256 = "14n6d3jfhpa29nf4ywdg3aw4i51lfkr99b4z8q4833pmpz1jbq2c"; name = "recipe"; }; packageRequires = [ @@ -85207,12 +86582,12 @@ melpaBuild { pname = "reason-mode"; ename = "reason-mode"; - version = "20180727.1158"; + version = "20190210.941"; src = fetchFromGitHub { owner = "reasonml-editor"; repo = "reason-mode"; - rev = "4123ee5b3dccf8986e94d5f51220a544deee0b93"; - sha256 = "0w5957fniyx58a4qnmabrkisz8302f3hmsip7gg2r272fbf29nzc"; + rev = "8eabf39fe84280e0753c1c0c4b8ecb7b8f94f68f"; + sha256 = "1hbz3bzlb0r0ss5vl8ahl9x2vp049agms8hxwma0ycs6ai1ygcn1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode"; @@ -85362,12 +86737,12 @@ melpaBuild { pname = "recently"; ename = "recently"; - version = "20181220.746"; + version = "20190317.534"; src = fetchFromGitHub { owner = "10sr"; repo = "recently-el"; - rev = "3a331936ba33875d0f2fa47abe056aadbc59150e"; - sha256 = "0hdsv3whr2iqk6xirmfcjpbqjnckzqj54n5q04gh2z01bjxv3d7k"; + rev = "7b5d1128becb387d759a3a95f6afb9ef54be792a"; + sha256 = "0wghawh47jd2j5s77h1b69fg5njff1yccx1xpvwmlj6ssh3p38xp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb8d1628e1787cba10fc612f3351e4085e9a3153/recipes/recently"; @@ -85491,12 +86866,12 @@ melpaBuild { pname = "recursive-narrow"; ename = "recursive-narrow"; - version = "20180916.2149"; + version = "20190306.721"; src = fetchFromGitHub { owner = "nflath"; repo = "recursive-narrow"; - rev = "94f5c16a81ecf85c7442ebc8cd04ba7553ab5244"; - sha256 = "0l0czf1405pcxshwdvvniddz00lygh25xdim8xzn7b1w13knb863"; + rev = "5e3e2067d5a148d7e64e64e0355d3b6860e4c259"; + sha256 = "1dxghz1fb2l7y7qphqk0kk732vazlk1n1fl6dlqhqhccj450h2qa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/recursive-narrow"; @@ -85698,6 +87073,32 @@ license = lib.licenses.free; }; }) {}; + reformatter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "reformatter"; + ename = "reformatter"; + version = "20190209.2001"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "reformatter.el"; + rev = "00413b21ec418f92f3c7d8235a809cf50a10f288"; + sha256 = "0hmi6c3kf7plg3pdcyiiwhl5ckdr5p43d9y9172kw89y6ivf4635"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58de8cf8864867f7b3969f3a048a4844837078b4/recipes/reformatter"; + sha256 = "0z4wa0bmhz55c54vx7qxkl9x7ix20mmgygv91sqll68l10g63l0c"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/reformatter"; + license = lib.licenses.free; + }; + }) {}; regex-dsl = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -85783,13 +87184,13 @@ version = "20181220.2128"; src = fetchFromGitHub { owner = "zonuexe"; - repo = "right-click-context"; + repo = "region-convert.el"; rev = "173c86b4b3fc187d54bcd85b4d7df27a5ee24965"; sha256 = "1paljjwr6sfl835m24vj2j4x3zdh3whwayj6dvyfarbhhcwbwphj"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert"; - sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f6963fc11d697b95ebbdaf7fe27c91a6229d08b6/recipes/region-convert"; + sha256 = "16i1b83jms7djkyb3n0crfxgpz05m68f4nrlvzxjj7fb56mvf9j7"; name = "recipe"; }; packageRequires = []; @@ -85849,22 +87250,23 @@ }; }) {}; related = callPackage ({ cl-lib ? null - , fetchgit + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "related"; ename = "related"; - version = "20161002.2310"; - src = fetchgit { - url = "https://bitbucket.org/julien-montmartin/related"; - rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441"; - sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks"; + version = "20190327.324"; + src = fetchFromGitHub { + owner = "julien-montmartin"; + repo = "related"; + rev = "546c7e811b290470288b617f2c27106bd83ccd33"; + sha256 = "0kn07wgnz5bkkq66qfq16rvw9l7zgh0hzrsa705j1zbd6vc3wygs"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6248cbbb6c977c9c9332a34b449eb090dd9322b3/recipes/related"; - sha256 = "0nm2dnmz4a5z187mzggsj8xrdy1x84lxx79rmwcrkh1d7jzjhi6f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/555932a7b9cf11b50a61c2a9dd2636fd6844fac8/recipes/related"; + sha256 = "08cfr5qbm1h5j4v3vf3kjjwb9nxsrk74lx9gi1icdhqw631h3yxf"; name = "recipe"; }; packageRequires = [ cl-lib ]; @@ -86196,12 +87598,12 @@ melpaBuild { pname = "repo"; ename = "repo"; - version = "20170213.139"; + version = "20190326.944"; src = fetchFromGitHub { owner = "canatella"; repo = "repo-el"; - rev = "9f03c0d90c9036b96e531c17d529f3855364d47a"; - sha256 = "1ggxs40mbk50aqhqqfdcz6izvlvsz53s93dj3ndxvgdxkpkxr6yn"; + rev = "c53c06169dec4e556982fb06ca780ca4708dc436"; + sha256 = "1brsc8k590qc4x93qydiq8ylq26zbdv8565fz194zpik9d239mja"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo"; @@ -86410,12 +87812,12 @@ melpaBuild { pname = "restclient"; ename = "restclient"; - version = "20180316.851"; + version = "20190405.1308"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "859d944796ce298b5779d9d256bd8d271d57e221"; - sha256 = "18grh9pislyr1mnj05nd2wj2ns8wy2irsxi7y203qkhkhqaamdgn"; + rev = "236810ad1d4b13f27e85931c0d8bb3549a35e865"; + sha256 = "0f0hn91k6s4vkqzac3x9sma4sx78m4b6h7fpkc4jslv2v0b0dplv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -86620,12 +88022,12 @@ melpaBuild { pname = "rg"; ename = "rg"; - version = "20181217.1034"; + version = "20190403.833"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "362c2b3938a0b81b71d7fa5a8a916b90a0f2aa4a"; - sha256 = "0qgg3rprrh2pjpn3d79vinmnz2ahahj87sqd69fvz59dxyr65b32"; + rev = "acd8be6a1ee129fe8b3802bfcffe9b56bfa72320"; + sha256 = "0av0dipf6jjqhixzv7gnf1w8rlncgpwcxr3jn9lidx9acr8yprwa"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -86697,12 +88099,12 @@ melpaBuild { pname = "rich-minority"; ename = "rich-minority"; - version = "20170813.622"; + version = "20190321.658"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "333e4669f76a0fb68b433117d377711e418a525e"; - sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic"; + rev = "04bc21b109c4507e16747b709d55f9be9553779c"; + sha256 = "15m39qqllkj1a328dyl23a830ix6m1f9sfmj19nwrsysxqik7vg6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -86733,8 +88135,8 @@ sha256 = "1paljjwr6sfl835m24vj2j4x3zdh3whwayj6dvyfarbhhcwbwphj"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ce65fff520deed40670c38f45063dd79d3e6b98b/recipes/right-click-context"; - sha256 = "100qsckbq5myhqbkqsfb7703gcy2np66m6qxby7622px87m4vp7d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f6963fc11d697b95ebbdaf7fe27c91a6229d08b6/recipes/right-click-context"; + sha256 = "189nkxkc7lr2fm5qgmylmz6xv6mpphslj4fgpmr8ynnx9z3nxms2"; name = "recipe"; }; packageRequires = [ cl-lib emacs popup ]; @@ -86856,12 +88258,12 @@ melpaBuild { pname = "ripgrep"; ename = "ripgrep"; - version = "20180323.920"; + version = "20190215.41"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "a1f8f030bf5daea92dd13b953720a6c13dd3557c"; - sha256 = "0mpysjcbw9qxy1lcwsd2rqf72xahpdpn88xcq0cnk1y2jam8gjkf"; + rev = "40e871dcc4519a70981e9f28acea304692a60978"; + sha256 = "0snn12iibz5frsx6yk6c31hb8knvsd568ghw9jjka5vxdjzap7p9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -86909,12 +88311,12 @@ melpaBuild { pname = "rjsx-mode"; ename = "rjsx-mode"; - version = "20181207.3"; + version = "20190311.1817"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "a481ca375ca26ca3285e112fbf41e8fae8bd753f"; - sha256 = "0vydwdk0v0dsnx5pc8fm56kxp6srwr93yy4ld8q4nrh4lj8w19fv"; + rev = "03dd8d1683501e81b58674d64c3032b7b718402c"; + sha256 = "1kc44g9f38klpjklmz9n50a28nqv7prz6ck6ghdr6bnj1s98pb8a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -86962,12 +88364,12 @@ melpaBuild { pname = "robe"; ename = "robe"; - version = "20171116.1249"; + version = "20190305.1346"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "7829f4fdda41eee0add8868646ab86e6b17de4b4"; - sha256 = "1h526m21g0yqpry8dh42aj8nv4lp74dc1cmcyfb16sx5rrk0vx27"; + rev = "69abadccf36220167f5d158dbdd3a801b3b89eff"; + sha256 = "087jl5b220i6g7shfbfxvxvv6zdlgagvrhwf4axllybif1p47nd3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; @@ -87038,12 +88440,12 @@ melpaBuild { pname = "rope-read-mode"; ename = "rope-read-mode"; - version = "20181224.300"; + version = "20190315.907"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "20b1cf63b90ee1cddd093b16cf1f758be6f5bfa6"; - sha256 = "14p7lfsnd9mni2vl67cb66wxs6kfyzdavji3x6xg8pw371bk1c4n"; + rev = "3542bf0199d242729e198beac3305cc88497dc89"; + sha256 = "0l6r2g3i475nlzrwra38f6w5izl3ajd4dilf4yvcs66ah9bzhh2r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -87191,12 +88593,12 @@ melpaBuild { pname = "rspec-mode"; ename = "rspec-mode"; - version = "20181208.1625"; + version = "20190326.722"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "bcae3ec163c62c059eacc8765b01d4cead70ca33"; - sha256 = "1r5d3594dpjd7z7y7ncf6xbga25lrlwjbwv9j2y8kflpmksdcz9d"; + rev = "3285c225d0ed99b2dd91ae9e65b2c961082b03e5"; + sha256 = "1s5yj4n8qd3ypm505573s4gs63s5kmir4wphknn7hwsa1qxxzp55"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -87216,12 +88618,12 @@ melpaBuild { pname = "rtags"; ename = "rtags"; - version = "20181205.839"; + version = "20190320.817"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "15d10815b19ed84f78baf9c4ff91c604d9145153"; - sha256 = "1k1b88kczc716sd337rcqkiqm0yj4pn838ah1h5qa99vwywqs9mn"; + rev = "3232afea229ee090df61bc58786a1de65894f413"; + sha256 = "0z3xj5s1p14sk8na7xhx4kxc2kz3sg7z58iz5mlaf6mdna85cy3x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -87295,12 +88697,12 @@ melpaBuild { pname = "rubocop"; ename = "rubocop"; - version = "20170311.2211"; + version = "20190326.724"; src = fetchFromGitHub { owner = "rubocop-hq"; repo = "rubocop-emacs"; - rev = "980bedb455e3551d35a212fae515c054888907c1"; - sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p"; + rev = "03bf15558a6eb65e4f74000cab29412efd46660e"; + sha256 = "0bl1l2qbpdknn93wr95a49gdnpl3pwpjj3rka3s44hvihny9p8q0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/rubocop"; @@ -87500,12 +88902,12 @@ melpaBuild { pname = "ruby-hash-syntax"; ename = "ruby-hash-syntax"; - version = "20180323.1909"; + version = "20190109.1427"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "89fc364a837d7a78ecce34380f09c073a83e30e0"; - sha256 = "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8"; + rev = "577ab383c142e3a0697ce73480158a8b489038da"; + sha256 = "06hm4pl3mzlyx4d3v94rm2w33q9wnwpdl7qas3fnks691d9apg7x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -87578,16 +88980,16 @@ melpaBuild { pname = "ruby-test-mode"; ename = "ruby-test-mode"; - version = "20171016.931"; + version = "20190313.805"; src = fetchFromGitHub { - owner = "r0man"; + owner = "ruby-test-mode"; repo = "ruby-test-mode"; - rev = "87f6d770f8d2326c8d36099aeee5d577f3e2af69"; - sha256 = "0qiwc2h5hyh6np16a2gfcchbnyh7v5wnzd8idr64cmd9blg3jh8d"; + rev = "aa11267824561eb2b6a40b3dc5e2ad1cfb800f84"; + sha256 = "1k2mv2zgjsq8sn6lr5ad1xicb786xkvj8v588xavn1m50brn1gc9"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; - sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f781a76a519afc0222cdf7255822a23e33745deb/recipes/ruby-test-mode"; + sha256 = "08x9pskxz1hvvqablx5mdp1g54n28kpmd10qwrasq2zjbdjghj48"; name = "recipe"; }; packageRequires = [ pcre2el ruby-mode ]; @@ -87807,12 +89209,12 @@ melpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "20181218.308"; + version = "20190304.536"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "d3a70256fe560bcc463ed42e4259e9fce0fdfee3"; - sha256 = "1l5fbd79z80475xmhnpaf2b6bc8q9niarz9y31zq59k7zagiz3qj"; + rev = "a871d108c745276e93ff1dec7c65e2e5a57e6d8c"; + sha256 = "12yyc9d1b5jj2mqxdgjn95ah9dnxbl8jkq2mrxyrr9y34c6fycr6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -87856,22 +89258,25 @@ , f , fetchFromGitHub , fetchurl + , ht + , let-alist , lib , markdown-mode , melpaBuild , projectile , s + , seq , spinner , xterm-color }: melpaBuild { pname = "rustic"; ename = "rustic"; - version = "20190101.1314"; + version = "20190318.1112"; src = fetchFromGitHub { owner = "brotzeit"; repo = "rustic"; - rev = "c274416555ecbb76b9b666bcad0ba4021ab8fba7"; - sha256 = "1ja0zakggpjwkb6nnjdcbrd0ma915148r24rkymzf6xm9gydbx3z"; + rev = "e73f29bd273670a1193e595ff13641ec0675cfb4"; + sha256 = "1jfvvq4yz3ypw32q10g926ys1y4j1dyskpbl25qgqnw5dwjy7vsk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/716c14a2ed8f5817c09c1ff530a4980c17b44bb3/recipes/rustic"; @@ -87882,9 +89287,12 @@ dash emacs f + ht + let-alist markdown-mode projectile s + seq spinner xterm-color ]; @@ -88490,6 +89898,33 @@ license = lib.licenses.free; }; }) {}; + scalariform = callPackage ({ f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "scalariform"; + ename = "scalariform"; + version = "20190113.1815"; + src = fetchFromGitHub { + owner = "zwild"; + repo = "scalariform"; + rev = "f4b04508a65ce8593d15c260322c527dda5810a3"; + sha256 = "1c2z6kp17gw77h9y6v75dvcp6ywpsyfcxlrzr5iank4ipgplsbha"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1912f795e5842be534160e3879bfb96f3440e163/recipes/scalariform"; + sha256 = "096y63j91910hqsy6qvz16c9lzyi7ni3r7h039z5zw2v97aggh9i"; + name = "recipe"; + }; + packageRequires = [ f s ]; + meta = { + homepage = "https://melpa.org/#/scalariform"; + license = lib.licenses.free; + }; + }) {}; scf-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -88680,12 +90115,12 @@ melpaBuild { pname = "scpaste"; ename = "scpaste"; - version = "20180822.851"; + version = "20190228.1351"; src = fetchFromGitHub { owner = "technomancy"; repo = "scpaste"; - rev = "9757bb5b38f2ec9200391864a9f6971a14b60fc9"; - sha256 = "0sp8rkaylwpibdxvvxdb3zf4fi8klfcmkkbd7hdll36dwc3yk75v"; + rev = "568faaa70fa0413e2d165ad232cd4c6ec2815197"; + sha256 = "160m4w0i9cj4zxmmsknmnvycscj9y8da39y1362kv7dpmwnxsxcp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste"; @@ -88698,26 +90133,27 @@ license = lib.licenses.free; }; }) {}; - scratch = callPackage ({ fetchFromGitHub + scratch = callPackage ({ emacs + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "scratch"; ename = "scratch"; - version = "20170614.1401"; + version = "20190313.2314"; src = fetchFromGitHub { owner = "ieure"; repo = "scratch-el"; - rev = "2cdf2b841ce7a0987093f65b0cc431947549f897"; - sha256 = "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf"; + rev = "4813d82b39a451f2a6d5b730cd7ec49a9bdabcca"; + sha256 = "0yiwq2gc4gdgfhaagpawhb7yrzc4fsnyb10w5d0q4whv64cj8555"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch"; sha256 = "1an30pr64fz13s6lghlcb36b7hn3961vv0yipfp9s140ccygdvh7"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/scratch"; license = lib.licenses.free; @@ -88903,6 +90339,32 @@ license = lib.licenses.free; }; }) {}; + scrollkeeper = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "scrollkeeper"; + ename = "scrollkeeper"; + version = "20190108.2229"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "scrollkeeper.el"; + rev = "3c4ac6b6b44686d31c260ee0b19daaee59bdccd6"; + sha256 = "18pp4k12g5dyma362461gdp4ds5d3lx9gky2ishsq39949pkz7qz"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d9ad5b16ff61c1f8ba1e030ee0988aa51a437022/recipes/scrollkeeper"; + sha256 = "16wqlyxznall4kmd8l68q4d11qyilj8vsji36h7llprxa2m9pg12"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/scrollkeeper"; + license = lib.licenses.free; + }; + }) {}; scrooge = callPackage ({ cl-lib ? null , dash , emacs @@ -89096,23 +90558,24 @@ , fetchurl , lib , melpaBuild + , org , s }: melpaBuild { pname = "secretaria"; ename = "secretaria"; - version = "20181025.1257"; + version = "20190116.1200"; src = fetchFromGitLab { owner = "shackra"; repo = "secretaria"; - rev = "27528f57c7543b425940db29b9b99d59d430ff09"; - sha256 = "1kw91pp5aidlwk1cz0wq76xyqzrm1yilw0l0az7x0xvcz94l32xj"; + rev = "e619a41b8c2600204c064d33394a3c1b85fc2879"; + sha256 = "09fddglyiz7j6ymxlwsq1zpigp5vhg31r2p6nr4lsblww3ypbapg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eeddbcf95315da40d021a6913ccf344849c4284/recipes/secretaria"; sha256 = "04pcibzdljcfiha4yh10van8gsjrzn6bdkvkm2ahfcwrmscfn3hf"; name = "recipe"; }; - packageRequires = [ alert emacs f s ]; + packageRequires = [ alert emacs f org s ]; meta = { homepage = "https://melpa.org/#/secretaria"; license = lib.licenses.free; @@ -89307,12 +90770,12 @@ melpaBuild { pname = "semi"; ename = "semi"; - version = "20180825.201"; + version = "20190405.739"; src = fetchFromGitHub { owner = "wanderlust"; repo = "semi"; - rev = "d445dbdf39bab9aaf00582506357f25f1b78d76d"; - sha256 = "10bd95fd9sf3fn7x1vrfl7nra5sg4df8v39bl7yc3i9gh9yiiy9q"; + rev = "13bb56eb978439957964032cc3118a8bea43d7f4"; + sha256 = "0328yis2hwzsgdi6rkrj5yhl5qlz48grnqkp3y56xyb6wf25cn96"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi"; @@ -89579,12 +91042,12 @@ melpaBuild { pname = "sesman"; ename = "sesman"; - version = "20181109.300"; + version = "20190213.850"; src = fetchFromGitHub { owner = "vspinu"; repo = "sesman"; - rev = "2a1a9a4ccfd88127e13f2655ac130c82fe84f2f7"; - sha256 = "02jb0fz6sg1dj8yb5yyn16pj4pnliz18y8vxylinqbwvn7v4q0rp"; + rev = "3df33018f1c42f09db21cebe39a25b389fe35f02"; + sha256 = "0z5jb4vpbjsi63w3wjy6d2lgz33qdfvrgfb3bszv4hcf6a96y7fc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman"; @@ -89629,12 +91092,12 @@ melpaBuild { pname = "seti-theme"; ename = "seti-theme"; - version = "20161208.836"; + version = "20190201.1048"; src = fetchFromGitHub { owner = "caisah"; repo = "seti-theme"; - rev = "cbfef2fc15d19ce4c8326e65fafdd61737077132"; - sha256 = "191mvz6d6j764q1sj2496i6lq0q42b5qh5zfdvf0yl39pzbwx8jx"; + rev = "9d76db0b91d4f574dd96ac80fad41da35bffa109"; + sha256 = "14fqkkvjbq2gj737k3yz3s0dkya33fi0dj4wds99zyzss2xp37f8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme"; @@ -89705,12 +91168,12 @@ melpaBuild { pname = "shackle"; ename = "shackle"; - version = "20171209.1401"; + version = "20190201.1046"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "4189c1c773aab533969b587f7801ffbcd1d7d613"; - sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq"; + rev = "242bacc940c18b6f9c156e1912155d45537fd827"; + sha256 = "0qqx8py21jaq1bdafkfqx18ns4zn305qg84zbmy65spiqnfq8hwk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -90164,16 +91627,16 @@ melpaBuild { pname = "shimbun"; ename = "shimbun"; - version = "20181019.121"; + version = "20190404.1600"; src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "w3m"; - rev = "4eeed17f47a89031c51d843e902071738d5d2905"; - sha256 = "1f8ipg4ln2swykn8b4gzl288s21wfsgf7crwm13j21s4qgxhj9ip"; + owner = "emacs-w3m"; + repo = "emacs-w3m"; + rev = "28f7af52ec09f7c6feb608431f0afae59c69d4fa"; + sha256 = "0njaf3pwilcxac1hd1w7ilrcmjv2iaxb4zzkwjnk73f1smgcxy2m"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; - sha256 = "1rjykr0y5jfd6r3shm8x23yyra6qjsb55jrfc45rhpb89klyg1nk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5a423647410357f0e63afba5b52bbe880fce969/recipes/shimbun"; + sha256 = "04d9kkj4fididhq220c1vjmlzmaqnii95c1ca86kzjbm2bqakkcd"; name = "recipe"; }; packageRequires = []; @@ -90452,12 +91915,12 @@ melpaBuild { pname = "shx"; ename = "shx"; - version = "20181118.1851"; + version = "20190309.1056"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "a7d9dda0196423bbb673f9a4d30ac948449758f6"; - sha256 = "0hf4b9a2azdj2xh7ffwz5j2b4akpxia0237ibk6g2kv902982n4s"; + rev = "a70f0cdc3c80b7b5b15d287d9b03e49f943bad57"; + sha256 = "0ihwiw9dxr6vln4dmg5dp75353ip9nc80hjfl1w3j0g3m8vhjbs2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -90528,12 +91991,12 @@ melpaBuild { pname = "side-notes"; ename = "side-notes"; - version = "20180523.2328"; + version = "20190403.137"; src = fetchFromGitHub { owner = "rnkn"; repo = "side-notes"; - rev = "981ac308b9b5d58e2af20485377e693d2a6e15aa"; - sha256 = "1hjj6pkl83b9fldzf2bixdny85l5mn81a9kf25kyp0cc6apvwsqr"; + rev = "2319ee180a4a67175b9e95322cd30b3ac70a9bdf"; + sha256 = "05xaj5lhxaf07frzcayx5ybz778sgx8bplg5i75x24b7miqdcjl2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24a71c493adfb79bcd5172d65aa0751e9a6ab556/recipes/side-notes"; @@ -90553,12 +92016,12 @@ melpaBuild { pname = "sift"; ename = "sift"; - version = "20160107.215"; + version = "20190104.917"; src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13"; - sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra"; + rev = "16bdffd2edf9300db50a81dc0b456da7ad6da86c"; + sha256 = "0wg7dnn721ff3h22s8bs2g4alrixzrry1m509md20qdklz9d6iwy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift"; @@ -90682,12 +92145,12 @@ melpaBuild { pname = "simple-bookmarks"; ename = "simple-bookmarks"; - version = "20160804.701"; + version = "20190204.626"; src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; - rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; - sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; + rev = "54e8d771bcdb0eb235b31c0aa9642171369500e5"; + sha256 = "0i4yw341b7iml2j8mxclixsrdqlvixfxpabaxp4jh70aq2zfw1cf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; @@ -90735,12 +92198,12 @@ melpaBuild { pname = "simple-httpd"; ename = "simple-httpd"; - version = "20180528.903"; + version = "20190110.705"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "a5eb49a6567e33586fba15dd649d63ca6e964314"; - sha256 = "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb"; + rev = "f1c160f83cbfecc63ec6c6e2a94590b500ecf458"; + sha256 = "1rxc8y0nfhanyp1l6vz20jg2d4wdjwy9gwicpmfhq0nmafxydw7z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -90788,12 +92251,12 @@ melpaBuild { pname = "simple-paren"; ename = "simple-paren"; - version = "20180427.218"; + version = "20190315.1156"; src = fetchFromGitHub { owner = "andreas-roehler"; repo = "simple-paren"; - rev = "8d735905306c587851eff1445898499c01c530ca"; - sha256 = "0fv8s9h9sdiahi49al7zp0ldrlxi0dj46i2il75y7ay70l29wza2"; + rev = "2530d5419301c80bc584ee4888ce2d048fba8add"; + sha256 = "0zcak1x2b7y0g29c0njblspawxjxkbkgyn3100wawfcswyav3nri"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; @@ -90912,23 +92375,25 @@ , fetchurl , lib , melpaBuild - , request-deferred }: + , request-deferred + , unicode-escape + , uuidgen }: melpaBuild { pname = "simplenote2"; ename = "simplenote2"; - version = "20171201.1806"; + version = "20190321.233"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "0fd6dbd0566af29964078e4b74baf69c2f52381a"; - sha256 = "0qlwmxrz2kngri7ywy64bja0najq9m6asq2gr53ns0mkq1ngf0l8"; + rev = "760ffecda63bd218876b623f46d332e3ef079be6"; + sha256 = "1swb6xvdw6dql6wdj8y5kaaicwrafiz5jwnfl5h1viw08b98q8dv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm"; name = "recipe"; }; - packageRequires = [ request-deferred ]; + packageRequires = [ request-deferred unicode-escape uuidgen ]; meta = { homepage = "https://melpa.org/#/simplenote2"; license = lib.licenses.free; @@ -90974,12 +92439,12 @@ melpaBuild { pname = "skeletor"; ename = "skeletor"; - version = "20170616.1746"; + version = "20190211.1939"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "skeletor.el"; - rev = "01c330ec115fc29bba5d9bdf6c15beb4a44e2281"; - sha256 = "0i3axni8y4s5n2s7qbqzz3sadcfhr3369q7qn8psk29qbicjw5wv"; + rev = "47c5b761aee8452716c97a69949ac2f675affe13"; + sha256 = "12bdgykfh4mwsqdazxjdvha62h3q3v33159ypy91f6x59y01fi0n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor"; @@ -91136,12 +92601,12 @@ melpaBuild { pname = "slack"; ename = "slack"; - version = "20181222.2215"; + version = "20190402.2337"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "f4bd00fe8f3fef087ee6362c88425783699091c7"; - sha256 = "185djybhmwgyz7czcxsiny7ngs1lklsjmgncknrjdk5lgi3g855h"; + rev = "53816e274ce1c65fdfbd93fe0076fdaf79bbfbf2"; + sha256 = "0z9cbajam923v07fji0zmn240z3dgqv77csn9aanv5qpi6xkm1sp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -91214,16 +92679,16 @@ melpaBuild { pname = "slime"; ename = "slime"; - version = "20181214.1454"; + version = "20190319.230"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "56e32da66840e3d03947da2fdf9730824cfc870a"; - sha256 = "05pgcf3sd4dwl40kfw00s3si8rz8rk9pis81jlxdi5w6qzmlg7v1"; + rev = "6945edd4a6532e84caca53fbb44b09ca14cd50cc"; + sha256 = "1g6pq3xri7r54whradbrc1kbsj96x65x3nqcpy2a05h4wqbn8psk"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f7b49074393c922c4c4da971f1af70ecdba84abb/recipes/slime"; - sha256 = "14l73q7hqwz5nl7nr8f3cc6bzzgbxgavj2f1z8aq76qfyhxc6zl5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/47609a81b81330820f6ddf717400dc7fa06aaabf/recipes/slime"; + sha256 = "1ds8iprxr04wdhnnw4129v5l3w3k5rjp5ax156ppqr5i7wxx1zac"; name = "recipe"; }; packageRequires = [ cl-lib macrostep ]; @@ -91242,12 +92707,12 @@ melpaBuild { pname = "slime-company"; ename = "slime-company"; - version = "20180119.1043"; + version = "20190117.738"; src = fetchFromGitHub { owner = "anwyn"; repo = "slime-company"; - rev = "4c2e2805540dea700130607fa235018a87e4a070"; - sha256 = "0ihwchp6hc1rxmahrhaly1cnhqs6k6ks32iiywwsyw7fjc34alc4"; + rev = "7290cbad711a62f76c28e5638d1a4d77197a358c"; + sha256 = "0kslq8kq8dc192bpiaalyqisv3841h3dxy1wxk8hw3nyyww08mgx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company"; @@ -91452,16 +92917,16 @@ melpaBuild { pname = "sly"; ename = "sly"; - version = "20190102.236"; + version = "20190315.1523"; src = fetchFromGitHub { owner = "joaotavora"; repo = "sly"; - rev = "38a465bd9a2d17ed40d2164cd87de66f2e0bc8f6"; - sha256 = "0psh9xigsgm209lddd3bmji231vvsqmsni941ky64gg2fivrxvfy"; + rev = "0a622da46251e620433d76f5ed98e40ef375ee01"; + sha256 = "0zzda1fjskgkr162j3zi7y23zi3k4kg1hbcpcb1jyyp0bq8vwla5"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/sly"; - sha256 = "18as0g1fi1x6lgjzd9rn2s6iw3n00q3nxi99lchjnn004pwsv8kq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/974d8812a4c5e45221ce3c32ae72c15ed29665c3/recipes/sly"; + sha256 = "000g5qpy45zqrh3g4mk70mh2lakadfq18djrq7cabagw1qmhqy41"; name = "recipe"; }; packageRequires = [ emacs ]; @@ -91812,12 +93277,12 @@ melpaBuild { pname = "smart-jump"; ename = "smart-jump"; - version = "20181103.1527"; + version = "20190216.1206"; src = fetchFromGitHub { owner = "jojojames"; repo = "smart-jump"; - rev = "aa963735196b7f64fb286163cd5c3e4d435814e5"; - sha256 = "0nfqa9ziccf30fiy813qps34zn41a4am7d0v835c55hgdx97vgij"; + rev = "f8f98f1c032352f5d8d465a45b3b5b49cd9247d6"; + sha256 = "00v6a04ywxvikfwwgf85hr4p77xlm7shyai558ww3vf2gyhw1ily"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump"; @@ -91864,12 +93329,12 @@ melpaBuild { pname = "smart-mode-line"; ename = "smart-mode-line"; - version = "20180926.336"; + version = "20190327.1241"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "b79f4fa5f2380b0d726a895dd7199e5483004490"; - sha256 = "1n24g265slp655h5wn32ghcv1khn1dnf1l96c65mc6fd4csmzhd1"; + rev = "268319aafee710ce8916c8612a5a8dcdce55fc1b"; + sha256 = "0j1m5xms3jgkd19baqnsyx2dzrc85c17nx49d1wklicn17kkawyb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -92127,12 +93592,12 @@ melpaBuild { pname = "smartparens"; ename = "smartparens"; - version = "20181212.1156"; + version = "20190128.947"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "806d770ebdce93d984401825d78816fcbec12f1f"; - sha256 = "0nwcsyaahw9sxaqbak3ixdbr38ija6ih9pa0rsl6d357qnr2xk3q"; + rev = "4d1571019080fec63b11474db32380b5fa4eb418"; + sha256 = "0r9lf7vsaw8z1dydi850azha1ig1ldid8yn6zx1da2fvfpgyly7v"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -92797,12 +94262,12 @@ melpaBuild { pname = "solaire-mode"; ename = "solaire-mode"; - version = "20181226.1426"; + version = "20190312.2257"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "620df5a1d3d7e780af87079d2a43edf11a7ad5d2"; - sha256 = "1bilnihakgkyhws5s80s1sbph6zp4dyws79b2l4dp820d324fsi5"; + rev = "d648ad7c06554c14077335b631410df989536e97"; + sha256 = "0ajwf4ymqpskxjmd2fnr5g66wdncq1rsiv50yk3z0zxls6jap7d6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -92825,12 +94290,12 @@ melpaBuild { pname = "solarized-theme"; ename = "solarized-theme"; - version = "20181030.1212"; + version = "20190219.1751"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "87d4758e7ecc8ed873f3326e4f8b185fd2b9da0a"; - sha256 = "004ivjg6hknx13cay7prj7yk6nnmyp6kk278lwc62d0z78a87821"; + rev = "74c6b5acd6892faeafd08029898663d81ab0a4d5"; + sha256 = "03pkc5bads459sx5a562ikpf5a6py0iqv7lihva7rqa8dj43jx0h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -92877,12 +94342,12 @@ melpaBuild { pname = "solidity-mode"; ename = "solidity-mode"; - version = "20181117.718"; + version = "20190302.109"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "d6c48a1cb64d3c8a825dc0d06c839f2cacd4d289"; - sha256 = "14v71xf3z60s1fhpsz8b3l1v4na2ds0ddcp41y412fnrg4scbrhr"; + rev = "47f15b2663a6cf92ae6ebf655841a9509ad79017"; + sha256 = "0zhr5fcv8vlkcnya36y9smpgw7ylb0fkx0px8zr0zhr2f9xgjmph"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02d3fdae111b14a87aaa7a1b3f44e545c5e3d2ac/recipes/solidity-mode"; @@ -93039,12 +94504,12 @@ melpaBuild { pname = "sotlisp"; ename = "sotlisp"; - version = "20180706.1049"; + version = "20190211.1226"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-lisp"; - rev = "cc5730c0803a6e0f18e22d6027784b915d304318"; - sha256 = "1s1l2lscjnv8f60ncynv82xrqg5npj1m77z28fxlx53calj6k0qk"; + rev = "ed2356a325c7a4a88ec1bd31381c8666e8997e97"; + sha256 = "1r7skjxiaqdkrhjrxh1sgzikip9sdr8apphgawvq4x6lir8g8jfz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/sotlisp"; @@ -93327,12 +94792,12 @@ melpaBuild { pname = "spaceline-all-the-icons"; ename = "spaceline-all-the-icons"; - version = "20170829.120"; + version = "20190325.902"; src = fetchFromGitHub { owner = "domtronn"; repo = "spaceline-all-the-icons.el"; - rev = "e2e195f64a541d72b6d0ba0451f1e3072234b820"; - sha256 = "0lrf62gsss19z2ca4hg5c08b3nbkqaa33fqrbfa126v2c98bj583"; + rev = "5afd48c10f1bd42d9b9648c5e64596b72f3e9042"; + sha256 = "1chv6lv216qa88fm2wil45x19dzahcclr9p5vizcziq180dnmass"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; @@ -93352,12 +94817,12 @@ melpaBuild { pname = "spacemacs-theme"; ename = "spacemacs-theme"; - version = "20181107.925"; + version = "20190116.1307"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "c162ad13e4ae1965619012332d3b5f57c9172e98"; - sha256 = "03p9wcbyjy8jywdkmnql415l1y1dpb2fvlanqkp9lhzs4kxf1w2x"; + rev = "3eae3726faf39aa2a9e4c919a657f335282fefb7"; + sha256 = "0csj0mygv3mlvlxi600i5pkxjirqg58fa7rsh205733iyqxpff93"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -93507,12 +94972,12 @@ melpaBuild { pname = "speechd-el"; ename = "speechd-el"; - version = "20180105.1217"; + version = "20190103.1226"; src = fetchFromGitHub { owner = "brailcom"; repo = "speechd-el"; - rev = "0b25d3eb7ae219d2af9a7e9df2f3334652156bf5"; - sha256 = "00b2851pgrzvcl828l48gxrmy779w8s1k4ngf8pf0sh1y9bd2715"; + rev = "d97b5d5abb9d51da6e96c0f55ba7e50cb12aaa2e"; + sha256 = "1adx34fi8v6mxvnvlw1gf6baadp3si2wwi71kcvqz1cqcf0fk4p7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96669a664122c2fb69acd4cad2d7bf75d3e8272d/recipes/speechd-el"; @@ -93534,12 +94999,12 @@ melpaBuild { pname = "speed-type"; ename = "speed-type"; - version = "20171230.847"; + version = "20190227.2200"; src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135"; - sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc"; + rev = "d905b79ba3c80c556562ce18a96760202826eedc"; + sha256 = "1pwi9f7iv604cv91j05r77bac2g17daya621g11lmfk1w09k35d5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; @@ -94028,27 +95493,53 @@ license = lib.licenses.free; }; }) {}; + sql-presto = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "sql-presto"; + ename = "sql-presto"; + version = "20190113.942"; + src = fetchFromGitHub { + owner = "kat-co"; + repo = "sql-prestodb"; + rev = "bcda455e300a1af75c7bb805882329bc844703b2"; + sha256 = "00whmsylr802fx87yqbr06rbymyln7kq7750pcz26xm1jgja7cax"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a21349775e018822a06bca3c3c338879548e286f/recipes/sql-presto"; + sha256 = "1rjfgvwgl63xn047vmsmj1s31wvrd24v6ibf9nri6qmffhv9i9zb"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sql-presto"; + license = lib.licenses.free; + }; + }) {}; sqlformat = callPackage ({ emacs , fetchFromGitHub , fetchurl , lib - , melpaBuild }: + , melpaBuild + , reformatter }: melpaBuild { pname = "sqlformat"; ename = "sqlformat"; - version = "20181121.1330"; + version = "20190113.1750"; src = fetchFromGitHub { owner = "purcell"; repo = "sqlformat"; - rev = "bb1a9e6055e382dfb0810cf7dea1ebc5552908f5"; - sha256 = "0j2mdwzpq3k2hj1p4xxvdm22inh9bxinnd187mnz86zc8dy4lbnd"; + rev = "e9f5446f5a11304cfd1315d499838016752410c5"; + sha256 = "1wj9ls0858wxc9vrkzgs46j45gm0s7f4yhsaki64dm44l02l5xsy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6bdaa1ccae12f2ea779ac6989607d8027feac2c9/recipes/sqlformat"; sha256 = "07lf2gx629429b41qr04gl98gplb538gb5hw7idzrmi3higrmv8m"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs reformatter ]; meta = { homepage = "https://melpa.org/#/sqlformat"; license = lib.licenses.free; @@ -94318,12 +95809,12 @@ melpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "20181219.2316"; + version = "20190208.54"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "4c3eee5feb4c3d1f08a60d4a286fa9a571dc7c57"; - sha256 = "19233qz2md4j6mpimr3qgxb63n21hywnqj6pf0hyzzni6p3d50q5"; + rev = "a57ae0c5906277e3a293ff1396325e26345bc475"; + sha256 = "0434c0r8ar8g4qn7isql6qivy1lf7jjdzr49gabxh8v8m1ysxy18"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -95375,12 +96866,12 @@ melpaBuild { pname = "suomalainen-kalenteri"; ename = "suomalainen-kalenteri"; - version = "20170801.126"; + version = "20190310.110"; src = fetchFromGitHub { owner = "tlikonen"; repo = "suomalainen-kalenteri"; - rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3"; - sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h"; + rev = "c8c03fe9bae57d4e15c287aef4f98911a3529240"; + sha256 = "1n4nz309rr1cpx1c5aighakpcmrbzzg2xprh5hi4kln0rngggycp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri"; @@ -95638,12 +97129,12 @@ melpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "20181207.2339"; + version = "20190205.32"; src = fetchFromGitHub { owner = "swift-emacs"; repo = "swift-mode"; - rev = "cde97e20a8c80075920f0e01ec76de1816aed114"; - sha256 = "1igk1d585f4bj7pw2ikfh843sfp0k80ibjkwvsjjpx272lz57qqk"; + rev = "13628495bdb2dcf30eea04412e1d3e3c80b8e999"; + sha256 = "1rl2rh1mzy7ig5wsd63lk3plrw7ivf2gir6w0ls2k0n2qxav3qb1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/swift-mode"; @@ -95691,12 +97182,12 @@ melpaBuild { pname = "swiper"; ename = "swiper"; - version = "20181212.855"; + version = "20190407.1029"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "dd8a947997158bb107f250ff2e38278d1266ba0b"; - sha256 = "0c1l3jaz8ynwd3dx3i2s76srywxnmih8jalfzx4i2xhc9896ldcj"; + rev = "11b00073cb348aedf1d648a991bab71e20178268"; + sha256 = "1pylfgjrgcapya3dmivcaq5vnqx6h8lrq3xnx7sq11sw5fn6sw0n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -95854,12 +97345,12 @@ melpaBuild { pname = "sx"; ename = "sx"; - version = "20180606.36"; + version = "20190114.723"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "46d9498e8f501697920c79437909cdddc93d5ec6"; - sha256 = "0z21f2v8464bj0jj6y9w7b5hpz1m2r761hanc4b802k8bxb8mxh0"; + rev = "49358eae36dd4bb5b9207313b30df085e7f25cef"; + sha256 = "08x2bli821b47sp1jwgg8k8q292z4ryl052rfna0vkcjqv6l5bav"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -95880,12 +97371,12 @@ melpaBuild { pname = "symbol-overlay"; ename = "symbol-overlay"; - version = "20181229.1408"; + version = "20190305.843"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "39a2ad8ba53a7af52e265efc74ddd7a912bc57c6"; - sha256 = "176zm3ydshajv8v2wyy8wrcmaz02whciiz79d0fmlzx687w56pim"; + rev = "88c3ed02a06bea87ab7e41918b39e07bb3fc255b"; + sha256 = "0yr2n6vld3shlcsmfvwgkrnw0zxry0bfkzd8y1ylfr826qll2cmv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -96064,12 +97555,12 @@ melpaBuild { pname = "synosaurus"; ename = "synosaurus"; - version = "20180125.1034"; + version = "20190305.1406"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "ceeb06e24d3af3643862ecfdb263590eec1f492f"; - sha256 = "1qdppyx24zmz9dzm9kjvcx30g6znik602mg2h2s835cww9n97idm"; + rev = "bc26f5c22b4d08dd09d0852435814977433c9521"; + sha256 = "0hpcnslgs5qh3knapw1x7imia3b1yplicpddnzzpxnjsp7psypwh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; @@ -96428,12 +97919,12 @@ melpaBuild { pname = "tablist"; ename = "tablist"; - version = "20170219.1935"; + version = "20190129.1013"; src = fetchFromGitHub { owner = "politza"; repo = "tablist"; - rev = "c834a84efb6efa32497efe1e73160fade741b836"; - sha256 = "0nkrndgg0zrqxb7hilqbrywi8n1lcf3jxjjp1hfn5f0arxy64pcv"; + rev = "af8703139d80be54b6c3077dd3e54ca7f3087043"; + sha256 = "15gnwainawzaidhclfqa2pyp6hgh172xxx127hvq6fabc1zm4ykg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist"; @@ -96607,12 +98098,12 @@ melpaBuild { pname = "tao-theme"; ename = "tao-theme"; - version = "20181222.948"; + version = "20190204.304"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "7e4edd7898c5bc3d053799f521f16d1da4ccd161"; - sha256 = "0x04wq9qpsjq5xgfx8j10jx3zdidgdjy8bdc7rdnzahjqbszhwi7"; + rev = "c5107fbe7e752f4e58c2d2147ff18a1ebb12937c"; + sha256 = "07vvlglmkj87hpxz79s3bl2cjn71vain57fdxs7j9vlr5jkchxwn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -96632,12 +98123,12 @@ melpaBuild { pname = "taskpaper-mode"; ename = "taskpaper-mode"; - version = "20181113.131"; + version = "20190225.703"; src = fetchFromGitHub { owner = "saf-dmitry"; repo = "taskpaper-mode"; - rev = "db15fa52d5f96085665b04265918c3c78a0ec059"; - sha256 = "1c771plbh2421lvdhfjbr5wfdp9pnnfgir52hiymq30ij804nqr3"; + rev = "4b15b0f473a42ff40742cd790d06a08452276bef"; + sha256 = "1visq29mg5a0czx4bgq7jzqk4xbqbdhsxv85n4cji8h8rzagn21c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode"; @@ -96768,12 +98259,12 @@ melpaBuild { pname = "tco"; ename = "tco"; - version = "20160810.1712"; + version = "20190308.1655"; src = fetchFromGitHub { owner = "Wilfred"; repo = "tco.el"; - rev = "5d3498c5f44d3a44c9aabbba71b590f6a2f85145"; - sha256 = "0vzixcp6anxdxchafj7lzs4pxfnzkqhqlyz05dxasby71zx7g49v"; + rev = "482db5313f090b17ed22ccd856f0e141dc75afe6"; + sha256 = "1z7xkbrqznk6ni687qqknp8labcyhl8y6576hjfri89fn21385y9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca33f97f0394585c8ccb31cab0ee776d1655907c/recipes/tco"; @@ -96898,12 +98389,12 @@ melpaBuild { pname = "telephone-line"; ename = "telephone-line"; - version = "20181119.2055"; + version = "20190127.723"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "74068cd04a4a34095fe816ae71880ca271f2ea9e"; - sha256 = "0rar24x5qi0zbxxnci7wnjzsw3qvyiq5ss8mv9l9bnxxwv2gf8m2"; + rev = "17901f39119702cb6754ae6907549c7b795fe747"; + sha256 = "05mys10x3cn39b5ddn6ic2x9kh74gwm3g478bc3gbia5x5acl11c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -97173,12 +98664,12 @@ melpaBuild { pname = "term-projectile"; ename = "term-projectile"; - version = "20170421.105"; + version = "20190306.2000"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "7180f09078f89aadb83061420ca8fd58d929b629"; - sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk"; + rev = "fad6760e66f64661e77e952f06b2fbef1e88e4fe"; + sha256 = "0b8r4g80jw2gdpwyc63fz1cssi1iygwdcqzqvjdaawrw3v7cbxx3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; @@ -97198,12 +98689,12 @@ melpaBuild { pname = "term-run"; ename = "term-run"; - version = "20151228.105"; + version = "20190317.2055"; src = fetchFromGitHub { owner = "10sr"; repo = "term-run-el"; - rev = "54650dbbabb13cb2a6c0670ff6b24b29717a6a8b"; - sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6"; + rev = "72db83728c22314522bdba692b145f48711052a0"; + sha256 = "149vska920b4c18gij7jgwyr8flzlym719jxpjch8m2bvwiya0dk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cad6343104bfe5724e068660af79a6249010164/recipes/term-run"; @@ -97295,6 +98786,33 @@ license = lib.licenses.free; }; }) {}; + terminal-toggle = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , popwin }: + melpaBuild { + pname = "terminal-toggle"; + ename = "terminal-toggle"; + version = "20190226.710"; + src = fetchFromGitHub { + owner = "mtekman"; + repo = "terminal-toggle.el"; + rev = "f824d634aef3600cb7a8e2ddf9e8444c6607c160"; + sha256 = "150xvmr5vsydg0197m1k62mwy2810mzh1iwqj9yl9fg47fbzbg0i"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/673974fe768f88a7c67c929bb6b9b27fc028d4e2/recipes/terminal-toggle"; + sha256 = "0l1gklcgas2g0kx5q59dzhv20pki5hxv4h3rsbrwbpq5rxkxymbx"; + name = "recipe"; + }; + packageRequires = [ emacs popwin ]; + meta = { + homepage = "https://melpa.org/#/terminal-toggle"; + license = lib.licenses.free; + }; + }) {}; tern = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -97380,34 +98898,6 @@ license = lib.licenses.free; }; }) {}; - tern-django = callPackage ({ emacs - , f - , fetchFromGitHub - , fetchurl - , lib - , melpaBuild - , tern }: - melpaBuild { - pname = "tern-django"; - ename = "tern-django"; - version = "20160221.1123"; - src = fetchFromGitHub { - owner = "proofit404"; - repo = "tern-django"; - rev = "856fc98dc5e7cb4c8bc200f99150cc6187c82861"; - sha256 = "15jzqwfr1958s21qzimvv87kckqyq01bimqgawb51b6xi9ib3biv"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e9e128a795e4949e3d4c2f01db0161a34935f635/recipes/tern-django"; - sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0"; - name = "recipe"; - }; - packageRequires = [ emacs f tern ]; - meta = { - homepage = "https://melpa.org/#/tern-django"; - license = lib.licenses.free; - }; - }) {}; terraform-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -97545,16 +99035,16 @@ melpaBuild { pname = "tex-smart-umlauts"; ename = "tex-smart-umlauts"; - version = "20160427.58"; + version = "20190316.1515"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "emacsmirror"; repo = "tex-smart-umlauts"; - rev = "5261b931443558f4252489a1e6616034848aff02"; - sha256 = "1rq1l52mgbasgwvjwpivjrfjf8l8r85wdkfpbw8213449qh9c9zh"; + rev = "f15ed781b1fb38bf3e46c481dd602c3999920b99"; + sha256 = "11ky141a33vm961jpj1spz9wxb4mfgw8drqxg2a6yk2rinkf0wcl"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/tex-smart-umlauts"; - sha256 = "05q5mzl0pya682hdmjyp09hh121dc5y4d5vgqjffx3yfd5kgsy5w"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/be27e728327016b819535ef8cae10020e5a07c2e/recipes/tex-smart-umlauts"; + sha256 = "1bygl7fjm83j8lhkipczjs812837x9p3pqn8waykfbb7v05s81fr"; name = "recipe"; }; packageRequires = []; @@ -97776,12 +99266,12 @@ melpaBuild { pname = "theme-looper"; ename = "theme-looper"; - version = "20170425.606"; + version = "20190402.1924"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9"; - sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn"; + rev = "a9195e1899dcd7dd5c630d053841c1ab958f1728"; + sha256 = "1mw2w09fr4s3621q4xb1027yf268hi1lc1ypabhgrckclih81aiy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; @@ -98009,12 +99499,12 @@ melpaBuild { pname = "tidal"; ename = "tidal"; - version = "20181219.100"; + version = "20190320.1458"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "93d30b30403bbca81d69488c6882e42f2d8dc18d"; - sha256 = "09gs8xby9bbs3fzbmja7w8rkzfyzkmslrh7hk71sh5fmamhmx53k"; + rev = "a6eed4908c8b78f0c98b9cb8cd290814afd1252b"; + sha256 = "1hwcc713vrx5ypcxsidwp25mvcg24bk8fqy7k04w7np4hhc6szql"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; @@ -98039,12 +99529,12 @@ melpaBuild { pname = "tide"; ename = "tide"; - version = "20181229.1605"; + version = "20190321.911"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "2ff6e2f1b6c647d06a87dc9cc05cbf5110826875"; - sha256 = "1w4qyg96hknspybchfwa5bi3lns6qq8sp53vxbgrrazhwjr5np6f"; + rev = "f1a3d411a3b9b7992d24f53e6afa02840a652780"; + sha256 = "19m96firhn3rxjxxcn8d9sbbprhrmxg99lc5k665pdvdmdf1kbvx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -98798,6 +100288,32 @@ license = lib.licenses.free; }; }) {}; + torus = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "torus"; + ename = "torus"; + version = "20190325.53"; + src = fetchFromGitHub { + owner = "chimay"; + repo = "torus"; + rev = "863886f10db77f3d1b16815d77561b6c81d88352"; + sha256 = "1v1l51rdcnbkq4cb4ig6l1mymhwj7dxidyx4r9g7wzw00g3ncvwb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/efc3b538861084cc13ff067a9258e55dc006b70d/recipes/torus"; + sha256 = "0zjidnc7nwbxs90spp373hx92vksd72vz4avmi4dbmhi89rdfhh0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/torus"; + license = lib.licenses.free; + }; + }) {}; total-lines = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -99097,6 +100613,33 @@ license = lib.licenses.free; }; }) {}; + transient = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "transient"; + ename = "transient"; + version = "20190319.1228"; + src = fetchFromGitHub { + owner = "magit"; + repo = "transient"; + rev = "9e30038d2d69e4ad0f3333777137af52e4771442"; + sha256 = "0mp4sfnaznqy5klslgnma5aj7k07r1qka2qnr48qi4shgq3s23jy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7bfefdf4423d63706a6dcf128886ca6b514e6b/recipes/transient"; + sha256 = "04xkdspn475dlch5fcw21phhdhshxlbyznjbi0l7qk8snm130qpv"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/transient"; + license = lib.licenses.free; + }; + }) {}; transmission = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -99106,12 +100649,12 @@ melpaBuild { pname = "transmission"; ename = "transmission"; - version = "20180728.1017"; + version = "20190210.1846"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "ba567b12a1e953880c6e7083963c52556cdc567f"; - sha256 = "0wr9npzz34cwhsmn7ry0bfvvm4dl5cpadw4mnpdjl1f85x8zasip"; + rev = "7293beeb8a49cf6822abd16a9f4b9e4bef0a9296"; + sha256 = "0pbmxl5654l1y213pq2h65dyrr78jlkybbdwz1dq52km98mpnf3r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -99244,12 +100787,12 @@ melpaBuild { pname = "treemacs"; ename = "treemacs"; - version = "20181223.519"; + version = "20190405.748"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "c2a9b647c9ce61ecdb691c5217b5cb463db776d9"; - sha256 = "1nsccpvxllj7yy0lsx643hcfs2wb0wn107pn13mkq0r16dil34c3"; + rev = "32a241d0aaa5c713815a1a040eea52a5c2b01589"; + sha256 = "0s6znv09y1ngca5hxw85niqhp5ddg9f0w88qjkp2ryva1q1wc0c3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs"; @@ -99271,12 +100814,12 @@ melpaBuild { pname = "treemacs-evil"; ename = "treemacs-evil"; - version = "20181227.747"; + version = "20190214.1221"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "bd32972d009d810380cebf6ad2c305a2c66fc496"; - sha256 = "04rbfqjkydn8mv3k2843bnqvfglvjgg3s3i5mp858yrkvy39a2rz"; + rev = "de1ba5217ca4c41fc36d405832b749b6fffd2b82"; + sha256 = "0wk280qs99py3s3lykm3pd3v3nbml1c9hkal29cx0475m12fc5lw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-evil"; @@ -99289,7 +100832,8 @@ license = lib.licenses.free; }; }) {}; - treemacs-icons-dired = callPackage ({ emacs + treemacs-icons-dired = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -99298,24 +100842,53 @@ melpaBuild { pname = "treemacs-icons-dired"; ename = "treemacs-icons-dired"; - version = "20181228.1225"; + version = "20190327.858"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "c2a82e2db25522561ef3ba520338397b89b57f07"; - sha256 = "1ahvnil9cf3dcnrcp7qgx1zcs60rizxd38g7cc4vrs2a7xfb2ibw"; + rev = "abc387a6bfbf3654914624651a593eb1aba85ca9"; + sha256 = "1mjx5c60h47kgszmpk96f5ymyh5any8ksbrxa3hcmz52s77lmd74"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-icons-dired"; sha256 = "075897b11aaj9h59gbcldz2wd5557h86pq28qkijbgay4i3piv9v"; name = "recipe"; }; - packageRequires = [ emacs treemacs ]; + packageRequires = [ cl-lib emacs treemacs ]; meta = { homepage = "https://melpa.org/#/treemacs-icons-dired"; license = lib.licenses.free; }; }) {}; + treemacs-magit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , pfuture + , treemacs }: + melpaBuild { + pname = "treemacs-magit"; + ename = "treemacs-magit"; + version = "20190327.2335"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "4e5f182eb11c5e4ee752de4972a92adab1320d29"; + sha256 = "189gvc5v0ggy4xm81f0467al20qzbfb0gw2vg4l7y07bf3fzzvq8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1719c6bfc346e63f58221ea2c6e625b98f4ea368/recipes/treemacs-magit"; + sha256 = "10c32rf76w26hhg1pyjlwj94adpjz1kic4hzapbckvcyzcwz6fql"; + name = "recipe"; + }; + packageRequires = [ emacs magit pfuture treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-magit"; + license = lib.licenses.free; + }; + }) {}; treemacs-projectile = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -99325,12 +100898,12 @@ melpaBuild { pname = "treemacs-projectile"; ename = "treemacs-projectile"; - version = "20181227.747"; + version = "20190402.2237"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "bd32972d009d810380cebf6ad2c305a2c66fc496"; - sha256 = "04rbfqjkydn8mv3k2843bnqvfglvjgg3s3i5mp858yrkvy39a2rz"; + rev = "2392ac22caa196ed6850f0accf9d7cd24b11375d"; + sha256 = "0d1k9nmvycbw46b4fjsj15srnmdahfklrh3c6r6sr95ngwl17dic"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-projectile"; @@ -99380,12 +100953,12 @@ melpaBuild { pname = "trident-mode"; ename = "trident-mode"; - version = "20130726.1207"; + version = "20190329.433"; src = fetchFromGitHub { owner = "johnmastro"; repo = "trident-mode.el"; - rev = "ad3201f47e114de35df189c3d80f0fdea9507ea9"; - sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym"; + rev = "a128f766e1138e6e04146312b7c8ebbad0dae131"; + sha256 = "141gvvwzql7pnv0d161cj2hpvpkav27lp1gdk1ilf45b3fqqqa87"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/trident-mode"; @@ -99613,12 +101186,12 @@ melpaBuild { pname = "tuareg"; ename = "tuareg"; - version = "20181218.1954"; + version = "20190407.807"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "f1fb36d2dbc34c989300662a4d94d7cdd8234f9e"; - sha256 = "16blfmnf2hgzlwrn23klnwwsq5kfc2d22zyfccpbi7x7amx2x2ln"; + rev = "9157f25980dede0599c6f9a42cc492081752f515"; + sha256 = "0lvjh3a1sl1y29hsfh8dm7hjf25q0mmagdiv8bm07a680wgfii9x"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -100302,6 +101875,32 @@ license = lib.licenses.free; }; }) {}; + undo-propose = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "undo-propose"; + ename = "undo-propose"; + version = "20190322.917"; + src = fetchFromGitHub { + owner = "jackkamm"; + repo = "undo-propose-el"; + rev = "036e66c1ac4b0358b34727d2c9b65853347dad89"; + sha256 = "1ah2x0fwf2ybz3i4cjs19fmx7aq1xfgnh4x623qy12v7ab4pvd3m"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/308eec15ebfd301b34f0d9f019250c9089c4d6e2/recipes/undo-propose"; + sha256 = "0r0xswj9n24ghw44l1m1izapjqrfvcw8qn3qp61s2ly0i7la185j"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/undo-propose"; + license = lib.licenses.free; + }; + }) {}; undohist = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -100565,12 +102164,12 @@ melpaBuild { pname = "unicode-troll-stopper"; ename = "unicode-troll-stopper"; - version = "20151023.1831"; + version = "20190208.2011"; src = fetchFromGitHub { owner = "camsaul"; repo = "emacs-unicode-troll-stopper"; - rev = "7d1331b17b29db56fbdaecec39e5fcac5b92e46f"; - sha256 = "1zpqm309x73af2i6qch7qqwr1ibnkz0r0jyvw6py4imnank9hg83"; + rev = "5e8be35a7bf6382384a701663f7438ee27e4b67c"; + sha256 = "0xjh017kjhj93j72r5hdpiabv76szlmpivlfyhg9vzysdmix45qv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b463925a98b7dde78d85693c7681fd2346d90895/recipes/unicode-troll-stopper"; @@ -100773,12 +102372,12 @@ melpaBuild { pname = "unkillable-scratch"; ename = "unkillable-scratch"; - version = "20181203.1521"; + version = "20190308.1617"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "unkillable-scratch"; - rev = "dac9dbed946a26829e6227ac15c0fa1d07ccd05f"; - sha256 = "0fgipv93x47cvyww07cqx8xa95jz36y6fy5rmaq40jnnmdkgq862"; + rev = "a484c27516f2ee20e239713a95bd7de4f35f8501"; + sha256 = "06pslqk97q858a3y6z7rgmc16nzqlkaj9phrqmxkq354lkllndlx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/822ac5610f333e41b676a29ef45a6f8bfea3162e/recipes/unkillable-scratch"; @@ -100854,12 +102453,12 @@ melpaBuild { pname = "uptimes"; ename = "uptimes"; - version = "20190101.1216"; + version = "20190328.156"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "deca207e40f713f6006f9d4cd12f91b3eaf71c53"; - sha256 = "0v9iyvdgqli80lf533dia9c05fia0xsc1wwiinwhlqm598wvf4sd"; + rev = "1f726d31b502d764a3e3191aaf92ed4855105131"; + sha256 = "1ymv5fh0bfjzkkd8vc9f1n8921bx1czbb29s0rw6zy37vkhs6v3s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -100922,6 +102521,32 @@ license = lib.licenses.free; }; }) {}; + urscript-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "urscript-mode"; + ename = "urscript-mode"; + version = "20190219.804"; + src = fetchFromGitHub { + owner = "guidoschmidt"; + repo = "urscript-mode"; + rev = "b341f96b129ead8fb74d680cb4f546985bf110a9"; + sha256 = "0qhncqsvsrpgc47ixsp436imfm0l6pd1kbpjjk426wrnzaszrpkc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b4ae680b51a85749ed254215bbd4a35909961049/recipes/urscript-mode"; + sha256 = "1jjmpg9r7vwa8284chx9yc1ifn36m7ml1ks4ls8hnsxachbv7wlh"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/urscript-mode"; + license = lib.licenses.free; + }; + }) {}; usage-memo = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -100956,12 +102581,12 @@ melpaBuild { pname = "use-package"; ename = "use-package"; - version = "20181119.1550"; + version = "20190405.1347"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "39a8b8812c2c9f6f0b299e6a04e504ef393694ce"; - sha256 = "1b7mjjh0d6fmkkd9vyj64vca27xqhga0nvyrrcqxpqjn62zq046y"; + rev = "0ee88b5cac41acf974c4bedb8859931ead8bfc79"; + sha256 = "0gv976iajc0qf9pbqyljc9mdnyirf353d3w6h38khwqmqv11p6br"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -101273,12 +102898,12 @@ melpaBuild { pname = "vagrant-tramp"; ename = "vagrant-tramp"; - version = "20160427.1632"; + version = "20190125.1059"; src = fetchFromGitHub { owner = "dougm"; repo = "vagrant-tramp"; - rev = "453ba605b28d2964bb4e10074f1e6891ebb4d2d6"; - sha256 = "138gw90wa2qyzyicig3cwhpb1xc5bh9g0vb87y91afjlykhzr6a5"; + rev = "77256deca35bb797cbba499837f3658d1a17d2e3"; + sha256 = "0j7ff9b3ic4a6kzn7k0c52knlgangql7sjsxahwvym6w18r52d5a"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/baea9f16e245aec3f62e55471358c7208f61372d/recipes/vagrant-tramp"; @@ -101479,12 +103104,12 @@ melpaBuild { pname = "vc-hgcmd"; ename = "vc-hgcmd"; - version = "20181228.57"; + version = "20190404.1202"; src = fetchFromGitHub { owner = "muffinmad"; repo = "emacs-vc-hgcmd"; - rev = "aef3092eb1d81e5fbcb65d92c519c587143fc8dc"; - sha256 = "1wv1jpl4s7vfvy1yx3kq64qpxcnjk2rv23wphr9z474bi6q776ac"; + rev = "6379ef242cc2ac8366a6e6f1c588245577c76a3a"; + sha256 = "1zvggg9kpl6d2wrsjlrnjmb0dhmwmd9x6q2yj3g08bv6gsz3nfil"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/111142342ab81dcaa88a831ba620be499a334c3f/recipes/vc-hgcmd"; @@ -101531,12 +103156,12 @@ melpaBuild { pname = "vc-osc"; ename = "vc-osc"; - version = "20161119.1155"; + version = "20190402.1649"; src = fetchFromGitHub { owner = "aspiers"; repo = "vc-osc"; - rev = "8c09a0d5f69237285101554261b77d76b546a24b"; - sha256 = "153zwhljkjl0dajd1l6p5icva0bnpa2rj8byjblb3xv8rq7p1fzc"; + rev = "bf5a515ed85f7d7cdfe66ed5bf4ef7554f8561e5"; + sha256 = "1jk09vspns327j9mfy32dd71n3nfynn17h2njc4sczrgd4yzc2wd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a1fa5fdfdfa9ec5607524be62eb44fe82e91b0/recipes/vc-osc"; @@ -101556,12 +103181,12 @@ melpaBuild { pname = "vcomp"; ename = "vcomp"; - version = "20140906.1508"; + version = "20190127.1620"; src = fetchFromGitHub { owner = "tarsius"; repo = "vcomp"; - rev = "092ef48a78e950c0576269d889be6caf9f6e61c5"; - sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl"; + rev = "f839b3b3257a564b19d7f9557dc8bcbbe0b95842"; + sha256 = "1xd42bdi6x89gc9xjrwvzzdaanv9vwlbbjwp25bs1nsd53k5nvak"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/561442ea9f75ebe8444db1a0c40f7756fcbca482/recipes/vcomp"; @@ -101583,12 +103208,12 @@ melpaBuild { pname = "vdiff"; ename = "vdiff"; - version = "20180920.1020"; + version = "20190226.1903"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "3bfb5decd7fcef73759b247b29aeae669fb79499"; - sha256 = "0l8si73dz9ch6gbl76ibhginzi8l92y3xa7w7jnr6hsyskrrlpid"; + rev = "a1a82dec623a241b0e9ed19fd65da6e7073d59ac"; + sha256 = "15b33ksy7m1128zz8d300z5b6hx2d9hhrfyb2h67rggaq7qh82za"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -101607,23 +103232,24 @@ , lib , magit , melpaBuild + , transient , vdiff }: melpaBuild { pname = "vdiff-magit"; ename = "vdiff-magit"; - version = "20180819.1102"; + version = "20190304.907"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff-magit"; - rev = "2589b93a0a789b1d86e607cb84979c6a837eb008"; - sha256 = "0cgmxm8rgla3iadwfla21xnxq7a10cwk9r2akk6hp2fpq2i38il9"; + rev = "b100d126c69e5c26a61ae05aa1778bcc4302b597"; + sha256 = "16cjmrzflf2i1w01973sl944xrfanakba8sb4dpwi79d92xp03xy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit"; sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw"; name = "recipe"; }; - packageRequires = [ emacs magit vdiff ]; + packageRequires = [ emacs magit transient vdiff ]; meta = { homepage = "https://melpa.org/#/vdiff-magit"; license = lib.licenses.free; @@ -101693,12 +103319,12 @@ melpaBuild { pname = "vdm-mode"; ename = "vdm-mode"; - version = "20181127.1223"; + version = "20190328.708"; src = fetchFromGitHub { owner = "peterwvj"; repo = "vdm-mode"; - rev = "e131edb0d35de28bd47d6128dd70d9a6fc46e0fa"; - sha256 = "090a0imk7dr6vqq4lf806pvajqc499x2gmi0k7rgc1696rbyzhb5"; + rev = "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d"; + sha256 = "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a6c89d41235f7e8463a47400004a32b2979a5a/recipes/vdm-mode"; @@ -101720,12 +103346,12 @@ melpaBuild { pname = "vdm-snippets"; ename = "vdm-snippets"; - version = "20181127.1223"; + version = "20190313.422"; src = fetchFromGitHub { owner = "peterwvj"; repo = "vdm-mode"; - rev = "e131edb0d35de28bd47d6128dd70d9a6fc46e0fa"; - sha256 = "090a0imk7dr6vqq4lf806pvajqc499x2gmi0k7rgc1696rbyzhb5"; + rev = "dc1756dd151752b3f538d68326059f8861e4ac66"; + sha256 = "02pkiz700g86n7fs1rygp6im0rhx6x8ag7fjc8sci02igf74hb30"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f246b9dcf7915a845b9e2cd44cc1a0833b412c8f/recipes/vdm-snippets"; @@ -101851,12 +103477,12 @@ melpaBuild { pname = "vertica-snippets"; ename = "vertica-snippets"; - version = "20181212.827"; + version = "20190403.256"; src = fetchFromGitHub { owner = "baron42bba"; repo = "vertica-snippets"; - rev = "8558a97b1ddba0f9372e19dd02702ea472ff9eb6"; - sha256 = "1dqzjgarvdniv0qcgp5652v2wrr6zdl4sgywi5dzr3bikpfy6zs2"; + rev = "b7a2e9660762a213fa001355e67ca671d9496339"; + sha256 = "0n5f5zgg7yvy6f5l746vi7z4y9gmjk7m9bdk68xhfz8pgyjaji3s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c8cb5c0fdbb6820a08091d8936dd53a3c43c56/recipes/vertica-snippets"; @@ -101925,25 +103551,26 @@ , fetchurl , ggtags , helm + , helm-rg , lib , melpaBuild , outshine }: melpaBuild { pname = "vhdl-tools"; ename = "vhdl-tools"; - version = "20181115.936"; + version = "20190301.506"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "536a265d74c6fb750f35d50950bdccf12f929512"; - sha256 = "0x2xmk1ix16qdnjz1qi0vvycmqz7z95zkiqh4wymjmanvnqbwlrn"; + rev = "d2c072a0426fa413227f1e4f7ef9fe76c0eb412b"; + sha256 = "0bqdz4iiv5d58bsc0pjx3npr5n8f7wzikv0l0jcpw70v4v6337r6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw"; name = "recipe"; }; - packageRequires = [ emacs ggtags helm outshine ]; + packageRequires = [ emacs ggtags helm helm-rg outshine ]; meta = { homepage = "https://melpa.org/#/vhdl-tools"; license = lib.licenses.free; @@ -102164,12 +103791,12 @@ melpaBuild { pname = "virtualenvwrapper"; ename = "virtualenvwrapper"; - version = "20180211.1744"; + version = "20190223.1119"; src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "bf13158dde071bdf4901709ed101aba6b8a25f7f"; - sha256 = "003nj9i6kfjyw1bdz1y3dssp3ff7irhsfq21r430xvdfnzrby4ky"; + rev = "f753e5ad91c2ff5d11bec424aa8cec141efa6925"; + sha256 = "062pbnplb3w9h64qsj71d9fvgicp1x63n05mgvgymjh2rnx7py0d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -102240,12 +103867,12 @@ melpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "20180919.57"; + version = "20190405.1454"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "33f68b9d94b5877f21209b68438a3cd95f801dc1"; - sha256 = "1cd3d29blpxappd32m61m9y64ss252byl15xb2jkxjc731bk3z55"; + rev = "a84e36e483ac14eddf1a905e9025534a06bbc0d1"; + sha256 = "1l7j6h9x57gr46i88h830fg4qs2yqi5r08z6vdxnx4m5gdv0ll0s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -102499,12 +104126,12 @@ melpaBuild { pname = "vue-mode"; ename = "vue-mode"; - version = "20180826.1715"; + version = "20190212.1412"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-mode"; - rev = "e5faa5767308dcd87139813957eabba62b7caf19"; - sha256 = "1lw647sjrmwll5hxb027xpd8ax4pjp00ksr3ndjrpfj0zqpnad04"; + rev = "a2e60b0fd245f8f502025dd32399a9f10b82dcb3"; + sha256 = "1ybz7djmcp2mpga04g7jlsfkjirajg8w5z6jx0dsyqk69rd21gln"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/vue-mode"; @@ -102575,16 +104202,16 @@ melpaBuild { pname = "w3m"; ename = "w3m"; - version = "20181022.155"; + version = "20190404.1609"; src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "w3m"; - rev = "f392ad9864d3ec30e8b8151bdbd714f51be21bf3"; - sha256 = "03pjc431ql4kxdspa991d4aagb110qmqm604mq0fhvvhflc36fz8"; + owner = "emacs-w3m"; + repo = "emacs-w3m"; + rev = "0b85cb2dd4deb348edff25b40e17332af49ad981"; + sha256 = "0sjc6giwzvkndyh6r6v2jiggdqln6y8v39809dn9lj0gj9wz3p4d"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; - sha256 = "0a4jql7ky62ickccbr2xnyggix5wf726d4pfz7mi3yxlw6i8m79s"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/85c53c48caab0845101c487e4fee7e2cda15f706/recipes/w3m"; + sha256 = "1fnib1y79g50jz9wll63j0xf2awgkrlk6hwx0w6nzg0xsbfbkdvk"; name = "recipe"; }; packageRequires = []; @@ -102812,12 +104439,12 @@ melpaBuild { pname = "wanderlust"; ename = "wanderlust"; - version = "20181209.536"; + version = "20190406.601"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "d1df17c48972e006a7f74f7145461365576e2201"; - sha256 = "192np4fh5msfq1lac8z03ccaq0l0h222snb2a1jfxr8149b9jncj"; + rev = "6528a0032342ec7bf6a95dda9b60d67292eaadfc"; + sha256 = "0pdqz0ypdxr90zlna7jhcvvxbqjn367amxh91f76npvrcpi1s016"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -103118,12 +104745,12 @@ melpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "20181213.2258"; + version = "20190301.900"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "5da977bec7714c09d41b556e2d651ccb269a14a2"; - sha256 = "0r21ixka96fn22blh9gvnqar99w7bnlnd092s8d8ihy25rm0qrr0"; + rev = "c8a3b33e088d2a910c000804966b804bba33f982"; + sha256 = "04py5kqzhmgw2g9rqjlx9cffz71xbcdn1sjiglibmawqgy83chk3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -103223,12 +104850,12 @@ melpaBuild { pname = "web-server"; ename = "web-server"; - version = "20140905.1706"; + version = "20190309.1813"; src = fetchFromGitHub { owner = "eschulte"; repo = "emacs-web-server"; - rev = "469cd3bc117bfb8da0c03a2a2fb185e80c81d068"; - sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05"; + rev = "cafa5b7582c57252a0884b2c33da9b18fb678713"; + sha256 = "1c0lfqmbs5hvz3fh3c8wgp6ipwmxrwx9xj264bjpj3phixd5419y"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70e724b4e6c76d0299d5ea8d2211f48c1c611afe/recipes/web-server"; @@ -103304,12 +104931,12 @@ melpaBuild { pname = "webpaste"; ename = "webpaste"; - version = "20190101.138"; + version = "20190310.348"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "521de6d9d50d1e382bc5425749c3d4958b321c9b"; - sha256 = "11981fhh8vf6cjvcppg5ilk0yysfx91jhglk7jz49i5a3wwygxc3"; + rev = "7345c5f62d5cff4d84379eaf5dc8b2bb8bc4f99c"; + sha256 = "00dfp2dyj9cvcvvpsh4g61b37477c8ahfj3xig2x2kgfz15lk89n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -103330,12 +104957,12 @@ melpaBuild { pname = "websocket"; ename = "websocket"; - version = "20180422.1716"; + version = "20190405.2119"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308ba"; - sha256 = "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52"; + rev = "d34f5f095dced553eb3f30924a22a88e6763f4b4"; + sha256 = "08qi79a0lb2d3hqbv3hanwwhhqv29z5h97v4417apnd045jl855k"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -103541,12 +105168,12 @@ melpaBuild { pname = "wgrep-helm"; ename = "wgrep-helm"; - version = "20181228.1724"; + version = "20190401.1456"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "36c5e8d0e03bc16b19d30a603730065f74b5b767"; - sha256 = "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s"; + rev = "379afd89ebd76f63842c8589127d66096a8bb595"; + sha256 = "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-helm"; @@ -103618,12 +105245,12 @@ melpaBuild { pname = "which-key"; ename = "which-key"; - version = "20181114.632"; + version = "20190315.548"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "43e3e3d7641a8e1c298b37e6a277612bf0898708"; - sha256 = "1vwbgz0x8k6xy37kn6zkzf5p7z2wjsk3p3qv24d5ysd2257bf32c"; + rev = "187ac0eb8990b62d4bfd83aac10a0ae68cdd2ff5"; + sha256 = "0zl2vksl5jk3l23z4v7m05xha6l953c84zw1ffalcqxrrcs0737r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -103721,12 +105348,12 @@ melpaBuild { pname = "whitespace-cleanup-mode"; ename = "whitespace-cleanup-mode"; - version = "20170505.1923"; + version = "20190106.1222"; src = fetchFromGitHub { owner = "purcell"; repo = "whitespace-cleanup-mode"; - rev = "d375bfb61cb70947a93004cba8ea17a0bc76f5a9"; - sha256 = "0w6jwg1lyz0hwkhbx3kx6yddakff6azj2ipyxw26rv886gx8a226"; + rev = "72427144b054b0238a86e1348c45d986b8830d9d"; + sha256 = "1zlk534jbwrsabcg3kqlzk4h4hwya60lh6q2n1v4yn4rpf5ghsag"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode"; @@ -104135,12 +105762,12 @@ melpaBuild { pname = "window-purpose"; ename = "window-purpose"; - version = "20180926.347"; + version = "20190405.401"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "2b640955235d0a50dd1e3128612f41d595bc6dc8"; - sha256 = "10zvkp5vg1pg06p5mjghnnfkwpjx50527kx4ygdm84b1pxrnwlr6"; + rev = "fb649bb07de63a70ecdace464eadcaafe01e1995"; + sha256 = "1x8njfpb21siqh4b931557qdj4qxvzcj995dm91l6c3k8yh76hy8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -104319,8 +105946,8 @@ version = "20180520.58"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "cca15c7abc86"; - sha256 = "0nq8d2411fizphcq8157cfazghvsz1gy534fsan9ik30k9fnb5vn"; + rev = "62d6a170aefd"; + sha256 = "1hz5f70s6zi1mnz8si2zwj8n15jfqgqn5ag06h3x50w53hvzk41p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -104368,12 +105995,12 @@ melpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "20181113.1045"; + version = "20190224.131"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "9dd9f176d96abc60365369de6d08c26c414ef1f3"; - sha256 = "16a71mld7knf5ppv4szlkfdq44cqi36jqmscn0fssffhg33xh8cs"; + rev = "38df9bfc2227bcb7ac4899c83a03756d5f171450"; + sha256 = "00jz4a3004w10l6ip7wcb4zbvlsi8wbgnjpgr5p030y21q6gk5ki"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -104450,12 +106077,12 @@ melpaBuild { pname = "with-venv"; ename = "with-venv"; - version = "20181219.1843"; + version = "20190123.1834"; src = fetchFromGitHub { owner = "10sr"; repo = "with-venv-el"; - rev = "d12341b93420f4acd7a277ed0cd4a54767bc5bd6"; - sha256 = "0knv2ybf4sbn31zyg9ms44mxvmvg7b51krq320g8fpcpa1bq28s6"; + rev = "4dd29606e2f29de1488c0678736b3ea92876f09e"; + sha256 = "1i3dsvkvcmf5zmfwy988bz9wp7jbcpdrijdzcfqyy5spkqgv031c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/555a2e49f18fbae59913459466babf8d55bd2151/recipes/with-venv"; @@ -104663,12 +106290,12 @@ melpaBuild { pname = "worf"; ename = "worf"; - version = "20180620.1011"; + version = "20190404.323"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "b48e0c9bbd617ed8a8962174d804ce7a6da1c10a"; - sha256 = "14xik793sgjcg8nby8v77x1x8zspgkhz95kzzlzqalbblak3mgbs"; + rev = "57c4c1a02532fdc8c2393cec69d89ef423ed529e"; + sha256 = "1nn2hkj0lnk81ga4976h2dbgfarnidrvcf9zfcz6gxxrsp7knh8c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -104824,12 +106451,12 @@ melpaBuild { pname = "writefreely"; ename = "writefreely"; - version = "20181130.422"; + version = "20190326.835"; src = fetchFromGitHub { owner = "dangom"; repo = "writefreely.el"; - rev = "016372a89987703a0903882db14aae13eacaf9bb"; - sha256 = "0xgp9c6ymqlgk641v1263a8wb12vc86i30dv6jqvjjkqxgmyb3kn"; + rev = "61296a15f31aef92972ffa6865edadaf4f4127ca"; + sha256 = "19ksdcnm0rm1imzysl9lb3nx5ysnfyx07krqghxs8kbd9c5zvlyc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55ea1ad03ce5b5178435b8042be383065795ee71/recipes/writefreely"; @@ -104876,12 +106503,12 @@ melpaBuild { pname = "writeroom-mode"; ename = "writeroom-mode"; - version = "20170623.327"; + version = "20190406.1435"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "9e924dd7dd83f10b026c89cddef7e1646f1a3869"; - sha256 = "1v7hbmi9dqdqyr3png1xwhg3k05jr2q6jdjmj48bxiixl9zhcq9p"; + rev = "ebe522ba5a0367cf82ed03ffeb63fe597b84f4a1"; + sha256 = "0w2lmkkij79khjpswk2zxj371fa9ws94j9dqzrgzf37lnimgnsff"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -105163,12 +106790,12 @@ melpaBuild { pname = "xah-elisp-mode"; ename = "xah-elisp-mode"; - version = "20181122.37"; + version = "20190124.2246"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "f306142c41f352e56e966bef9036f61b6bdeab4c"; - sha256 = "1vjhjjc5wyxqffz51d6y63m4ai1szcrv678273h8xzj744fal7li"; + rev = "a09c51e450bf4b39bdc3f4063c2946baec7ae3b1"; + sha256 = "0hpdm6qns2i5zpavqq6zd7dyl9lxsxyic52jzjfisqv3gjrz8zpp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; @@ -105189,12 +106816,12 @@ melpaBuild { pname = "xah-find"; ename = "xah-find"; - version = "20181201.249"; + version = "20190314.1339"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "cde62a040dda923279320a1ba7eafa30411b8545"; - sha256 = "1iz8x1axg4p6cch9qiw2vhmjwiqg9hn4s0nyryc5w1mg5qv3pcnm"; + rev = "a39f1ff9a7cf56e92b56c6f179741569b9172a48"; + sha256 = "16d2dh08dxdm06ik3sfx00filxqpy646vv1qh5kb36zs8ydzjg3z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find"; @@ -105215,12 +106842,12 @@ melpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "20181206.531"; + version = "20190222.2316"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "ff552e04ea66413cd0032643db6522f27e9d0e2c"; - sha256 = "0hba0qgq9wg9kbxfdkds4pchrvix154p8iq78xz4v4pagifyn701"; + rev = "cc8b3bc26998bc29f82e87667c0d1ef90894ff66"; + sha256 = "19q20mp5gzkm0ch5wz1jxajkb8cqmknsldlzb7jsa8hzyvl2mb7m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -105293,12 +106920,12 @@ melpaBuild { pname = "xah-math-input"; ename = "xah-math-input"; - version = "20181224.2234"; + version = "20190206.858"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "3569280ecf96198b50fa3c60069bbcd220345fd7"; - sha256 = "1ssqd3xvb03kv13kdihjvhzjjav27rnilawpq2ak3cbph6k03810"; + rev = "af787f87815b85d56c35bbe0f22e03a31c8e670d"; + sha256 = "05fqjyzz6c0nclhqc7qxs3hg99d3yxb3qjzn1wc26m6jcmm2l6zd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input"; @@ -105756,12 +107383,12 @@ melpaBuild { pname = "xresources-theme"; ename = "xresources-theme"; - version = "20181127.1041"; + version = "20190108.1051"; src = fetchFromGitHub { owner = "cqql"; repo = "xresources-theme"; - rev = "a36912dd953921b4cec943a0b0c20d546a889947"; - sha256 = "12lh3kfm5sls5c7y25jhfwpbif710aq92vipqn8bbcp945cq5lmq"; + rev = "5239acb51aa2dfa89a207e57012108d8fcf60562"; + sha256 = "13pls0f85n5rpbrbqcmrmcznv9hxiaglrnwpzivrli33cba92fpm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/xresources-theme"; @@ -105782,12 +107409,12 @@ melpaBuild { pname = "xterm-color"; ename = "xterm-color"; - version = "20180202.1518"; + version = "20190407.1110"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; - sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; + rev = "749307da49323883c15d8789a958fa74607228cc"; + sha256 = "0hh18vxkr71p4ipzly4w6jx4qy4c1zrfzz2q38vshh1x78lcm77l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -106170,12 +107797,12 @@ melpaBuild { pname = "yankpad"; ename = "yankpad"; - version = "20181115.1409"; + version = "20190319.716"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "61c2f74b2858f383e95f89f9002f510146f53c4e"; - sha256 = "1k5giq6fwmai4iijiqc5nx17mqahy61i2158xf0n8r7w80nfacmg"; + rev = "91effa1b160cc984c99f126152690da9cba95e30"; + sha256 = "03dqicig1axdadmj8xdzcwnnvvf3k8j0y5wjwjp6rszhzlk0ag60"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -106375,12 +108002,12 @@ melpaBuild { pname = "yasnippet-snippets"; ename = "yasnippet-snippets"; - version = "20181211.1419"; + version = "20190316.319"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "c1a5a04de9fb0d7f52565f6e0f2c9b446f9e247e"; - sha256 = "1cmxan7788dbclsdww5mv90sl5gwf6qs351np0j195b7bywz0my8"; + rev = "e378404d01ad031bdc88b9bcb01d5c877c26eca6"; + sha256 = "1g82j3a7y5f9viy24alg6ihd1535l2m6pdj4bg53j9nh19xi9jb7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets"; @@ -106427,11 +108054,11 @@ melpaBuild { pname = "yatex"; ename = "yatex"; - version = "20190102.1926"; + version = "20190406.910"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex"; - rev = "e947b9ae31c2"; - sha256 = "1h8f91imr85r29gqr1173i44jl1p4fc73grbf7fr5cwmsiqjwkc7"; + rev = "2ed79846fd53"; + sha256 = "0yx4679h2g7c8di7vbg9a2341fr988badibn1i38b1qjcrinfm1b"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex"; @@ -106572,12 +108199,12 @@ melpaBuild { pname = "yequake"; ename = "yequake"; - version = "20190101.1346"; + version = "20190114.1155"; src = fetchFromGitHub { owner = "alphapapa"; repo = "yequake"; - rev = "ca845ae228ad795cf52bfdef5c83bc2890d8c902"; - sha256 = "1ikmf2r85hdf1bg8hcsqd73mhvcjbvbzd2r4ic1aq96n8cahd1xl"; + rev = "e1e62d802db8d6ca513ebeaadf808c8a3b748086"; + sha256 = "1rpfqxr3735v0avbsqw01amxncd6wn4avky7k08k9p7n6kn3m4m2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/194968f221b2f60042a3684e1ca3e1c18adbde8e/recipes/yequake"; @@ -106809,12 +108436,12 @@ melpaBuild { pname = "zenburn-theme"; ename = "zenburn-theme"; - version = "20181014.855"; + version = "20190317.1146"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "d71a0f0556c1db785738ab9b0c989df342705a81"; - sha256 = "1pf9l138kdxqxgsjzarj4s3adqay4qfn3gqj6g84vw34wrncj4s1"; + rev = "0f14f780420602da823271fb2eb6251ff4daab9e"; + sha256 = "0anv22dhqpsgvag8vbvgdfbs50054715rhfj9z4qkysxwzzysmjr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -106965,12 +108592,12 @@ melpaBuild { pname = "zig-mode"; ename = "zig-mode"; - version = "20181130.1547"; + version = "20190108.1817"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig-mode"; - rev = "1f4ebf10660e5e09e61d042d7db9e1ec5e8ff0cb"; - sha256 = "1d67irx95jcf08mnqq17hngv6x49vpfssnplgv0lgpnps5d8g5nh"; + rev = "c2deea85dd65c3e73c2771c56a998cbdeb9ff717"; + sha256 = "10k7i2fj3imbq09fkcgd4kjp7n1dn46119jqrd6kbx5inlkq1782"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/zig-mode"; @@ -107017,12 +108644,12 @@ melpaBuild { pname = "zmq"; ename = "zmq"; - version = "20181203.1118"; + version = "20190326.852"; src = fetchFromGitHub { owner = "dzop"; repo = "emacs-zmq"; - rev = "f9877d8d8086d81007e2f1b2d4bd489c9b87b3b0"; - sha256 = "1a2yq65i49fhyqz4hbznp6f31138bdh17nkhv62wrb296mdm7751"; + rev = "3965bec1ac232f0f7f35e7e91626e192688407b4"; + sha256 = "02lcgq53gsg3li6fhga4njxfs5vb6xdh07r8z4cq9rmwfm0wilfq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq"; @@ -107382,12 +109009,12 @@ melpaBuild { pname = "zoutline"; ename = "zoutline"; - version = "20180314.1059"; + version = "20190211.851"; src = fetchFromGitHub { owner = "abo-abo"; repo = "zoutline"; - rev = "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699"; - sha256 = "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8"; + rev = "2232139b64f9adabe81f48dd8d2f059e3f19edda"; + sha256 = "1hq8m8n1zq63k04z9h1wmp69r8mv6vb9fzxgslwl683kid6srqwi"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; @@ -107566,12 +109193,12 @@ melpaBuild { pname = "zzz-to-char"; ename = "zzz-to-char"; - version = "20181231.2307"; + version = "20190216.257"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "2174905bea07862fc51e5c1cd3f9327f49bcbefd"; - sha256 = "1qxdvi5dh1wg0702s6n8j0hvrgcv7hxp9as4y4cl3cjlli3p07jl"; + rev = "9f08bf94c56a39a2b65f90b852da76dfa6ec2a6f"; + sha256 = "1ln22xcqcs6hbxs99lmwhsjx1rbg7ksfpl17zfsvpnf5c28by3lm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; @@ -107584,4 +109211,4 @@ license = lib.licenses.free; }; }) {}; - } + } \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 7fc32bfc4bce..6f15d33f78b6 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -133,11 +133,7 @@ self: maxframe = markBroken super.maxframe; magit = - (super.magit.override { - # version of magit-popup needs to match magit - # https://github.com/magit/magit/issues/3286 - inherit (self.melpaPackages) magit-popup; - }).overrideAttrs (attrs: { + super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index b359c5dcc1f4..e1f83e9cefad 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -103,6 +103,35 @@ license = lib.licenses.free; }; }) {}; + abs-mode = callPackage ({ emacs + , erlang + , fetchFromGitHub + , fetchurl + , flymake ? null + , lib + , maude-mode + , melpaBuild }: + melpaBuild { + pname = "abs-mode"; + ename = "abs-mode"; + version = "1.5"; + src = fetchFromGitHub { + owner = "abstools"; + repo = "abs-mode"; + rev = "a9a512992f681669dc59fe9ca86f12b9688b5454"; + sha256 = "0v6d7cxnj4mil7c7y4m1csiznl6rmzxg9snwhhv6wdqfw112kn8j"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aabccc4061e7764069796e12ee9688b67651cf70/recipes/abs-mode"; + sha256 = "148y99iaxcnjaacw017chwq0sq05ywgy5jx1lhp9ly7innrl9i1k"; + name = "recipe"; + }; + packageRequires = [ emacs erlang flymake maude-mode ]; + meta = { + homepage = "https://melpa.org/#/abs-mode"; + license = lib.licenses.free; + }; + }) {}; abyss-theme = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -628,7 +657,7 @@ melpaBuild { pname = "ac-php"; ename = "ac-php"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; @@ -660,12 +689,12 @@ melpaBuild { pname = "ac-php-core"; ename = "ac-php-core"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "40250a537830981104022f9afdb6202eb2692b82"; - sha256 = "12smcyc1gzgd3kxvas55n87biwc74ilnjfsg5rcjp0s10iiggkww"; + rev = "e270e65338d5e57d0df4e167d39cd7c11537f385"; + sha256 = "16ahvzqlbla7qid7xq0s6g1s8pfxxixvjq7vh0v2w5c1rvqc2vb7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -715,7 +744,7 @@ melpaBuild { pname = "ac-rtags"; ename = "ac-rtags"; - version = "2.21"; + version = "2.31"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; @@ -1477,7 +1506,8 @@ license = lib.licenses.free; }; }) {}; - alert = callPackage ({ fetchFromGitHub + alert = callPackage ({ cl-lib ? null + , fetchFromGitHub , fetchurl , gntp , lib @@ -1486,19 +1516,19 @@ melpaBuild { pname = "alert"; ename = "alert"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "b301478e34a5c8bd27c17fc7605e6dd576e97935"; - sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26"; + rev = "9f329be87820474925f29b52a1131084c8ea95b9"; + sha256 = "0lc0p5cl4hfrzw1z2ghb11k1lvljn5m08jw5fmgwgxv667kwh49r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118"; name = "recipe"; }; - packageRequires = [ gntp log4e ]; + packageRequires = [ cl-lib gntp log4e ]; meta = { homepage = "https://melpa.org/#/alert"; license = lib.licenses.free; @@ -2287,12 +2317,12 @@ melpaBuild { pname = "assess"; ename = "assess"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "phillord"; repo = "assess"; - rev = "87118057b3ae0e6542fa5e22050eb44d6efe8baa"; - sha256 = "0cilb32zr38x9kfzfyr1ciag5pzbgp1dk62r7lhn8dxc2ip6f11j"; + rev = "7a3189a5870fb20d179ff3ea761707a046814966"; + sha256 = "0qif6q4j0i5p2izj9p7sv1j2s6a95zklswfx8x2shv22dkphznkl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; @@ -2527,12 +2557,12 @@ melpaBuild { pname = "auto-compile"; ename = "auto-compile"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "bed783e7a85d5812cf1cb3f39c40ba718e015be6"; - sha256 = "1nsv5j84gmr51gg49lc5pany1jkf6wlrnb62hbpyl19jsy7il8mc"; + rev = "e6bbb1371324c8884af3b201e9adbc9296eb2ff4"; + sha256 = "1jyn7yvbvk7cydy3pzwqlb0yxf5cxdiipa1gnigdk9wdbj68wjjk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -3142,12 +3172,12 @@ melpaBuild { pname = "backline"; ename = "backline"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "backline"; - rev = "035de23bbf2ca00e69095596b5b9b3ddfa364984"; - sha256 = "1b57iipkd78ryx71ygwampjm5mbwdb9mxnxpfs2wsm1zz8024xak"; + rev = "960deaef1d87658f79a0bd95c85946371d211590"; + sha256 = "017w7qa74laq04h359znn9kjsqpl91gypsqsldpnlrb25jw0z0gl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f252e45e8bd6e8af1267755d108f378a974ddaf1/recipes/backline"; @@ -3288,26 +3318,28 @@ license = lib.licenses.free; }; }) {}; - bbcode-mode = callPackage ({ fetchFromGitHub + bbcode-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "bbcode-mode"; ename = "bbcode-mode"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lassik"; - repo = "bbcode-mode"; - rev = "73c56a40301c8b017d3e64c08dccc80d1dc47e59"; - sha256 = "0g0dxk33pz18awv7ncv64c2a4lmdx9sigppkvq2mb9za47azk8dh"; + repo = "emacs-bbcode-mode"; + rev = "e16619c80ea21154b4a4ccc2e13d0077e97c9caf"; + sha256 = "0l7jygskxmbckf3xhbjzgwzkrj2m6z1n3i2l7qc9ii4i3mhpx0ai"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ef095d23cc043f5d14a9deea788ed71d90c586c/recipes/bbcode-mode"; - sha256 = "1kfxzp0916gdphp4dkk4xbramsbqmg6mazvfqni86mra41rdq6sb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57c307eecfc0fccfdc525ce6ff63a69ff3b78874/recipes/bbcode-mode"; + sha256 = "0rrhvwb4hrg2sbjbpgdghcgrc6gwpq3vax28r5mlacn5w5x31qjb"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/bbcode-mode"; license = lib.licenses.free; @@ -3595,6 +3627,33 @@ license = lib.licenses.free; }; }) {}; + bibclean-format = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , reformatter }: + melpaBuild { + pname = "bibclean-format"; + ename = "bibclean-format"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "peterwvj"; + repo = "bibclean-format"; + rev = "b4003950a925d1c659bc359ab5e88e4441775d77"; + sha256 = "1x5hbs9j4ms93p080267kjyqpk81il3x7q87awf6qzz5xhc20d3b"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a96cc66b22e7ec145ffa3031089a3d60e77b8c42/recipes/bibclean-format"; + sha256 = "1lvi1r612jb6w0j6mbq93gk9f7hmb1pn42lfs47gvf0prmjf1zyb"; + name = "recipe"; + }; + packageRequires = [ emacs reformatter ]; + meta = { + homepage = "https://melpa.org/#/bibclean-format"; + license = lib.licenses.free; + }; + }) {}; biblio = callPackage ({ biblio-core , emacs , fetchFromGitHub @@ -3882,6 +3941,33 @@ license = lib.licenses.free; }; }) {}; + bnf-mode = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "bnf-mode"; + ename = "bnf-mode"; + version = "0.3.2"; + src = fetchFromGitHub { + owner = "sergeyklay"; + repo = "bnf-mode"; + rev = "ac004f60012d648bf8c0e87d841935461279587a"; + sha256 = "0v9lc2kr8x8r59z7vlv89l7slcq3m05k9abd5ds46v4xv15bh2jp"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/217bde4ccd2d68dc14b1bfee22fbc99cd4109952/recipes/bnf-mode"; + sha256 = "027pn2lvqsxyj9ii5svql2sw4xm9wrd9zy7ms8vayv737w5xd3n1"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/bnf-mode"; + license = lib.licenses.free; + }; + }) {}; bnfc = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -4025,12 +4111,12 @@ melpaBuild { pname = "borg"; ename = "borg"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "borg"; - rev = "99d166796f181741ebd79542b96824b096bcb36c"; - sha256 = "08jryf96v5cf1yl0jd6y84f3q2g75yiv6z2044y53llk1rxpcrhw"; + rev = "4ffec24967ba805be2b2f1750e7cfffb85e26a1f"; + sha256 = "0hrl6sg6p73d8f7xkpr3z30k4w5f5c52ygcd4db8zrh8lgnvxb9q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; @@ -4858,12 +4944,12 @@ melpaBuild { pname = "camcorder"; ename = "camcorder"; - version = "0.2"; + version = "1.0"; src = fetchFromGitHub { owner = "Malabarba"; repo = "camcorder.el"; - rev = "a2b5e0629ee3c01ead684e148965ac68e533efbd"; - sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6"; + rev = "b11ca61491a27681bb3131b72b51c105fd996bed"; + sha256 = "11p42cmk9sj2ilpx6nnlbzff85qi0m27wk49da2ipal28wcx2452"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder"; @@ -4901,6 +4987,35 @@ license = lib.licenses.free; }; }) {}; + cangjie = callPackage ({ dash + , emacs + , f + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "cangjie"; + ename = "cangjie"; + version = "0.7.2"; + src = fetchFromGitHub { + owner = "kisaragi-hiu"; + repo = "cangjie.el"; + rev = "f4dcb691e3bda6971cb89b07f368dd285179a8ff"; + sha256 = "0hvwaj1g1szyhjvyxhwflq45bbcvvgv391wa7qkwlxmrvvfhp9k2"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ed79fc972f7fe69d7bad5d1cdde3a276885a9fe8/recipes/cangjie"; + sha256 = "0gdp6dlkzkkd8r3cmwakwxlxsbysb351n1lr9sq4d60gbbskklln"; + name = "recipe"; + }; + packageRequires = [ dash emacs f s ]; + meta = { + homepage = "https://melpa.org/#/cangjie"; + license = lib.licenses.free; + }; + }) {}; cargo = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -5566,12 +5681,12 @@ melpaBuild { pname = "cider"; ename = "cider"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "91210f6866c8f034b956eac74694db8ea28d3b9a"; - sha256 = "1kvv1cyp2x744ixxhrg2573v3b5b9lxpqc3ijawwvwc0z6sy77aq"; + rev = "200c88adb1314b5811ba749af42ffb6817c1ca1b"; + sha256 = "0lbrwj67fnvynkdkzvnzp3p8vqlz0ldrcs317vg60bqfhx7hvqkj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -5596,25 +5711,24 @@ , eval-sexp-fu , fetchFromGitHub , fetchurl - , highlight , lib , melpaBuild }: melpaBuild { pname = "cider-eval-sexp-fu"; ename = "cider-eval-sexp-fu"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider-eval-sexp-fu"; - rev = "6b437bf073b21543e72d76fd0392a28fba7cbfbe"; - sha256 = "1frpr5dwg7aa0pjr2sarck498lj11li8xi36s5qa8qhflgl29jpn"; + rev = "7fd229f1441356866aedba611fd0cf4e89b50921"; + sha256 = "01gky548v3758fyr317lkwsc9aacab6m9d9vk1mrr3qyvmciwd51"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/947f4d106d70f95ca8aac124ab0d90b2975208df/recipes/cider-eval-sexp-fu"; sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq"; name = "recipe"; }; - packageRequires = [ emacs eval-sexp-fu highlight ]; + packageRequires = [ emacs eval-sexp-fu ]; meta = { homepage = "https://melpa.org/#/cider-eval-sexp-fu"; license = lib.licenses.free; @@ -5706,12 +5820,12 @@ melpaBuild { pname = "circe"; ename = "circe"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91f"; - sha256 = "10gi14kwxd81blddpvqh95lgmpbfgp0m955naxix3bs3r6a75n4s"; + rev = "6ccd4b494cbae9d28091217654f052eaea321007"; + sha256 = "0cr9flk310yn2jgvj4hbqw9nj5wlfi0fazdkqafzidgz6iq150wd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -6049,12 +6163,12 @@ melpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.9.1"; + version = "5.10.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "e8d6414043dc063d16598dc951c1ba8168738265"; - sha256 = "0mz7zbm9z99k01jgni990x7jpghfnngxnrw1cz65y5lxwyxibnaz"; + rev = "a4ed7a4152f8a6514dd3fd82532aa5a2bdba024f"; + sha256 = "09l1zjnc2g028nw9jv3ksklmff0ar3m5n89qxmdb2nz3ncmj0lir"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -6075,7 +6189,7 @@ melpaBuild { pname = "clojure-mode-extra-font-locking"; ename = "clojure-mode-extra-font-locking"; - version = "5.9.1"; + version = "5.10.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; @@ -6146,6 +6260,35 @@ license = lib.licenses.free; }; }) {}; + clomacs = callPackage ({ cider + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s + , simple-httpd }: + melpaBuild { + pname = "clomacs"; + ename = "clomacs"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "clojure-emacs"; + repo = "clomacs"; + rev = "d9783d42dbab9710afff5654bf931b00e9df4ac1"; + sha256 = "0jwnsyg0vi9ghn9yfd97rjj9j9ja3ig8h63n4zjw71ww3bcdldc6"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; + sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh"; + name = "recipe"; + }; + packageRequires = [ cider emacs s simple-httpd ]; + meta = { + homepage = "https://melpa.org/#/clomacs"; + license = lib.licenses.free; + }; + }) {}; closql = callPackage ({ emacs , emacsql-sqlite , fetchFromGitHub @@ -6261,7 +6404,7 @@ melpaBuild { pname = "cmake-mode"; ename = "cmake-mode"; - version = "3.13.2"; + version = "3.14.1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; @@ -6877,12 +7020,12 @@ melpaBuild { pname = "company-dict"; ename = "company-dict"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; - rev = "cc2f7aecc0a9d5b44c471a5550a49fd3ca535360"; - sha256 = "1swd87p4vxlxqcajfh0clypqdwdkn85k3iy9gms1hm4m23wj6a4m"; + rev = "cd7b8394f6014c57897f65d335d6b2bd65dab1f4"; + sha256 = "11whnjmy5dyg4wkwabpip8hqsmqys193m7aqbd7jl4hmq24hrwsw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; @@ -7160,12 +7303,12 @@ melpaBuild { pname = "company-lsp"; ename = "company-lsp"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "b93abde5bbc870170d2a2f5aa309be8a9618daf9"; - sha256 = "1jb75km5w2y7iawknyb5nhi1k4mlll4srd6vaf4zm7frmx50jwyc"; + rev = "4eb6949f19892be7bf682381cde005791a48583a"; + sha256 = "1hy1x2w0yp5brm7714d1hziz3rpkywb5jp3yj78ibmi9ifny9vri"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -7270,12 +7413,12 @@ melpaBuild { pname = "company-php"; ename = "company-php"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "440e4e63f88d2087305e738d0dae8edddfdcfb04"; - sha256 = "0f132gpc2kkbjjcq4kr1cw0ikjggvmz0z6f8ws7xmm5f5rnn6jg8"; + rev = "11234d073f363edff255e8632b728777e2807d01"; + sha256 = "15rinvamhzbx0n1fxwpq7nbjqgqvksgf4q8k3lkyy6ifchwiqys4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -7326,12 +7469,12 @@ melpaBuild { pname = "company-prescient"; ename = "company-prescient"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "1623a0d4e5b9a752db45923fd91da48b49c85068"; - sha256 = "0yan4m9xf4iia4ns8kqa0zsham4h2mcnwsq9xnfwm26rkn94xrw0"; + rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e"; + sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient"; @@ -7418,7 +7561,7 @@ melpaBuild { pname = "company-rtags"; ename = "company-rtags"; - version = "2.21"; + version = "2.31"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; @@ -7820,12 +7963,12 @@ melpaBuild { pname = "conllu-mode"; ename = "conllu-mode"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "odanoburu"; repo = "conllu-mode"; - rev = "b301934e852bac8942f671998cfcac669c7ea97c"; - sha256 = "15jfbs5k5anxbcsadvb1sz5a3vm96f976c1iga4k16jz16mkhjxa"; + rev = "d1b5b682e0a481ab74caed20bbca6177edb83080"; + sha256 = "1n98aqh3pyvaz1lwsqpcpv1nzrij79r342iiw2h90v4mf2r665dy"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode"; @@ -7924,12 +8067,12 @@ melpaBuild { pname = "copy-as-format"; ename = "copy-as-format"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "971957166fe64d914ec4be209b4f80efeeabbb19"; - sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24"; + rev = "d2376c64334fe3de65d89d6d138a2187f9bf802f"; + sha256 = "0i158bkra7zgq75j08knq2camvlhbs2v8zrsxiyp0mc4q949xysd"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -8060,12 +8203,12 @@ melpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; - sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; + rev = "525b2e4887dd839045313f32d3ddeb5cab4c7a7e"; + sha256 = "009n8zjycs62cv4i1k9adbb284wz2w3r13xki2740sj34k683v13"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -8145,12 +8288,12 @@ melpaBuild { pname = "counsel-etags"; ename = "counsel-etags"; - version = "1.7.4"; + version = "1.8.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "0bd1bf33088a3e31c01e7f239c5cd9c0b0468ab7"; - sha256 = "1dchql9r4qs9lv71hcpy72mdx83gxmmhyxpxkg836701246x1np1"; + rev = "e6fcff2254383fe680cc1d05580778128da2ca57"; + sha256 = "1d8nlrbsyza6q7yqm9248bxxsf49qf6hchg3zwv0l11acn3w8np5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -8199,12 +8342,12 @@ melpaBuild { pname = "counsel-projectile"; ename = "counsel-projectile"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "536872f022f449548bdb97faa1776d1d44499d73"; - sha256 = "0pm5sqhr24n2ffycazxgl3d3dl7gai8svwz01vc0pgx9c0x75kl8"; + rev = "d64e5275c578a494102852c466a3696bde466739"; + sha256 = "1inc4ndl0ysfwvxk4avbgpj4qi9rc93da6476a5c81xmwpsv8wmq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -8226,12 +8369,12 @@ melpaBuild { pname = "counsel-tramp"; ename = "counsel-tramp"; - version = "0.5.2"; + version = "0.6.2"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-counsel-tramp"; - rev = "5e3345f3d11f965e80763a3f68dca8a05f597224"; - sha256 = "0rjkgf5idbnkjscmg4n8wvwh2s7dpj0ic848icil2xhc4i189z7k"; + rev = "ac7728bac51afdcb63cd85ad22a8be5737d9d66f"; + sha256 = "0nz0733x2b9b5nkwivvhv5c8747dng451na1sdfbkx5x9fjs5gc7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp"; @@ -8826,7 +8969,7 @@ melpaBuild { pname = "cython-mode"; ename = "cython-mode"; - version = "0.29.2"; + version = "0.29.6"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; @@ -8921,32 +9064,34 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash + dante = callPackage ({ company + , dash , emacs , f , fetchFromGitHub , fetchurl , flycheck , haskell-mode + , lcr , lib , melpaBuild , s }: melpaBuild { pname = "dante"; ename = "dante"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "3500ade60c5c4e831b04c92c56dc888063335d3b"; - sha256 = "07nc1bgb67nlsf567cky6kvd3blm0w7nwpr92xga7jm6dqnqhlkg"; + rev = "3bd1bfdd775a309565a850e37dfbd42f1b33068e"; + sha256 = "0f76snwsy735r7pl3gdzvajsmpd12qkj03lyjxq1x44a79a1gfwk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "recipe"; }; - packageRequires = [ dash emacs f flycheck haskell-mode s ]; + packageRequires = [ company dash emacs f flycheck haskell-mode lcr s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -8960,7 +9105,6 @@ , fetchFromGitHub , fetchurl , lib - , lsp-java , lsp-mode , melpaBuild , s @@ -8968,16 +9112,16 @@ melpaBuild { pname = "dap-mode"; ename = "dap-mode"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { - owner = "yyoncho"; + owner = "emacs-lsp"; repo = "dap-mode"; - rev = "d1a27fd8e27f03d1a2bf2113f2f9f26ce648178c"; - sha256 = "0bp4giv3gjm3r9ws8qw260j29q7y5c5yj94afdhiqdj093yjv994"; + rev = "240da34149e2d8893b647f15ff30f217aba4ac89"; + sha256 = "1y3s28xb66w8yynwlavn6d7ysjv0d5ziyga5fjyj0jk1037mjg6y"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a50eb6f60824a0eb9baacd694274a1042ffc66ec/recipes/dap-mode"; - sha256 = "1vxqgi50wa151k1gc8ja8nma1v2qrinp26lwrn2w2jlihh1jpb3f"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/67942b34975015dd6f2b5f6b43829cc13b1832c6/recipes/dap-mode"; + sha256 = "041mmla70ld5783gn8g360klk3cw39pir5d41544zf3yssk12qpn"; name = "recipe"; }; packageRequires = [ @@ -8986,7 +9130,6 @@ dash-functional emacs f - lsp-java lsp-mode s tree-mode @@ -9084,12 +9227,12 @@ melpaBuild { pname = "dash"; ename = "dash"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9"; - sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl"; + rev = "63022432e1f7bcc5af9582f29d4ed0552a2e658b"; + sha256 = "0dx8q3jr8fh73cfl7mqi5dq0012ambpvc74d2c71fsv9rfw85693"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -9111,7 +9254,7 @@ melpaBuild { pname = "dash-functional"; ename = "dash-functional"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; @@ -9138,16 +9281,16 @@ melpaBuild { pname = "dashboard"; ename = "dashboard"; - version = "1.2.4"; + version = "1.3.1"; src = fetchFromGitHub { - owner = "rakanalh"; + owner = "emacs-dashboard"; repo = "emacs-dashboard"; - rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; - sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; + rev = "17accfce424a18c4120ad99dfc1d7d93591dbce0"; + sha256 = "0f40xj3wchpj3g9pv15f88vy86d0vllbwr1xli0yfv326lm0j97r"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; - sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef3c6af6ff5d880e6336f8db32b22b64b182794e/recipes/dashboard"; + sha256 = "19l7mv57ra3i8bz35zfq0wrrp8mk0bzhng6wqpbf9dax4pq3pnp9"; name = "recipe"; }; packageRequires = [ emacs page-break-lines ]; @@ -9156,6 +9299,34 @@ license = lib.licenses.free; }; }) {}; + dashboard-project-status = callPackage ({ dashboard + , emacs + , fetchFromGitHub + , fetchurl + , git + , lib + , melpaBuild }: + melpaBuild { + pname = "dashboard-project-status"; + ename = "dashboard-project-status"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "functionreturnfunction"; + repo = "dashboard-project-status"; + rev = "d3ac9f4992cc9ddad12f98e6ace26c8673ce473d"; + sha256 = "1zm566dq5xavfyma7304lvq78cpbblk22v2zgsbdy8hpk94rxj8m"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfc05873c6532c866d89c4cc07eb84b447a25c70/recipes/dashboard-project-status"; + sha256 = "1r25xmscz3lrjm6jjix416py26za5l1ck3xa77qbyrr4rf1gsakg"; + name = "recipe"; + }; + packageRequires = [ dashboard emacs git ]; + meta = { + homepage = "https://melpa.org/#/dashboard-project-status"; + license = lib.licenses.free; + }; + }) {}; date-at-point = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -9218,12 +9389,12 @@ melpaBuild { pname = "datetime"; ename = "datetime"; - version = "0.6.1"; + version = "0.6.4"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "178befd4881f407ad97c05fadb74589ade7297f2"; - sha256 = "12f5jv6x3lm08lz674783cqppr9khi56s028zc6bndq3qc797h4d"; + rev = "8c6d6fc991766e6bf9cefc4ea4b04eeae8116a84"; + sha256 = "0c5y304pvns8jhy4fpz4jmbfxdgz8ms04hgrnsb0g168szc9g0s9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime"; @@ -9626,6 +9797,34 @@ license = lib.licenses.free; }; }) {}; + dictcc = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , ivy + , lib + , melpaBuild }: + melpaBuild { + pname = "dictcc"; + ename = "dictcc"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "cqql"; + repo = "dictcc.el"; + rev = "3244897515db954eafeed9648e7a0011b89c3ce2"; + sha256 = "1nlgz3i8kynhl6d6h5rszja14z5n7ri83mm5ks90nbdhjcqwk3qd"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; + sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/dictcc"; + license = lib.licenses.free; + }; + }) {}; dictionary = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -9660,12 +9859,12 @@ melpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "069a92590000269a9a5b0b7aebbae9595675a59c"; - sha256 = "0557i1vw6pjn2gm9hc4nndy8hsgvymxnwab7pkxy8q4pwqd3s5na"; + rev = "84a5fe1900af2e5cc522f02749804f0d9f094bbf"; + sha256 = "1xlsg728mz3cwhrsqvisa0aidic67nymd9g7h4c1h3q63j39yb2s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -10174,6 +10373,31 @@ license = lib.licenses.free; }; }) {}; + dired-toggle = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dired-toggle"; + ename = "dired-toggle"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "fasheng"; + repo = "dired-toggle"; + rev = "509bf1f3c6d5e5f9bc29f94d88127e2d82d5c6ed"; + sha256 = "1h91z38bflj1z1zy798a4ngkny2f7gp03xbf222jiyhwc9djgg8q"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/17ae4c5ff42e0c48e53d93c88853f649f59034e6/recipes/dired-toggle"; + sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dired-toggle"; + license = lib.licenses.free; + }; + }) {}; dired-toggle-sudo = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -10260,12 +10484,12 @@ melpaBuild { pname = "direnv"; ename = "direnv"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "03c4edffba45722a9511d6d10992578f140d095f"; - sha256 = "1b8xp0yprpy1sc8hmim6jcdmgpc8yj6wjzgj4rdy77k7l96016v8"; + rev = "8ad3672c56d65b1eacc012cc51a36ed544b4b160"; + sha256 = "02blhinkkfh3iai6j1k5swplf5mkwijy3p7wy38rnd1gnyj2z4la"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -10492,12 +10716,12 @@ melpaBuild { pname = "django-commands"; ename = "django-commands"; - version = "1.3"; + version = "1.3.2"; src = fetchFromGitHub { owner = "muffinmad"; repo = "emacs-django-commands"; - rev = "51670fc54742aef03dde162c2fd73963d634dac8"; - sha256 = "1xfl74ac3n4rngpvg78mvq1v9riq8r0v9hshp6g0p3ka00hsn64k"; + rev = "1b19436a1160d1552207d4356d5e78793dabe100"; + sha256 = "1zb8mf0dgdr83n61a54m5grhdr6nz75zrgwczpzfl3f66xkvfci9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd217a23a9670c7eb826360b34df1a06ab3e450f/recipes/django-commands"; @@ -10524,12 +10748,12 @@ melpaBuild { pname = "docker"; ename = "docker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "39ba86d65417adb0a0a3f0a5ef8c76759544a6d1"; - sha256 = "1nwla26bza293cidkg6i1x88qaxdw0ydih8skpdlf7lpibzsl5cx"; + rev = "e127a157f8d0d9ffd465075ecf6558f36d2d3b24"; + sha256 = "1g8r1faqp0z0vqp9qrl8m84pa0v2ddvc91klphdkfmldwv7rfipw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -10693,12 +10917,12 @@ melpaBuild { pname = "doom-modeline"; ename = "doom-modeline"; - version = "1.4.1"; + version = "1.9.6"; src = fetchFromGitHub { owner = "seagle0128"; repo = "doom-modeline"; - rev = "804167cf5a05f0b0332fc9bdb8275cefb76622f2"; - sha256 = "15mqn38w6x2wamwp0llg5m9j57cnhm0mzczxp68ni74dwksgrgk7"; + rev = "64f1cf5de1689b76f04575758c07a74f1e9727a0"; + sha256 = "0yklidlr9dv508mzmpnxlffyrc49vs3dxi2axlzf4yd89ng7x4lm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline"; @@ -10765,6 +10989,32 @@ license = lib.licenses.free; }; }) {}; + double-saber = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "double-saber"; + ename = "double-saber"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "dp12"; + repo = "double-saber"; + rev = "5555dc28cbaa228fa8f9390738a4200e071380b8"; + sha256 = "06ykn84hp4yvf6z2457jqgyck70y30361l8617ilb7g337hk15xl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19f5c0195ad9b278a7aaa3fd8e70c0004cc03500/recipes/double-saber"; + sha256 = "0zsmyvlxm3my3xbj7m38539vk2dl7azi1v7jb41kdiavj2cc55zg"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/double-saber"; + license = lib.licenses.free; + }; + }) {}; downplay-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -10849,12 +11099,12 @@ melpaBuild { pname = "dracula-theme"; ename = "dracula-theme"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "1f649824d996b1ecdcc5980210b774f0cb950e9a"; - sha256 = "1gsj8na6nnz0vv9j215wdf39q834chc6pmk9mv8hcvcbdbc4f8wa"; + rev = "66e429f4d576346661ae3a111bafaa06febc1d94"; + sha256 = "0lyy8vjzzcfcj4hm7scxl4cg4qm67rprzdj7dmyc3907yad4n023"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -10975,12 +11225,12 @@ melpaBuild { pname = "dtrt-indent"; ename = "dtrt-indent"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "0ac070c9576e4ebab12cd6800ac2ac3abcecc2c1"; - sha256 = "0dambn5l0wvbhccvhh5hbz9hw66y4mp1la3wj85dl9kgr7hq1ry7"; + rev = "9ab9cb9d7f391fb09f61c9289c51c36374ddbcbb"; + sha256 = "0pgf0pvqd8k4yzhdn2df9lp0y8hmlm2ccrh07jivwlccs95pcz7z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -11049,6 +11299,31 @@ license = lib.licenses.free; }; }) {}; + dune = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "dune"; + ename = "dune"; + version = "1.8.2"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "dune"; + rev = "d7bfa6005cf6043df24d824ffc5a2243e70bce20"; + sha256 = "07c615kfpxawpv1fxlvk5nf48bcf54gs5fhad8fcvmknsq4lj7ib"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/06648d1d37767cbdc7588d7a8f709d679d478a3b/recipes/dune"; + sha256 = "1lqza4fjm9xxmdn8040bvsl467qzjy709dlmiq2241gfhxpmvvr7"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dune"; + license = lib.licenses.free; + }; + }) {}; dynamic-fonts = callPackage ({ fetchFromGitHub , fetchurl , font-utils @@ -11485,12 +11760,12 @@ melpaBuild { pname = "ebib"; ename = "ebib"; - version = "2.14.1"; + version = "2.16.3"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "712e2afeb6b8b61bd522d5f4eb91a267b4253912"; - sha256 = "193sbmxi9ny7829basy133jy7bcfxs0fv4gc4yyn3ykakawrbl20"; + rev = "4d842a1eec68e08acc9d4d77d7d7c3014d5cd55e"; + sha256 = "03fkj0grbv9xh1vb441rcxannjmkvaklqziwhxkrij287d2f0ak4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -11777,6 +12052,7 @@ }; }) {}; editorconfig = callPackage ({ cl-lib ? null + , emacs , fetchFromGitHub , fetchurl , lib @@ -11784,19 +12060,19 @@ melpaBuild { pname = "editorconfig"; ename = "editorconfig"; - version = "0.7.14"; + version = "0.8.0"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "c03200da052d316188da87e25192a07aced50095"; - sha256 = "19j2428ij7sqvrqs7rqg1mcnv9109y6drqba40dkv3vrkk5d2yia"; + rev = "4b6c34d5d77025a11ae68462af9bf0a822a13242"; + sha256 = "1b2cpqz75pivl323bs60j5rszwi787x6vy68csycikqz9mhpmjn9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; sha256 = "0zv96m07ml8i3k7zm7sdci4hn611n3ypna7zppfkwbdyr7d5k2gc"; name = "recipe"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/editorconfig"; license = lib.licenses.free; @@ -11970,12 +12246,12 @@ melpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "joaotavora"; repo = "eglot"; - rev = "23accee6dbf2eb7580fbb10f7ca09c13ba5700e8"; - sha256 = "0cdyfkack730yzydgph4hk34c0kv6521a6skqfjh0bxym2l9c7m0"; + rev = "35597d262b53bde52faa46ee6ae8c597d93114e8"; + sha256 = "1qx3ixaaaffhmbh3ifi5041lp7xp4ab4x4n1mal3wcpp70asxvdp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot"; @@ -12021,19 +12297,18 @@ , lib , melpaBuild , request - , request-deferred , s , skewer-mode , websocket }: melpaBuild { pname = "ein"; ename = "ein"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "fcf9bff0af071f5e2020ac77d9a9473325e4c5bb"; - sha256 = "1xk7k4av9hy0i7zqwpzis0rjp5myvxs52k45ah00zg8wi5hybq1x"; + rev = "f2e9193da64ee6a0398165e3d6f0855ab3d6eff2"; + sha256 = "10hkk5v9lgwcwr6kd095kpw1zab6658x3j17mwa6bfp2in2sjsv3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -12046,7 +12321,6 @@ dash deferred request - request-deferred s skewer-mode websocket @@ -12094,12 +12368,12 @@ melpaBuild { pname = "ejc-sql"; ename = "ejc-sql"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "a4db6db8a3f9d218bbba728c5ac2f2847df10343"; - sha256 = "1i0l3nzhqjarv9pi0jv1vwd2478v5ql7aajcxsigvakj0xg27dr9"; + rev = "82879290aca8ef1ec7a0f8b968b5b7f355907e8e"; + sha256 = "00qw1md2i6izpafpz2mj7i22sq1pnzgfsv2kvpq00aqbink47k83"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e01655679087504db1206b22435ba8eb7050aa23/recipes/ejc-sql"; @@ -12403,6 +12677,32 @@ license = lib.licenses.free; }; }) {}; + eldoc-box = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "eldoc-box"; + ename = "eldoc-box"; + version = "1.8"; + src = fetchFromGitHub { + owner = "casouri"; + repo = "eldoc-box"; + rev = "61dd07f6709ed04f09615d04457b4cfe73c7ace1"; + sha256 = "1ajg8x5s9yranidx17jz0da7439lwsdkw105531zq9547n31as65"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aac2e64f9e0d06b95bdf0dece214263f75470ea8/recipes/eldoc-box"; + sha256 = "11720hi2gvjwc4x2yrxnrhh76wf3sj3yd0vaa3sc22xa5g1wi40r"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eldoc-box"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -12518,12 +12818,12 @@ melpaBuild { pname = "elfeed-protocol"; ename = "elfeed-protocol"; - version = "0.5.7"; + version = "0.5.9"; src = fetchFromGitHub { owner = "fasheng"; repo = "elfeed-protocol"; - rev = "3b5d8592a68635a89ea6cded5bb9fe49779c3ce0"; - sha256 = "13l94xid4pac1pkz6sbbximb93yjzqz3g4ci1xr6m3h2wi4khzn7"; + rev = "c5faca15ccfe7e03dc4ee1372a07671c20015737"; + sha256 = "1cdg111dgpphlpv2csv9nr5p2zjk3qss7bf0y8485nnzcin4ip9f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; @@ -12841,12 +13141,12 @@ melpaBuild { pname = "elpa-clone"; ename = "elpa-clone"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "dochang"; repo = "elpa-clone"; - rev = "92f4c9d3570ad002575a90d0cc4a522c203a1110"; - sha256 = "0m5w5wgyslvakcqpr3d198sy3561w2h002gflw0jp47v17hba1r7"; + rev = "5dddbab4c27ec6aca541a1f8e9792617f10fc325"; + sha256 = "17lbdgwg97x8q8dbghylr2j0nwb72mpfl679qb0pl9184ih27qfc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; @@ -13004,6 +13304,34 @@ license = lib.licenses.free; }; }) {}; + elscreen-tab = callPackage ({ dash + , elscreen + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "elscreen-tab"; + ename = "elscreen-tab"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "aki-s"; + repo = "elscreen-tab"; + rev = "29d7a65c3e134dd476049c9aebc8d029238e71f7"; + sha256 = "0303i61m1qg65d3i3hsy7pzdhw0icpx3im99qkfmy6lxi4h9nd0p"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/06a8348c6911936e16a98cf216578ea148e20e5d/recipes/elscreen-tab"; + sha256 = "18krbs462cwi3pf72kn1zf1jf4gv9n3ffdg4v5bgb19i69sq7spi"; + name = "recipe"; + }; + packageRequires = [ dash elscreen emacs ]; + meta = { + homepage = "https://melpa.org/#/elscreen-tab"; + license = lib.licenses.free; + }; + }) {}; elwm = callPackage ({ dash , fetchFromGitHub , fetchurl @@ -13660,12 +13988,12 @@ melpaBuild { pname = "enh-ruby-mode"; ename = "enh-ruby-mode"; - version = "20180330"; + version = "20190325"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "b9d7d986c761e7f43993da0c3012e4fe77b19281"; - sha256 = "190x5l5jhyxhfy57hvxk06yzxji2r3f99vw6a8ngyshvyxap7wq3"; + rev = "c478bdf32979f7b26068d1df0bd30d737a192b1e"; + sha256 = "13m59n8xzbhn079h6dj2inabscd0pyq9z4p0vz0nhsgak1jq5ccv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -13834,12 +14162,12 @@ melpaBuild { pname = "epkg"; ename = "epkg"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "c42bc98a711ffa8d2a7b9096b563ac0edb0b9bf3"; - sha256 = "0hn67mdv6i8l1sfvs8gm2my05chk69nm4vf108l2ff22lims8ghx"; + rev = "4243b363d038b28650479b23949cb7dfd319542b"; + sha256 = "0a1cw3jnnm47n0c5l8q4vf3arx244wqs7lcwsjblbnp7svcx0q4h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -13913,12 +14241,12 @@ melpaBuild { pname = "erc-crypt"; ename = "erc-crypt"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; - rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5"; - sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w"; + rev = "1c8b1caed52a5994aab8bd4dd196881ed537d3aa"; + sha256 = "0w1b4pqipzdlkak9807k8xgzlc6vvni86ab92snm07909kby9xd0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; @@ -14148,12 +14476,12 @@ melpaBuild { pname = "erlang"; ename = "erlang"; - version = "21.2.2"; + version = "22.0.-1.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "a8495c5af68d5abdb3a49280b63985527e42be98"; - sha256 = "0aay768j678vdr820gjd8283749j7xal4ns78ndn1z492la8gza1"; + rev = "221f6053f7f71747e6e86f9f1122816887cf9d21"; + sha256 = "0jk64dcp46867rja2y5xai626fp2qrvwdfzb6in1x6gl8iyhkc39"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -14389,12 +14717,12 @@ melpaBuild { pname = "esh-autosuggest"; ename = "esh-autosuggest"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "dieggsy"; repo = "esh-autosuggest"; - rev = "95078aa17a104bc724283df48af36abfe4125853"; - sha256 = "0fwxk26wlk2wkqs82zs5m3rd6670mjf6bar928cqam1f63fvx09q"; + rev = "a6d5eb3337d010bd2a2d677ff304cd53adc291a0"; + sha256 = "0l2nnlr3b6df1xn0qjf5d5ryy1wcs1jczyfy795vsasd5gm3g0xh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest"; @@ -14750,26 +15078,54 @@ license = lib.licenses.free; }; }) {}; - ess-smart-underscore = callPackage ({ fetchFromGitHub + ess-smart-equals = callPackage ({ emacs + , ess + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ess-smart-equals"; + ename = "ess-smart-equals"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "genovese"; + repo = "ess-smart-equals"; + rev = "746cf9e78c3b86cbbf78d69c335a8a4ff3da79d6"; + sha256 = "1by8bzw3yl86mqzh7lwz5dca243n956jnd2rz4vilpgbh5cka2l3"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4403cf87e05311d7fe0360f35f9634b9fdfc6f81/recipes/ess-smart-equals"; + sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp"; + name = "recipe"; + }; + packageRequires = [ emacs ess ]; + meta = { + homepage = "https://melpa.org/#/ess-smart-equals"; + license = lib.licenses.free; + }; + }) {}; + ess-smart-underscore = callPackage ({ ess + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "ess-smart-underscore"; ename = "ess-smart-underscore"; - version = "0.79"; + version = "0.81"; src = fetchFromGitHub { owner = "mattfidler"; repo = "ess-smart-underscore.el"; - rev = "ef18a160aeb3b1a7ae5fe93759f8e92147da8746"; - sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74"; + rev = "ed4b37e8976124a182196a721068a8e334b6aa97"; + sha256 = "00hkq5q1ra9mqjj08f357m1lg1wx1sj4nm0rb382vhf31mlj15m7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore"; sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ ess ]; meta = { homepage = "https://melpa.org/#/ess-smart-underscore"; license = lib.licenses.free; @@ -14911,25 +15267,24 @@ eval-sexp-fu = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl - , highlight , lib , melpaBuild }: melpaBuild { pname = "eval-sexp-fu"; ename = "eval-sexp-fu"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hchbaw"; repo = "eval-sexp-fu.el"; - rev = "1cfd0f3e167d63080692fad97ffe0091b024ad73"; - sha256 = "0l20ja8s0881jlrlmba496iyizfa0j5bvc2x39rshn8qqyka2dq2"; + rev = "e1d7165383c941b3f11c2715707adc3d91d129a0"; + sha256 = "01mpnpgmlnfbi2yw9dxz5iw72mw3lk223bj172i4fnx3xdrrxbij"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b1a896521cac1f54f7571ad5837ff215d01044d/recipes/eval-sexp-fu"; sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs"; name = "recipe"; }; - packageRequires = [ cl-lib highlight ]; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/eval-sexp-fu"; license = lib.licenses.free; @@ -14972,12 +15327,12 @@ melpaBuild { pname = "evil"; ename = "evil"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a"; - sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql"; + rev = "3766a521a60e6fb0073220199425de478de759ad"; + sha256 = "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -15407,12 +15762,12 @@ melpaBuild { pname = "evil-nerd-commenter"; ename = "evil-nerd-commenter"; - version = "3.3.3"; + version = "3.3.7"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "151ac5747539eaac5562b93c94f738d6001ab0c7"; - sha256 = "0fqcdc7wl39xrmq6ygjy5v5v2jlj6disd1bgbyy1mi8phw6irghl"; + rev = "acc0f75cde9e4ffd946f7835c3b388fb77f633a7"; + sha256 = "1r8shfdddys9vqvrxf7s6z83ydqx9xhqs9sa7klbsajryqcp50b7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -15779,12 +16134,12 @@ melpaBuild { pname = "evil-test-helpers"; ename = "evil-test-helpers"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a"; - sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql"; + rev = "3766a521a60e6fb0073220199425de478de759ad"; + sha256 = "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -16068,11 +16423,11 @@ melpaBuild { pname = "exiftool"; ename = "exiftool"; - version = "0.3"; + version = "0.3.1"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "8dd70ba5214a73960361a0c6220bb4aa72b9e478"; - sha256 = "0sb71bj8djppzac02bpl3v7fy0jlidd4aagg8bmmgyp7zx84xws8"; + rev = "4131fa38160dabd5d7143aad8aca5db575749292"; + sha256 = "0lbsa8v39aih8mcvvdm0jang05gm5br5g2fay3lccf73c9aimrfh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -16144,12 +16499,12 @@ melpaBuild { pname = "exsqlaim-mode"; ename = "exsqlaim-mode"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "ahmadnazir"; repo = "exsqlaim-mode"; - rev = "e77d2a07addffd7df4393019d9c3dad1ab1925d9"; - sha256 = "19v5sf3nf6dciakvs7ksbg66b5z1hybc4ivs24hm6k3fziblfzzs"; + rev = "a2e0a62ec8b87193d8eaa695774bfd689324b06c"; + sha256 = "1gj1q2h1ja30jizkjql12cxlppj07ykr4wxqca9msy043zdhqnkk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode"; @@ -16779,12 +17134,12 @@ melpaBuild { pname = "find-file-in-project"; ename = "find-file-in-project"; - version = "5.7.2"; + version = "5.7.4"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "0072b813fc77ef34f776fcafbd13c4aeeae360cf"; - sha256 = "1m7z4m9b3a7pfsbcda71mhn9vjjjbnaql69jnb4i1afwh5nwm7hx"; + rev = "389251757643daffc58e46d195c48f880d4089d5"; + sha256 = "0758mk7fcz39zn2ihz267091lg8qiyrjz0dd3kqgfqvrc7c2n9am"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -16926,6 +17281,31 @@ license = lib.licenses.free; }; }) {}; + fish-completion = callPackage ({ fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "fish-completion"; + ename = "fish-completion"; + version = "1.0"; + src = fetchFromGitLab { + owner = "Ambrevar"; + repo = "emacs-fish-completion"; + rev = "23aafb993f8f74dca6e2f299030ca5d3e1aee95b"; + sha256 = "04dcqhdb544i7c6np4prbq13cwfxw37czmpnm3j36di6c1g9gkzb"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/fish-completion"; + sha256 = "1y7vwh7w0shnrnp8x1m1sa0p7kdyz5mg1mfs263gm38in2biym9i"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fish-completion"; + license = lib.licenses.free; + }; + }) {}; fish-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -17012,12 +17392,12 @@ melpaBuild { pname = "fix-word"; ename = "fix-word"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338"; - sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412"; + rev = "b3b3a3c8e33e425f9a8d0ec653adb6897c8efc03"; + sha256 = "1nw9ih0knaqaban5nqp3anvr37mivylqs8sc8l3v1i9srlqnsj1m"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -17184,12 +17564,12 @@ melpaBuild { pname = "flower"; ename = "flower"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "PositiveTechnologies"; repo = "flower"; - rev = "49e224ab26d85f5cd4a3ad9cdac391264b80ad5e"; - sha256 = "1kn9sibvsnaprhjwfz1cdvb4mi4d4qsp70gxjij58dk51jpni7yf"; + rev = "6ef1affa2d7090714ccc4494823de28cfc11da35"; + sha256 = "1dp3g52j1i49bv802g27b7yszpxz0i28i4j74qp39qlld3k0gys0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; @@ -17539,11 +17919,11 @@ melpaBuild { pname = "flycheck-grammalecte"; ename = "flycheck-grammalecte"; - version = "0.6"; + version = "0.7"; src = fetchgit { url = "https://git.deparis.io/flycheck-grammalecte/"; - rev = "ca825419021a8da9e292812772dad35ef38ccc8e"; - sha256 = "11sydiznyqarbgm9izf6bh6sfdz5my51apibb2j13fajlfgkddai"; + rev = "2f4812eaa6e809051e23c34a085df2b704a15741"; + sha256 = "0xzmr2c74f3375q4nx7zf2jpxawxdkid5mf5nw81wl2v55mv1k2q"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd82aa0568d998a3d176b5ee47b8a227438ea09/recipes/flycheck-grammalecte"; @@ -17613,6 +17993,32 @@ license = lib.licenses.free; }; }) {}; + flycheck-ini-pyinilint = callPackage ({ fetchFromGitLab + , fetchurl + , flycheck + , lib + , melpaBuild }: + melpaBuild { + pname = "flycheck-ini-pyinilint"; + ename = "flycheck-ini-pyinilint"; + version = "0.3"; + src = fetchFromGitLab { + owner = "danieljrmay"; + repo = "flycheck-ini-pyinilint"; + rev = "54744a78d06373404933fedc3ca836916e83de51"; + sha256 = "1zdvan6l2s97s7swnccq21z1ja8vl64l757j3hg50ipq8j5yy9dl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a1d0b4be0dd3e238ad2e3a157b11ecc82c0639/recipes/flycheck-ini-pyinilint"; + sha256 = "028ksrlrrsn2wsz7kqf3qk4pp3scs7zvp74c4xj52rm4hh7ycbl7"; + name = "recipe"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-ini-pyinilint"; + license = lib.licenses.free; + }; + }) {}; flycheck-irony = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -17921,12 +18327,12 @@ melpaBuild { pname = "flycheck-phpstan"; ename = "flycheck-phpstan"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phpstan.el"; - rev = "3653f2a316f4199cbd3238e984eea2325e2618d5"; - sha256 = "1dyba8hpr16nsdv1i45pl3w97728w7p8vl9gf5gvd18xcll4848d"; + rev = "1151b8d418af532fdf0732b9793b479c64a364e3"; + sha256 = "0wb9pshgcrq2w9d9fpkywz299ihcb9fffh3fdk8rm1r8irylrjkh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/flycheck-phpstan"; @@ -17947,12 +18353,12 @@ melpaBuild { pname = "flycheck-pony"; ename = "flycheck-pony"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "flycheck-pony"; - rev = "3d3387133a44f5b3f0fb178ef4addf6e1ce1df2f"; - sha256 = "1da10q378k5kbcj0rrpzhm7r3ym4rfwc7v1ialcndbmflsn09m5s"; + rev = "9356cbcd404eaf381ab0c4b0f9c47232f723fa7e"; + sha256 = "1rzz3cl0pxn3hhrkxcdiy17wl4dzbn8kxm3hq90zmhag1gbfy4zz"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2bcb82f4ddb92243058c9ab1a67d4f7ef87b155/recipes/flycheck-pony"; @@ -18029,12 +18435,12 @@ melpaBuild { pname = "flycheck-pycheckers"; ename = "flycheck-pycheckers"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "4f65e93931c5be4b183d2a3cf5a52a394f9a09b7"; - sha256 = "034sfjd01w4djrhmcdywv5g771wi7ny5b3pad3pici4129jkk62s"; + rev = "6acbba5120ea2c860a0856580e29157b14b9716d"; + sha256 = "0ji5al46bz1mki4zlsyxv8d3dkssdz63in2zxhcf4kvpmdazxk4g"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -18047,32 +18453,6 @@ license = lib.licenses.free; }; }) {}; - flycheck-rebar3 = callPackage ({ fetchFromGitHub - , fetchurl - , flycheck - , lib - , melpaBuild }: - melpaBuild { - pname = "flycheck-rebar3"; - ename = "flycheck-rebar3"; - version = "1.1.0"; - src = fetchFromGitHub { - owner = "joedevivo"; - repo = "flycheck-rebar3"; - rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6"; - sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3"; - sha256 = "1ml9k61n5vy4c2q6c10q9j10ky0iqkinx21bl7hip1r6b5b1kmmc"; - name = "recipe"; - }; - packageRequires = [ flycheck ]; - meta = { - homepage = "https://melpa.org/#/flycheck-rebar3"; - license = lib.licenses.free; - }; - }) {}; flycheck-rtags = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -18083,7 +18463,7 @@ melpaBuild { pname = "flycheck-rtags"; ename = "flycheck-rtags"; - version = "2.21"; + version = "2.31"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; @@ -18101,6 +18481,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-rust = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , flycheck + , let-alist + , lib + , melpaBuild + , seq }: + melpaBuild { + pname = "flycheck-rust"; + ename = "flycheck-rust"; + version = "1.1"; + src = fetchFromGitHub { + owner = "flycheck"; + repo = "flycheck-rust"; + rev = "a139cd53c5062697e9ed94ad80b803c37d999600"; + sha256 = "1fh6j5w2387nh2fwwjphkhq17cgj5m2q5k0fhidvgc2w65lzbr1r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; + sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w"; + name = "recipe"; + }; + packageRequires = [ dash emacs flycheck let-alist seq ]; + meta = { + homepage = "https://melpa.org/#/flycheck-rust"; + license = lib.licenses.free; + }; + }) {}; flycheck-status-emoji = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -18166,12 +18576,12 @@ melpaBuild { pname = "flycheck-swift3"; ename = "flycheck-swift3"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "37994f11c93f585119647e6ba10761e9766b593d"; - sha256 = "12611z7f53pw0yn70m40nsp6qd2jpm2hdf8s2gqz4lf0qh2z91lb"; + rev = "ba4e831ff04b180323435214dd4cca8184968ad1"; + sha256 = "1ss2s3q2mv07ph87i2fki1nxq6b51xs4i1mll1faplj2nrr2hyzm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -19284,6 +19694,33 @@ license = lib.licenses.free; }; }) {}; + format-table = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "format-table"; + ename = "format-table"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "functionreturnfunction"; + repo = "format-table"; + rev = "dfcae3a867e574577fc09a43b045889ff155b58f"; + sha256 = "1z9l1qmv5hw7bgchi5f68nzsz9arjwsazvd6viq6k6jmjzncli6q"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e307ead5e8a291cb5dfe316f3b13144e71b6a1b7/recipes/format-table"; + sha256 = "1fwjilx0n9m8q0macq231i73zvridjfgqlhw7d1xblw4qp82rzvp"; + name = "recipe"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/format-table"; + license = lib.licenses.free; + }; + }) {}; fortune-cookie = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -19480,12 +19917,12 @@ melpaBuild { pname = "fsharp-mode"; ename = "fsharp-mode"; - version = "1.9.12"; + version = "1.9.13"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "68d2121a7317d90fe3794c9295d117f4aebd1438"; - sha256 = "0mymvik20slbgsasjpn6nkqcb4z6z4mvd1sf1xalv0qjk24vrlmk"; + rev = "386994e7d420872a31d7dd2eee9610d8ace98faa"; + sha256 = "15blnkcrsmm6896dpdzcx3xqzxzkc0x8d5bg9b5sw7qca6vnjbqk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -20552,12 +20989,12 @@ melpaBuild { pname = "git-link"; ename = "git-link"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "976723dfdb9ae42e093a3cb32fc41841e94201e6"; - sha256 = "0xsyzgwbsnf4xah860182pfirkfbixsf0nkfm05n1rvid7a6495d"; + rev = "1dbabfed4c5c3c5ac6ffa9035a9c3d4c6cc7f885"; + sha256 = "1b115d5rsb9m8lqjplg3qp0bxfc5cij5fgp0j21zspqwqvj7h0hq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -20626,23 +21063,24 @@ , fetchFromGitLab , fetchurl , lib - , melpaBuild }: + , melpaBuild + , transient }: melpaBuild { pname = "git-timemachine"; ename = "git-timemachine"; - version = "4.8"; + version = "4.10"; src = fetchFromGitLab { owner = "pidu"; repo = "git-timemachine"; - rev = "4eb2ee6eabcc437bc3a1addc19ba38eed165743d"; - sha256 = "1fdbyd3jhfif7i8zhprbld7jx210xpfrgp3gqn1g8hfzic0x8vxp"; + rev = "b97f93d66cffcd69281346845d3a1e32197eda29"; + sha256 = "08zsn3lsnnf01wkv5ls38jga02s5dnf0j3gigy4qd6im3j3d04m1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52b516b7b10bdada2f64499c8f43f85a236f254/recipes/git-timemachine"; sha256 = "06xdzic7j3d3pqgwxp1q6fs8sf3mi02a9phjvhk90kyvbr8h94ck"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs transient ]; meta = { homepage = "https://melpa.org/#/git-timemachine"; license = lib.licenses.free; @@ -20947,12 +21385,12 @@ melpaBuild { pname = "gitlab-ci-mode"; ename = "gitlab-ci-mode"; - version = "20181127.2"; + version = "20190222.11.8"; src = fetchFromGitLab { owner = "joewreschnig"; repo = "gitlab-ci-mode"; - rev = "99214277a0ea0f20472631e05ba8302997d5d364"; - sha256 = "1xwsdclv1q98dsb79bd9yq050axqzc1y4vswz4gf5zhshmfvg130"; + rev = "ee4bd839c11405f770543d789ad668f0ecc9eaec"; + sha256 = "1qp6h1yyp8259cxygxi1y4r9jk21qd3l46ggnfhz0p6lpqphc5bq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7915ddcf21fdec539a86bb86c209cf0bbd378cb/recipes/gitlab-ci-mode"; @@ -21071,31 +21509,6 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ fetchFromGitHub - , fetchurl - , lib - , melpaBuild }: - melpaBuild { - pname = "glab"; - ename = "glab"; - version = "3.2.0"; - src = fetchFromGitHub { - owner = "magit"; - repo = "ghub"; - rev = "db15d00d01b8bd9187079a0b538d878d241743a8"; - sha256 = "0ikx80gj1v1kw2dp648ajiq6lmihg2va60bmjvi12rn8i2r5cga5"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/glab"; - sha256 = "0kyr1znf82qi15r6iha6dbyhmfzghx969hd364rsvkly8ry8pk5m"; - name = "recipe"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/glab"; - license = lib.licenses.free; - }; - }) {}; gmail-message-mode = callPackage ({ fetchFromGitHub , fetchurl , ham-mode @@ -21806,12 +22219,12 @@ melpaBuild { pname = "google-translate"; ename = "google-translate"; - version = "0.11.16"; + version = "0.11.17"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "17a1ddc074b96cdc3b8199ccb06824a7a95bf9ff"; - sha256 = "09sxphprj3aq9q2dpy5gmyjnwjcyd3vb4jcg0mx3cv3ibly86ysl"; + rev = "bf119aac424994d2aa91fce9630adc01ed0ea617"; + sha256 = "05ljjw7kbnszygw3w085kv57swfiiqxri2b5xvsf5dw3pc3g7j3c"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -21911,12 +22324,12 @@ melpaBuild { pname = "goto-chg"; ename = "goto-chg"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "goto-chg"; - rev = "e5b38e4e1378f6ea48fa9e8439f49c2998654aa4"; - sha256 = "1fxdvgdafavc4sad5i8g0wvpdqzlgzmvfi07yrah1c5vwkrslbvj"; + rev = "16a63aae80db90713fb1f7d378c5d591c2ce15ff"; + sha256 = "0kpalpssfrwcqrmp47i3j2x04m01fm7cspwsm6fks8pn71lagcwm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; @@ -21992,7 +22405,7 @@ melpaBuild { pname = "govc"; ename = "govc"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; @@ -22273,12 +22686,12 @@ melpaBuild { pname = "graphene-meta-theme"; ename = "graphene-meta-theme"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene-meta-theme"; - rev = "62cc73fee31f1bd9474027b83a249feee050271e"; - sha256 = "1ydl6dlg5z4infq8j09izwgs6n97yza6nbq5rs1xfv00zd9gr63c"; + rev = "8e75528529f460b1b5910467c4fc1f516e1a57b9"; + sha256 = "03wllxivl95gsknjkmljm3kgjkwixwxaksaxv8i9c0zjrb2wwm24"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; @@ -22374,12 +22787,12 @@ melpaBuild { pname = "green-is-the-new-black-theme"; ename = "green-is-the-new-black-theme"; - version = "0.0.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "8a03687a2b8b55c5dc7f099086019278d505d8d8"; - sha256 = "07j5sv8dskqxpbzr5f58n75cziyqm9v01c3f7wmwfs8jl7h5nc4m"; + rev = "b8307a377bfb21a99494fa2c5de0b9ba10c3fce6"; + sha256 = "154jymgi58k4z5q7j0p2gclqjsq0w1809ybz7myngbvd0wjmcbp9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -22585,12 +22998,12 @@ melpaBuild { pname = "gruvbox-theme"; ename = "gruvbox-theme"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "greduan"; repo = "emacs-theme-gruvbox"; - rev = "796999e5db2a0e43ad64c062c1bec3c966d095bc"; - sha256 = "0qj5k0c1592ikrb7gcibqwf8hhj6lq4cw7zrb3kmpk4zakzy7a2w"; + rev = "f05bfb9d8be4270dc919d14410f16f7da1fcd9e0"; + sha256 = "126kqvgjy71rimr4f7sgnh2j73i3i0s650bx84jl8n4k48x0hwz5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/gruvbox-theme"; @@ -22694,12 +23107,12 @@ melpaBuild { pname = "guix"; ename = "guix"; - version = "0.5.1"; + version = "0.5.1.1"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "495baedc983070f0158442173bdef0a35c2a1e9d"; - sha256 = "0p2sn6siq7ns1qjw51jcr20v0dz1z7s11mym892hiq6hib2ykdgz"; + rev = "c4c96663fefe7e007c372e7d24d6e7016b70e4ee"; + sha256 = "1730q2dm84f15ycjdf3dgl2j8770mhr6qnyzxgac3zzkjr8pyvq7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -23163,12 +23576,12 @@ melpaBuild { pname = "hasky-stack"; ename = "hasky-stack"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "3e17ce07dd6b0207474e4ff14ad7b8c467382947"; - sha256 = "0cdsdlgapf9xxj928hlb7ch9x8rznayrvj7n8j2vzfa0kfmg7qwf"; + rev = "a3176aece9a9ab0a36ae795965f83f4c1fa243bf"; + sha256 = "1j9cvy95wnmssg68y7hcjr0fh117ix1ypa0k7rxqn84na7hyhdpl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -23270,12 +23683,12 @@ melpaBuild { pname = "helm"; ename = "helm"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "757263f9332d2d338ac3619f50547ef2f9d2bd9e"; - sha256 = "0qahykw30vwhkd579s3gs2hya0zw1jpmcw3n39vjg7za573xpgzb"; + rev = "8de179db41598515f1db758b8d35728a3fd58f18"; + sha256 = "1x3nv8zvp8vvl30bm2d83hd7zxb0ca64pc8kwb81ml9al6r3mm01"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -23623,6 +24036,7 @@ }) {}; helm-codesearch = callPackage ({ cl-lib ? null , dash + , emacs , fetchFromGitHub , fetchurl , helm @@ -23632,19 +24046,19 @@ melpaBuild { pname = "helm-codesearch"; ename = "helm-codesearch"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116"; - sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6"; + rev = "a6bac6b8a063b91b444a72318b163b266742db9b"; + sha256 = "0xmplh7q5wvrkfha8qc9hx7sjyc8dsms0wrvj2y7zg35siw1561l"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q"; name = "recipe"; }; - packageRequires = [ cl-lib dash helm s ]; + packageRequires = [ cl-lib dash emacs helm s ]; meta = { homepage = "https://melpa.org/#/helm-codesearch"; license = lib.licenses.free; @@ -23715,12 +24129,12 @@ melpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "757263f9332d2d338ac3619f50547ef2f9d2bd9e"; - sha256 = "0qahykw30vwhkd579s3gs2hya0zw1jpmcw3n39vjg7za573xpgzb"; + rev = "19381fb02817de196dba0f344e06e7751a1816f6"; + sha256 = "1jh4nmmx8iwqdvpwwzq3c6f5hwyla000bmbyc2p5anmfwzsfp0lb"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -23924,6 +24338,34 @@ license = lib.licenses.free; }; }) {}; + helm-eww = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , seq }: + melpaBuild { + pname = "helm-eww"; + ename = "helm-eww"; + version = "1.2"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-eww"; + rev = "76ba59fda8dd6f32a1bc7c6df0b43c6f76169911"; + sha256 = "0hpq1h0p69c9k6hkd2mjpprx213sc5475q7pr2zpmwrjdzgcv70z"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/455a32c1d4642dc6752408c4f5055f5f4d1288eb/recipes/helm-eww"; + sha256 = "0pl8s7jmk1kak13bal43kp2awjji9lgr3npq9m09zms121rh709w"; + name = "recipe"; + }; + packageRequires = [ emacs helm seq ]; + meta = { + homepage = "https://melpa.org/#/helm-eww"; + license = lib.licenses.free; + }; + }) {}; helm-ext = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -24097,12 +24539,12 @@ melpaBuild { pname = "helm-github-stars"; ename = "helm-github-stars"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-github-stars"; - rev = "809cf88e2984b121348b1046e1d3890f1fd580b4"; - sha256 = "09ywdsymh479syq9ps15bgyqf5gr94z8wn4jvlcxqz5aq5fil9vq"; + rev = "8cea100f788832ad28c2a61b8fc805298383e263"; + sha256 = "0ml324fi7bqh32d2vg41y13zqj4yx0hsqp5nmb6sw74qics7g9ma"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e77f4a75504ca3e1091cdc757e91fb1ae361fa7/recipes/helm-github-stars"; @@ -24478,12 +24920,12 @@ melpaBuild { pname = "helm-notmuch"; ename = "helm-notmuch"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-notmuch"; - rev = "782c221bf293eee55990de5b54171f08d881dcee"; - sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw"; + rev = "97a01497e079a7b6505987e9feba6b603bbec288"; + sha256 = "1k038dbdpaa411gl4071x19fklhnizhr346plxw23lsnxir9dhqc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch"; @@ -24608,6 +25050,35 @@ license = lib.licenses.free; }; }) {}; + helm-pass = callPackage ({ auth-source-pass + , emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild + , password-store }: + melpaBuild { + pname = "helm-pass"; + ename = "helm-pass"; + version = "0.3"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-pass"; + rev = "ed5798f2d83937575e8f23fde33323bca9e85131"; + sha256 = "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a34e0ab66491540dd0c5b62c7f60684056b16d5/recipes/helm-pass"; + sha256 = "153cj58x2xcmjs2n4fl1jsv8zir4z9jwg1w00ghv70k5j3rwsjkp"; + name = "recipe"; + }; + packageRequires = [ auth-source-pass emacs helm password-store ]; + meta = { + homepage = "https://melpa.org/#/helm-pass"; + license = lib.licenses.free; + }; + }) {}; helm-perldoc = callPackage ({ cl-lib ? null , deferred , fetchFromGitHub @@ -24969,7 +25440,7 @@ melpaBuild { pname = "helm-rtags"; ename = "helm-rtags"; - version = "2.21"; + version = "2.31"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; @@ -25043,6 +25514,35 @@ license = lib.licenses.free; }; }) {}; + helm-slime = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , helm-core + , lib + , melpaBuild + , slime }: + melpaBuild { + pname = "helm-slime"; + ename = "helm-slime"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-slime"; + rev = "ebe80eebd1dfba1f1c837876c8f73cefc8c4db87"; + sha256 = "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c35d43a7a8219de4a7f675147f598966aaecb9db/recipes/helm-slime"; + sha256 = "0qv4c1dd28zqbjxpshga967szrh75a4k51n4x86xkbax7ycca4hh"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs helm-core slime ]; + meta = { + homepage = "https://melpa.org/#/helm-slime"; + license = lib.licenses.free; + }; + }) {}; helm-smex = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -25153,6 +25653,33 @@ license = lib.licenses.free; }; }) {}; + helm-taskswitch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , helm + , lib + , melpaBuild }: + melpaBuild { + pname = "helm-taskswitch"; + ename = "helm-taskswitch"; + version = "1.0.4"; + src = fetchFromGitHub { + owner = "bdc34"; + repo = "helm-taskswitch"; + rev = "de494738f8e5f7d6e681199dd3aad91e5bdb7691"; + sha256 = "01a4z0x5p94hglcnakxdgi4cq0cvz48c3dg58b7y2cq1nwjdw8d7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3602b1f7b9a75cc82c4bde9ea12b2509465db30f/recipes/helm-taskswitch"; + sha256 = "01yvdbwlixif670f4lffpsk9kvlhgrmh95jw0vc568x0bd3j2a02"; + name = "recipe"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-taskswitch"; + license = lib.licenses.free; + }; + }) {}; helm-themes = callPackage ({ fetchFromGitHub , fetchurl , helm @@ -25188,12 +25715,12 @@ melpaBuild { pname = "helm-tramp"; ename = "helm-tramp"; - version = "1.1.6"; + version = "1.2.6"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "2148e21fd1a6c8a0b61678bd187ab5a7e387ae64"; - sha256 = "1dinm85z5dz7ql75bh9hy4kmasfb05amnch32y6xscjdg6736w8j"; + rev = "a7456cee86a83d68c966475fab90ab94006fd23c"; + sha256 = "1yrwv3xzbqndns9lda70vpv75vipgjd5j9s1dx1ggfhx21kbnf9w"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -25358,12 +25885,12 @@ melpaBuild { pname = "helpful"; ename = "helpful"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "f8350169db7a8d77fc3e5389ad0d7bd864a0eb0a"; - sha256 = "1rqnx7672175288yqaslw0d9vw04j6psw7mys8j9zcp2i72hlvkn"; + rev = "a20eef8fd3fb33abe35dd2ed1590184bc2975b69"; + sha256 = "1pzlx3galyryd3hd84hnd7r5s6yl9sdrfhy1s6dgz40glw41wmpr"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -25511,12 +26038,12 @@ melpaBuild { pname = "highlight-blocks"; ename = "highlight-blocks"; - version = "0.1.16"; + version = "0.1.17"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-blocks"; - rev = "9c4240a5d16008db430d1a81c76dad474d3deb0c"; - sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5"; + rev = "33cf3d36662faa36c86c8d53e4d5a3922efa3eb8"; + sha256 = "04v5y04v4n06ig8zld6axrxpz07s70sn5ckxcy8gnz5qm0zvr7mx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaf524488c408483ea8f2c3a71174b1b5fc3f5da/recipes/highlight-blocks"; @@ -25893,12 +26420,12 @@ melpaBuild { pname = "hl-todo"; ename = "hl-todo"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "24b9925b1b2c7ad6bf7b66800395f74abf035c5f"; - sha256 = "1bqi2kchcj58j1y3k439v6jk86cg73m0qwfyjz1396h0h2rspnnd"; + rev = "099d0f6d583009b0c5de8e51e38972d6e14e0587"; + sha256 = "1sfpwwkhfv6a9hd8kgb4h9axc3x2mq3z32i6iaz1q1l6w6k8v0r3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -26324,8 +26851,8 @@ sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; - sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/82d9e1bfd501ed2d1cd11319c5e1eb17482e8922/recipes/hydra"; + sha256 = "1s1hj70jjbira054q8ly1pcr0818hh91qnhj0zwbv7milmvv2wwd"; name = "recipe"; }; packageRequires = [ cl-lib ]; @@ -26334,6 +26861,33 @@ license = lib.licenses.free; }; }) {}; + hyperspace = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "hyperspace"; + ename = "hyperspace"; + version = "0.8.4"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "hyperspace-el"; + rev = "5fdd680dc2e7b8a064cfdf93d6948546ff51afc2"; + sha256 = "1r5h55zcm5n2vx126q16ndhgdchcj59qqcybhsqw69vk02x96arg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0696a12acba676015640de63fc6e011128bca71c/recipes/hyperspace"; + sha256 = "0ya41c9bxvspj81n5209p9b4c9p1i6jcp710n9i9jawpahwpqlkw"; + name = "recipe"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/hyperspace"; + license = lib.licenses.free; + }; + }) {}; ialign = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -26574,12 +27128,12 @@ melpaBuild { pname = "ido-completing-read-plus"; ename = "ido-completing-read+"; - version = "4.11"; + version = "4.12"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "03bdf989a9af88d4eeed4003ae74c98baf58ff72"; - sha256 = "08d77ysbzd25rm8rjslckhqlsyim047c9zwq2ybbzqpjy3q52qfy"; + rev = "d56125deac540a2ab396d6d71f7c1eeae7f37588"; + sha256 = "11wn2xf7dbgfhwdrjazshf4c5im1yxnqpyvq8633fjc1cn9s7vxw"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -27084,6 +27638,32 @@ license = lib.licenses.free; }; }) {}; + immaterial-theme = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "immaterial-theme"; + ename = "immaterial-theme"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "petergardfjall"; + repo = "emacs-immaterial-theme"; + rev = "b7ad831e49f5f4512f216f1f99b2d0eba3cc0815"; + sha256 = "0p363khj7mz9dq0dm12ksd6aamrkmm5a7vcsp0j8cmbc6r6a060c"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a95d88bb00b1313da82929bc2733d726d2041d7/recipes/immaterial-theme"; + sha256 = "15gwqjfpls7lqc37s70vnhycnry5g9grn6shk2wpijrxfnmyqjhj"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/immaterial-theme"; + license = lib.licenses.free; + }; + }) {}; immutant-server = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -27694,12 +28274,12 @@ melpaBuild { pname = "intero"; ename = "intero"; - version = "0.1.31"; + version = "0.1.37"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "14a31536061fa6ad643456f79abe39636c48ffd9"; - sha256 = "0gabipr8bvxhigidkivczqyv67nl6ylf0gipb0f4lxs8mcnwzcvn"; + rev = "e5ca92990f0647d2d0e4a6009534910e4d2c7f00"; + sha256 = "0bn4al2q324zlazhlsca7gw2d3s4nmvd24spdqwimfq2y769pb73"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -27745,12 +28325,12 @@ melpaBuild { pname = "ipython-shell-send"; ename = "ipython-shell-send"; - version = "1.0.3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jackkamm"; repo = "ipython-shell-send-el"; - rev = "ff944b436db381e6772a26c09b0b20a097eb323e"; - sha256 = "14s6hxnkv7r3idzj7s6vnvifpc8prykzpm6nhb6149yymal4hjkc"; + rev = "0faed86faff02a361f23ce5fc923d0e9b09bb2da"; + sha256 = "1nx92rmxgrxy9hfi7f2ny3q4zqrzy6jalr85lall7r74aifprrkv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send"; @@ -27874,12 +28454,12 @@ melpaBuild { pname = "iter2"; ename = "iter2"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "doublep"; repo = "iter2"; - rev = "3b418e05e93ea380baf905de14efda4c174f779c"; - sha256 = "16mmqnwip3cixsmmij4dnjc8h323z280fk51w5rmwnnb0qmfzp66"; + rev = "fc1fcea5379bc7728a25dd81546886213e3db6fa"; + sha256 = "1gvm5gfgmcw4mibi8899x9ry1zqm3ij6yl0dnmdqmv9dbv1zlqp2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2"; @@ -27900,12 +28480,12 @@ melpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; - sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; + rev = "525b2e4887dd839045313f32d3ddeb5cab4c7a7e"; + sha256 = "009n8zjycs62cv4i1k9adbb284wz2w3r13xki2740sj34k683v13"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -28017,12 +28597,12 @@ melpaBuild { pname = "ivy-explorer"; ename = "ivy-explorer"; - version = "0.1.5"; + version = "0.3.2"; src = fetchFromGitHub { owner = "clemera"; repo = "ivy-explorer"; - rev = "783816afda31d1b75487b906257e23e273bad6fa"; - sha256 = "1y3igqvmikz21ikzhmrmz2mpmk1pw6x2bk2d2i4z6l580fhz0h5y"; + rev = "14adb6164f1d1646f503c3e4bd9aa559805f93d7"; + sha256 = "0ffajyl21vz4662738dgga140yrkkcfynhhnk42fzrn5z5zqlwp1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b590a6e0d11fda3d93e4d92f847138f8968b332/recipes/ivy-explorer"; @@ -28099,12 +28679,12 @@ melpaBuild { pname = "ivy-hydra"; ename = "ivy-hydra"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; - sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; + rev = "525b2e4887dd839045313f32d3ddeb5cab4c7a7e"; + sha256 = "009n8zjycs62cv4i1k9adbb284wz2w3r13xki2740sj34k683v13"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -28183,12 +28763,12 @@ melpaBuild { pname = "ivy-prescient"; ename = "ivy-prescient"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "1623a0d4e5b9a752db45923fd91da48b49c85068"; - sha256 = "0yan4m9xf4iia4ns8kqa0zsham4h2mcnwsq9xnfwm26rkn94xrw0"; + rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e"; + sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient"; @@ -28238,12 +28818,12 @@ melpaBuild { pname = "ivy-rich"; ename = "ivy-rich"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "Yevgnen"; repo = "ivy-rich"; - rev = "7b0fc52a6ebb9b53aef04f68672d25337c2a4540"; - sha256 = "04n8whm00p1qhvwq3cz75qjxkx9sw4in9djsawmpsi63cqm78czx"; + rev = "25e36b10eff7fd299fcc03f15288b4fff33974e4"; + sha256 = "070y28ldp5dvh12b7qv27mqdgxiq2dll7fx432hb2i6mk8lz5hpp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/ivy-rich"; @@ -28265,7 +28845,7 @@ melpaBuild { pname = "ivy-rtags"; ename = "ivy-rtags"; - version = "2.21"; + version = "2.31"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; @@ -28818,12 +29398,12 @@ melpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20180301"; + version = "20190219"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "38e425785d5ea4600c3642f6500062ecedf694a4"; - sha256 = "1afvm8cp9h0v0pk7v3jwag6f608v1787l7m7a9541ld616cgb5x7"; + rev = "58006dfafbad43213162e21f57112e5e193caed2"; + sha256 = "02nrqb1khk7mhr4417pdlbb9whmyfpjjrsvg8lzsr8wlz9l3hqkg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -28952,12 +29532,12 @@ melpaBuild { pname = "json-navigator"; ename = "json-navigator"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "json-navigator"; - rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c"; - sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd"; + rev = "f4cde60c4203fc70cc7ff22ed1d6579159ce2598"; + sha256 = "0xrjbx6rkm8a6pmzhdph0r6l468hj827dvvq2hxhcm8v5gk6m690"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; @@ -29151,6 +29731,36 @@ license = lib.licenses.free; }; }) {}; + jupyter = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , simple-httpd + , websocket + , zmq }: + melpaBuild { + pname = "jupyter"; + ename = "jupyter"; + version = "0.7.3"; + src = fetchFromGitHub { + owner = "dzop"; + repo = "emacs-jupyter"; + rev = "83af335166a28e131159fc95586a0d0abe8efde4"; + sha256 = "1bq6lsip5m8ci8j8h26lj892zims6d76jv713bry3pzc66lj6570"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a63a933e193a52e60950331ec982c5f5cdfaa5d9/recipes/jupyter"; + sha256 = "0p83mkvip1gn5ag2j6s68wzfgg2sf15iyxh7ylads3yw44h26wvi"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs simple-httpd websocket zmq ]; + meta = { + homepage = "https://melpa.org/#/jupyter"; + license = lib.licenses.free; + }; + }) {}; jvm-mode = callPackage ({ dash , emacs , fetchFromGitHub @@ -29293,12 +29903,12 @@ melpaBuild { pname = "kaolin-themes"; ename = "kaolin-themes"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "4e1f6b93e25ef0da3767fb4ffb7aa5545bbab01a"; - sha256 = "101hz2igwlx91rrsd56ll7018356qpd39ac6lnr3kj0dmi5vdhh3"; + rev = "08eac2883e87ad8cf17331a86fa447a7a8bc73b4"; + sha256 = "06wl0zmxxv2gx9cka80sa7s3kra756nn8w1d6z4d5banwcc8nmjm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -29420,12 +30030,12 @@ melpaBuild { pname = "keycast"; ename = "keycast"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "keycast"; - rev = "c855511785d6e843f584e6ffdc54b4ac3f7a62d0"; - sha256 = "1xk9flcj4f37lqiizq1lgq0x1v64yhfqldaa9sq64nzwib5cp9z1"; + rev = "7c45ff05c1e9b50a3304da71906764b6c4f6f3a4"; + sha256 = "0bbzdjy66f8xpckkrcic1r9g9zw3d243nvp5mm4yfc9qdnx1hr6p"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaaf62c586818f2493667ad6ec8877234a58da53/recipes/keycast"; @@ -29652,12 +30262,12 @@ melpaBuild { pname = "killer"; ename = "killer"; - version = "0.2.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "killer"; - rev = "52256640aebbb8c25f8527843c2425b848031cd8"; - sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l"; + rev = "ace0547944933440384ceeb5876b1f68c082d540"; + sha256 = "06nzxd9nc1d569354xj7w88i0y5l99pyag691aribsh771rxbfz4"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd8c3ec8fa272273128134dea96c0c999a524549/recipes/killer"; @@ -29704,12 +30314,12 @@ melpaBuild { pname = "kiwix"; ename = "kiwix"; - version = "0.4.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "b84a5ff33efdf13dda22ed32ea37a09b15cd1690"; - sha256 = "07nb141hxjabin8vr14hpn80vzrjaq1b3h6p76m0bwxvzbi8765r"; + rev = "c662f3dc5d924a4b64b7af4af28f15f27b7cea1e"; + sha256 = "0i11sfnqvjqqb625cgfzibs6yszx891y4dy7fd6wzmdpclcyzr8z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix"; @@ -29906,6 +30516,33 @@ license = lib.licenses.free; }; }) {}; + language-id = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "language-id"; + ename = "language-id"; + version = "0.1"; + src = fetchFromGitHub { + owner = "lassik"; + repo = "emacs-language-id"; + rev = "9145c75eaa41a7a9deda928f704b99db056d3e9d"; + sha256 = "10dwrb610jdal6ifpj34mmy8qqbca2sgfmvn4p4qpcc967sv4f1r"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d03af6375bc7ba4612c43dea805d7f392f046f87/recipes/language-id"; + sha256 = "0p7hg005bmzy38sv2881fq1x2i7yjdhfjbki4y2av485c418rqz8"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/language-id"; + license = lib.licenses.free; + }; + }) {}; latex-extra = callPackage ({ auctex , cl-lib ? null , fetchFromGitHub @@ -29940,12 +30577,12 @@ melpaBuild { pname = "latex-math-preview"; ename = "latex-math-preview"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitLab { owner = "latex-math-preview"; repo = "latex-math-preview"; - rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc"; - sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw"; + rev = "90fd86da2d9514882146a5db40cb916fc533cf55"; + sha256 = "063vnjhnxm2z9shkdv1j8kwyf37syczfkzxzh5z7w7aidvx55jzj"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview"; @@ -30077,12 +30714,12 @@ melpaBuild { pname = "ledger-import"; ename = "ledger-import"; - version = "0.2.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "ledger-import"; - rev = "c3501ae1a2b590d2d22d4508e958977f51e73d96"; - sha256 = "1mrkrr2rnjrkjq7dihihq2ncn2fpgzwqr4s7j3mfj8gn3f4ak9q9"; + rev = "2c199fcc8671c2ec82e62cea7716289426b7407c"; + sha256 = "0szi5k05qja28nx0rnl3amh3qf2f470sycdjgmpazgqh4zpkngsp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a1e2a9546b8b40f5f880197cb8166a6a715451f/recipes/ledger-import"; @@ -30657,12 +31294,12 @@ melpaBuild { pname = "literate-elisp"; ename = "literate-elisp"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "jingtaozf"; repo = "literate-elisp"; - rev = "69af3f1fdaabf38178603deb32e233a2190e24da"; - sha256 = "0dvlmivcm5cx8396gcnx6hxijvixpdyvd3zk8p0ly8p5g99mrpzx"; + rev = "0724b62d98cb9d9c7f3d171c322a1059648746f5"; + sha256 = "0nnfp8rj4avn462w3fwln8c7sai3psz7kp97r3iyq4v9wavgdni2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4c1c4da2a5571babda9a29a56b8972ad0687c0/recipes/literate-elisp"; @@ -30711,12 +31348,12 @@ melpaBuild { pname = "live-py-mode"; ename = "live-py-mode"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "c60962245d412cfeab2cc82c850e5432fa28f690"; - sha256 = "1jwlx5p96adgyibzbnpk2cvh9g7q3pkmjwjmk9lz8jargn8ga3ak"; + rev = "63140187ba2b68c2c55d91aa7a07b5c5d15422d9"; + sha256 = "0arhhl684p0nhxhc53sbhcc1rmv3v107s5j0ymwnfa4rnyahz2ii"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -30959,141 +31596,79 @@ license = lib.licenses.free; }; }) {}; - lsp-clangd = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-clangd"; - ename = "lsp-clangd"; - version = "3.1.3"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-clangd"; - rev = "bf7641f6c512a133a038556c17e8b454b0602ea0"; - sha256 = "00zxhzgily9rxnrrwywid4v5kqpls5490hkb4sqixl8xzms0j339"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/71646b47e5f5702e80bf6c56f882d041074ef3c0/recipes/lsp-clangd"; - sha256 = "05dmzyb9xw2m4kck7y3cj8dm2542p3vi48lqs21gcrvm5vbrkx3g"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-clangd"; - license = lib.licenses.free; - }; - }) {}; - lsp-dart = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-dart"; - ename = "lsp-dart"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "twlz0ne"; - repo = "lsp-dart"; - rev = "c52d825aeebcad250890fe8ded1147df8f9499cf"; - sha256 = "0c3ii7np45bz6wlqzwn1bacdwa8r0880qygjb71ypf5ilq1gk40y"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/da22fe98eb57e143077c4a7c4dbeba70120d527a/recipes/lsp-dart"; - sha256 = "0zv6spd1h2ijkix38hxvvblg37ybm65568gg8fv9qr8giw0bjfy2"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-dart"; - license = lib.licenses.free; - }; - }) {}; - lsp-java = callPackage ({ emacs + lsp-java = callPackage ({ dash + , dash-functional + , emacs + , f , fetchFromGitHub , fetchurl + , ht , lib , lsp-mode , markdown-mode - , melpaBuild }: + , melpaBuild + , request }: melpaBuild { pname = "lsp-java"; ename = "lsp-java"; - version = "1.0"; + version = "2.1"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "17f80c9935a0004e59c2e706de4b91eba45344c8"; - sha256 = "11ki7mb2pivvmqhn3ya67ph7vz7l3pfa0cqmv6jny12l6iq6awcb"; + rev = "17a1ec97e30b0690c5f79bc8223f23b7e7dfe577"; + sha256 = "11gpd3yy2018s6m3s3pzkhknhgbs7cf38jsg6ma5lidmygjivpjc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03cb07862c5f35487fb4fb3cc44623774724717/recipes/lsp-java"; sha256 = "0rrl9mh25w1avvyww840d3yh8nw0shirspxl2nxqwwdaymbkg2wr"; name = "recipe"; }; - packageRequires = [ emacs lsp-mode markdown-mode ]; + packageRequires = [ + dash + dash-functional + emacs + f + ht + lsp-mode + markdown-mode + request + ]; meta = { homepage = "https://melpa.org/#/lsp-java"; license = lib.licenses.free; }; }) {}; - lsp-mode = callPackage ({ emacs + lsp-mode = callPackage ({ dash + , dash-functional + , emacs + , f , fetchFromGitHub , fetchurl + , ht , lib - , melpaBuild }: + , melpaBuild + , spinner }: melpaBuild { pname = "lsp-mode"; ename = "lsp-mode"; - version = "5.0"; + version = "6.0"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "f54f564a498ac4f1b98e1dba3e3d621f624f9c02"; - sha256 = "115akc8qb152lcyp2x2z5k8mjdcyh92j8g9nzq5ffyc84jx450km"; + rev = "789b672500dcbb2350bb5b667ffc0fd037a8b2e3"; + sha256 = "1v1mq6ixzlgiazj8fmg4xaqhsqn3l89iqy74yndhvzh2rdf0pbkl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; sha256 = "0cklwllqxzsvs4wvvvsc1pqpmp9w99m8wimpby6v6wlijfg6y1m9"; name = "recipe"; }; - packageRequires = [ emacs ]; + packageRequires = [ dash dash-functional emacs f ht spinner ]; meta = { homepage = "https://melpa.org/#/lsp-mode"; license = lib.licenses.free; }; }) {}; - lsp-ocaml = callPackage ({ emacs - , fetchFromGitHub - , fetchurl - , lib - , lsp-mode - , melpaBuild }: - melpaBuild { - pname = "lsp-ocaml"; - ename = "lsp-ocaml"; - version = "0.2.0"; - src = fetchFromGitHub { - owner = "emacs-lsp"; - repo = "lsp-ocaml"; - rev = "5a8c776b6d75b502703243b3d628fccd813481b0"; - sha256 = "1431f8r8c4h8jbghggk1s2bwqr1qlxys3d52xsvf35bbk1gki5an"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml"; - sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33"; - name = "recipe"; - }; - packageRequires = [ emacs lsp-mode ]; - meta = { - homepage = "https://melpa.org/#/lsp-ocaml"; - license = lib.licenses.free; - }; - }) {}; lsp-p4 = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -31125,7 +31700,6 @@ , emacs , fetchFromGitHub , fetchurl - , flycheck , lib , lsp-mode , markdown-mode @@ -31133,26 +31707,19 @@ melpaBuild { pname = "lsp-ui"; ename = "lsp-ui"; - version = "0.0.1"; + version = "6.0"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "5138e720451dfbcae2f55a8380416340d5706583"; - sha256 = "10b1qcblarxl8xb1dpmrmh2yk998ln9mmx24hvmxf4skh2zr7zd7"; + rev = "a8c50a93952afae3cd8948fecf4c1a3dc7f3e094"; + sha256 = "1r4327fd8cvjxfwkddp5c4bdskyncbs4sx9m3z2w4d773y2jrakc"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; - sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/b7c78c9b07ede9949d14df74b188d4c1a3365196/recipes/lsp-ui"; + sha256 = "0fylav8b54g020z039zm1mx26d257715bfn9nnpw9i0b97539lqi"; name = "recipe"; }; - packageRequires = [ - dash - dash-functional - emacs - flycheck - lsp-mode - markdown-mode - ]; + packageRequires = [ dash dash-functional emacs lsp-mode markdown-mode ]; meta = { homepage = "https://melpa.org/#/lsp-ui"; license = lib.licenses.free; @@ -31658,12 +32225,12 @@ melpaBuild { pname = "magit-popup"; ename = "magit-popup"; - version = "2.12.5"; + version = "2.13.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "8eaa0becc2370484a432a8a19f40ce5e8d0f1642"; - sha256 = "13riknyqr6vxqll80sfhvz165flvdz367rbd0pr5slb01bnfsi2i"; + rev = "4250c3a606011e3ff2477e3b5bbde2b493f3c85c"; + sha256 = "073x1yf96b623yphylnf0ysannr91vawzgjdv1smkcrgd4451hr3"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -31687,14 +32254,14 @@ ename = "magit-stgit"; version = "2.1.3"; src = fetchFromGitHub { - owner = "magit"; + owner = "emacsorphanage"; repo = "magit-stgit"; rev = "9d13effdbc213a0c8dcce78e1825011631fa0652"; sha256 = "163a1rddl54jgxm5dygnbp1pz1as4hhjszan1rcabvzcfnfdpakj"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; - sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/72a38bbc5bba53dfb971f17213287caf0d190db0/recipes/magit-stgit"; + sha256 = "1spli6yq258zwx95y16s27hr7hlc2h0kc9mjnvjjl13y2l6shm0i"; name = "recipe"; }; packageRequires = [ emacs magit ]; @@ -31714,14 +32281,14 @@ ename = "magit-svn"; version = "2.2.1"; src = fetchFromGitHub { - owner = "magit"; + owner = "emacsorphanage"; repo = "magit-svn"; rev = "c833903732a14478f5c4cfc561bae7c50671b36c"; sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; - sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a1ff188d509aec104e9d21a640cf5bc3addedf00/recipes/magit-svn"; + sha256 = "1dww5fc5phai3wk9lp85h6y08ai3vxgggsqj78a3mlcn2adwwc01"; name = "recipe"; }; packageRequires = [ emacs magit ]; @@ -31848,6 +32415,34 @@ license = lib.licenses.free; }; }) {}; + major-mode-hydra = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , pretty-hydra }: + melpaBuild { + pname = "major-mode-hydra"; + ename = "major-mode-hydra"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "jerrypnz"; + repo = "major-mode-hydra.el"; + rev = "9e7f9ed20d3ea0fa0bb953528aa0d17dbc46e995"; + sha256 = "07plrmy6w186n2czxp00dw8dprh3jnrjm7wk6sycyn571y0ryq4q"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865917fcc75c4118afc89b8bcc20ebdb6302f15d/recipes/major-mode-hydra"; + sha256 = "0654wnsw38sca97kvp8p3k1h6r91iqs873gcjaaxd7a96sisvafd"; + name = "recipe"; + }; + packageRequires = [ dash emacs pretty-hydra ]; + meta = { + homepage = "https://melpa.org/#/major-mode-hydra"; + license = lib.licenses.free; + }; + }) {}; make-color = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -31955,26 +32550,27 @@ license = lib.licenses.free; }; }) {}; - map-progress = callPackage ({ fetchFromGitHub + map-progress = callPackage ({ cl-lib ? null + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "map-progress"; ename = "map-progress"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "map-progress"; - rev = "6b8ef6b60626772082b2e80ec54d1f1275e1a1b8"; - sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877"; + rev = "1fb916159cd054c233ce3c80d9d01adfae640297"; + sha256 = "1hbk35l9aljp4jqg8cv67q6b2jbcx0g665j90fygxqibrf6r52a8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ed3335eaf0be7368059bcdb52c46f5e47c0c1a5/recipes/map-progress"; sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/map-progress"; license = lib.licenses.free; @@ -31988,12 +32584,12 @@ melpaBuild { pname = "map-regexp"; ename = "map-regexp"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "map-regexp"; - rev = "b8e06284ec1c593d7d2bda5f35597a63de46333f"; - sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c"; + rev = "ae2d1c22f786ad987aef3e319925e80160a887a0"; + sha256 = "1ybhizafdhzm7fg8s6gm13fbrz1vnrc7ifq8gvrrm89wl3qi5z7f"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/927314443ecc00d94e7125de669e82832c5a125c/recipes/map-regexp"; @@ -32258,12 +32854,12 @@ melpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "e4482232a5bb2a3036664eba598bf12506fe0b6e"; - sha256 = "07fq3k62j9cz1567i2x11q1j9pwybb7qxwcilnnrphf4aibgq6kn"; + rev = "5095797ef32b922d2a624fa6beb970b5e9cf5ca0"; + sha256 = "0hwax6y9dghqwsbnb6f1bnc7gh8xsh5cvcnayk2sn49x8b0zi5h1"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -32458,6 +33054,38 @@ license = lib.licenses.free; }; }) {}; + md4rd = callPackage ({ cl-lib ? null + , dash + , emacs + , fetchFromGitHub + , fetchurl + , hierarchy + , lib + , melpaBuild + , request + , s + , tree-mode }: + melpaBuild { + pname = "md4rd"; + ename = "md4rd"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "md4rd"; + rev = "443c8059af4925d11c93a1293663165c52472f08"; + sha256 = "1n6g6k4adzkkn1g7z4j27s35xy12c1fg2r08gv345ddr3wplq4ri"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/48d4a3b3337e16e68631409d1de0ce67ae22b837/recipes/md4rd"; + sha256 = "0ayr5qw0cz7bd46djfhm8slr2kfgssi5bsnzqcasr8n4lyg9jvfc"; + name = "recipe"; + }; + packageRequires = [ cl-lib dash emacs hierarchy request s tree-mode ]; + meta = { + homepage = "https://melpa.org/#/md4rd"; + license = lib.licenses.free; + }; + }) {}; mediawiki = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -32494,12 +33122,12 @@ melpaBuild { pname = "meghanada"; ename = "meghanada"; - version = "1.0.10"; + version = "1.0.13"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "b8f18331683c32fb26b1be1a01466bd475373936"; - sha256 = "1cmnkszl5x7f1l3h7iwyqwznk3mvwllkkbz5n10359hb6gjdc326"; + rev = "5f792cfe77b77aced5e70a118aba159f6e59234a"; + sha256 = "0scj5wdd9xhpfj5cvjib8x9hzfkylb5h484ndch0vc1l79nlb650"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -32677,12 +33305,12 @@ melpaBuild { pname = "meta-presenter"; ename = "meta-presenter"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "7ba8d30e36ce6de6e563c7f3a41a24d288787c48"; - sha256 = "0m23qsbai8j0bx0px7v3ipw92i4y8maxibna6zqrw3msv1j3s7cw"; + rev = "3d8c762a7dd7ac39032a3601bd6a717f206e670d"; + sha256 = "0r9zzmglmkkmxcqh0pdlg279mpd524k2rwn56kyvj5i3i8zw9rpl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -32754,7 +33382,7 @@ melpaBuild { pname = "mgmtconfig-mode"; ename = "mgmtconfig-mode"; - version = "0.0.16"; + version = "0.0.18"; src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; @@ -32780,12 +33408,12 @@ melpaBuild { pname = "mhc"; ename = "mhc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "e29e69ab2f282131039a63f56f48e39d56c175d9"; - sha256 = "0lxn4vg3qxzdxad1fv0ssnw4rjhzvrys4k3lqx87sbg28l9ykk77"; + rev = "a0a7e01587c47b11f4aa87ac977ca43298a75570"; + sha256 = "1wxyp4snkarbbrqb1a28hdf286cwf08v0fbi9pl9mw4q7sn598s2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -32798,26 +33426,27 @@ license = lib.licenses.free; }; }) {}; - migemo = callPackage ({ fetchFromGitHub + migemo = callPackage ({ cl-lib ? null + , fetchFromGitHub , fetchurl , lib , melpaBuild }: melpaBuild { pname = "migemo"; ename = "migemo"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "migemo"; - rev = "97e07796573c4c47f286bfe8eeb6428cb474526e"; - sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl"; + rev = "09936ee27a5f3678fdf57b8a0faaa0ff150435cc"; + sha256 = "0wfik7y3ybh4yrrlpydawx5zw0syv7wm7b1mckz2rbv3d863z0n5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2424b0328a0198a03359455abdb3024a8067c857/recipes/migemo"; sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr"; name = "recipe"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/migemo"; license = lib.licenses.free; @@ -33034,12 +33663,12 @@ melpaBuild { pname = "mixed-pitch"; ename = "mixed-pitch"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitLab { owner = "jabranham"; repo = "mixed-pitch"; - rev = "f9bcdd9e30f8370ef0607d714b9411eddf8dd866"; - sha256 = "0wfwap23qdiagjp8c1p1mrzz4r3khb8j46sqy46mw20w7k5cn7lk"; + rev = "15bb9ec6d8be0812a46917205be6c3a1c78f68ff"; + sha256 = "1458sy5b6bis1i0k23jdqk6hfqg0ghk637r3ajql2g19ym48rf58"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/mixed-pitch"; @@ -33421,12 +34050,12 @@ melpaBuild { pname = "moody"; ename = "moody"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "moody"; - rev = "f0cfdcff5946775a22e5b789899269669ba58ecd"; - sha256 = "19ahk775rd9rz8wv6kr5kdynblmyrgg0j6l7g9vs0rwn9ywdxqsn"; + rev = "e0975e844876f0962b2e9481c26739397bd23541"; + sha256 = "0jci21ycsyf1mblcv8vbii4wisw1zcs15q5xwld7ai24kgj70269"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63521fe6a1e540544a07231cc94144439e8caea7/recipes/moody"; @@ -34190,12 +34819,12 @@ melpaBuild { pname = "myterminal-controls"; ename = "myterminal-controls"; - version = "1.0.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "59ff3a02e34969a2ac608906937cb65cb514f9f1"; - sha256 = "11b0m09n1qqhjbdmcilb1g1408k17700qn37m3wavjrcjvdhnd5n"; + rev = "df144b269bc274162602e50c692be20ac9b90547"; + sha256 = "02bd47rx2ykz5hhrf1szcqz7s9r5fxz7n3hnwlqap2r6xcv6cpvk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -34687,12 +35316,12 @@ melpaBuild { pname = "ninja-mode"; ename = "ninja-mode"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; - rev = "484c16336f19bd8970bb6e75322d61b92a229899"; - sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6"; + rev = "6d5a4b9eb973e9d82d63f8f9a421fad97d20e6d0"; + sha256 = "1y5bkgd4kx0gm371k78fk0bjbjfnjxah88brgrvj9x29vw4vgl91"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/ninja-mode"; @@ -34785,6 +35414,34 @@ license = lib.licenses.free; }; }) {}; + nlinum-hl = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , nlinum }: + melpaBuild { + pname = "nlinum-hl"; + ename = "nlinum-hl"; + version = "1.0.6"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-nlinum-hl"; + rev = "dc6b365a58e06c7d637a76a31c71a40b20da8b56"; + sha256 = "1fvvyc77iggil9mzy8hd4vx8xw96bkfx6pmlb9ami428qp8r45g7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl"; + sha256 = "17lcp1ira7yhch9npg9sf3npwg06yh9zyhg0lnb22xg09lbndj0x"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs nlinum ]; + meta = { + homepage = "https://melpa.org/#/nlinum-hl"; + license = lib.licenses.free; + }; + }) {}; no-littering = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -34793,12 +35450,12 @@ melpaBuild { pname = "no-littering"; ename = "no-littering"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "0243e7485de736be9b7299c1e188d0cc9fdc3349"; - sha256 = "1llibjlfgf71ssc2yrqqkszvk5mmb1cdya9k1fgjdgvjg5hjsk8q"; + rev = "5a6f483dca3c8a2dcf3a56ab07ffbea21b2926a1"; + sha256 = "0r45bz68d3bx1bnnp28gkyw9rsnly5dy2b9h1b2gjn1hpfs7clci"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -34946,11 +35603,11 @@ melpaBuild { pname = "notmuch"; ename = "notmuch"; - version = "0.28"; + version = "0.28.3"; src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - rev = "e8cb6b2cd63c9ea8a011cb9f672baf04b4c14f7b"; - sha256 = "0lydra1i14l5kmhqa4n424hvsn65yf1vvvv8pkf0hl661i34dbkn"; + rev = "3c752b855f900f5251df9997514b4d27d9f38e83"; + sha256 = "07k5bsifxlsy6caqgk467cfgqw3mgfb5cqb80nc5v4fcjfh0wwcv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch"; @@ -35407,6 +36064,31 @@ license = lib.licenses.free; }; }) {}; + ob-ml-marklogic = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ob-ml-marklogic"; + ename = "ob-ml-marklogic"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "ndw"; + repo = "ob-ml-marklogic"; + rev = "d5660ad14f29e17cd26ae92eeb585b24030e9570"; + sha256 = "1aqllsn965km3796q92w3a3z92hkpm5i0l6p4fm3va9xq7j79cyc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic"; + sha256 = "1y5cgba7gzlmhdrs0k7clgrxixdl4najj5271x1m023jch7bz7xl"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-ml-marklogic"; + license = lib.licenses.free; + }; + }) {}; ob-prolog = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -35592,6 +36274,33 @@ license = lib.licenses.free; }; }) {}; + objed = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "objed"; + ename = "objed"; + version = "0.8.1"; + src = fetchFromGitHub { + owner = "clemera"; + repo = "objed"; + rev = "4798b5b9fd531562ac17d6148e86cd8cdc1bc985"; + sha256 = "16ans9pmzfjqdz0gi92yaah0vv6g4vmjbq3g1jqhcykin6ba8lpg"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4abc6d927a2bf238d23256adcc9f09a751c90374/recipes/objed"; + sha256 = "0iqvwa664fzklajqgnss7igjh7jr9v9i8dp9acm42g8ingp9zf7b"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/objed"; + license = lib.licenses.free; + }; + }) {}; ocodo-svg-modelines = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -36035,6 +36744,33 @@ license = lib.licenses.free; }; }) {}; + ordinal = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "ordinal"; + ename = "ordinal"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "ordinal.el"; + rev = "bfad160d7c4b6faecfe5ac986bb4858cf7149b59"; + sha256 = "1zmsac4jg3yvr3n7pkz8fhpgw9b6lqm9zcq3xh8zmb1x4ckf33z8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ea3dd6fe4cacc229dd1371cb66dd1cfd07321bf4/recipes/ordinal"; + sha256 = "19s27mv7kqcg9qxa844al7q1hk0qbiqh93g1n54r3b6s980dlgcv"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/ordinal"; + license = lib.licenses.free; + }; + }) {}; org-ac = callPackage ({ auto-complete-pcmp , fetchFromGitHub , fetchurl @@ -36354,6 +37090,33 @@ license = lib.licenses.free; }; }) {}; + org-d20 = callPackage ({ dash + , fetchgit + , fetchurl + , lib + , melpaBuild + , s + , seq }: + melpaBuild { + pname = "org-d20"; + ename = "org-d20"; + version = "0.2"; + src = fetchgit { + url = "https://git.spwhitton.name/org-d20"; + rev = "a88a3bb5e43940c2965edd8de27ecf7a2065d86b"; + sha256 = "08s05hpyg52qhvf487cy8x6p2ln8mkiw49kmcavmkmpss2zsqdpn"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/98bf91038196dfb59c491c9ed96c6b6a0cb311a9/recipes/org-d20"; + sha256 = "158n900ifb1mfckd0gjmb9gpzibh8a2x56flbn2r035gcdbb7wc5"; + name = "recipe"; + }; + packageRequires = [ dash s seq ]; + meta = { + homepage = "https://melpa.org/#/org-d20"; + license = lib.licenses.free; + }; + }) {}; org-doing = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -36605,12 +37368,12 @@ melpaBuild { pname = "org-index"; ename = "org-index"; - version = "5.9.3"; + version = "5.12.0"; src = fetchFromGitHub { owner = "marcIhm"; repo = "org-index"; - rev = "d073e071ab5e96af6691ccf9b20c975e7a0c8e16"; - sha256 = "15r9qxbkz2s82qj7fbdzcln4w3qipq6lgdfyrgmzi9f73v5l0c8f"; + rev = "fc9635edd4bf394059e53a1fa16cdd8ab5b7b468"; + sha256 = "0qzqlfnrc2x4mm40wrsmpbh61129ww2a2sk4s1px49fi8552vqyq"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/org-index"; @@ -36635,12 +37398,12 @@ melpaBuild { pname = "org-jira"; ename = "org-jira"; - version = "4.0.3"; + version = "4.3.1"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "45f3e8f19f511fae2012828a99b8e3254708531c"; - sha256 = "1s42bvmg04vf5fl1y9pzga63xmbk72s3ydgnqhq88xg7cj9siw0h"; + rev = "3a6c9fd6886f9dbd11b055fb3bf54513fa278940"; + sha256 = "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0a2fae6eecb6b4b36fe97ad99691e2c5456586f/recipes/org-jira"; @@ -36661,12 +37424,12 @@ melpaBuild { pname = "org-journal"; ename = "org-journal"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "3ae2e7d7e372dee08143282a9137bf4dfc946645"; - sha256 = "1sqn68l1rlyypz3839hghrpwzcdxvqwr50dbfad5827garflg3m4"; + rev = "af2819c41b34fc88e2aee473fbdf695451ba167c"; + sha256 = "05kxs63ssgc6h47cjldxxmx9ggy1fyaxxrxzaq078gj56411gmld"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -36685,23 +37448,24 @@ , fetchurl , lib , melpaBuild - , org }: + , org + , s }: melpaBuild { pname = "org-kanban"; ename = "org-kanban"; - version = "0.4.9"; + version = "0.4.13"; src = fetchFromGitHub { owner = "gizmomogwai"; repo = "org-kanban"; - rev = "a1994228c669ba23f20310d03d2dc58a2a3be6e6"; - sha256 = "0c6w9zh0l7x8gmmw64daswh1a8r23d0hzdz9piy1xz850xhkvp0f"; + rev = "03387a779167c4acbc04d4970cd33c52a2ca0bcd"; + sha256 = "0arjx1a7skdlmagyy0bbxwc134dn951y99yv4jg6l64j1f31y0yg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban"; sha256 = "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41"; name = "recipe"; }; - packageRequires = [ dash emacs org ]; + packageRequires = [ dash emacs org s ]; meta = { homepage = "https://melpa.org/#/org-kanban"; license = lib.licenses.free; @@ -36798,12 +37562,12 @@ melpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "0.1.1"; + version = "0.1.5"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "0752659f7a19cead182584fabc9544464f69b83e"; - sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz"; + rev = "0db41d5b4e9ef9df640e7212a22708ce636b3986"; + sha256 = "0lcn69vzx5987yz4byxvnk8z7nc2bbww7my6v0hxqkra9xh0iqlm"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -37032,6 +37796,32 @@ license = lib.licenses.free; }; }) {}; + org-pretty-tags = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "org-pretty-tags"; + ename = "org-pretty-tags"; + version = "0.2.0"; + src = fetchFromGitLab { + owner = "marcowahl"; + repo = "org-pretty-tags"; + rev = "f6146857d1e173a59b322efa5fd18f4bfb204214"; + sha256 = "1vkz3cnavh1x3340qpwmdak7gkpi925mja6xbwxmix03gaz3l3cm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9ad60399420764d4ef5d6acddae9241205937e78/recipes/org-pretty-tags"; + sha256 = "19cxfjl6c0yhsc7kfjd6imckcvzdsaws3yd1s3nazhnkm3kan3h4"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-pretty-tags"; + license = lib.licenses.free; + }; + }) {}; org-projectile = callPackage ({ dash , emacs , fetchFromGitHub @@ -37124,12 +37914,12 @@ melpaBuild { pname = "org-random-todo"; ename = "org-random-todo"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "60364c18725d2f3898a9099e7e546ae406dd6578"; - sha256 = "0k86hqmqilvkam886mb85v991ivwnglallwj4l9ghszl7awy207m"; + rev = "09228e55f1cc702053d305fdea2b094b548e6dbe"; + sha256 = "0msgsbz39zc9zqgy1s5kmgcqggamnxr98j6bghyqpkxc96zyvp73"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -37142,6 +37932,34 @@ license = lib.licenses.free; }; }) {}; + org-re-reveal = callPackage ({ emacs + , fetchFromGitLab + , fetchurl + , htmlize + , lib + , melpaBuild + , org }: + melpaBuild { + pname = "org-re-reveal"; + ename = "org-re-reveal"; + version = "1.0.3"; + src = fetchFromGitLab { + owner = "oer"; + repo = "org-re-reveal"; + rev = "50cc6574c77f12d423f6cd096d8f76feb3673abc"; + sha256 = "1v3z30gpimg4spf6zzqwp9b597zxk89h0vpq6xp58js4rjg4ixk8"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3e6c90a6b9004fbf0fbc08556f8effbcde8b468/recipes/org-re-reveal"; + sha256 = "05p8iml0fapi4yf7ky45kf7m0ksz917lxg7c4pdd9hjkjmz29xn9"; + name = "recipe"; + }; + packageRequires = [ emacs htmlize org ]; + meta = { + homepage = "https://melpa.org/#/org-re-reveal"; + license = lib.licenses.free; + }; + }) {}; org-readme = callPackage ({ fetchFromGitHub , fetchurl , header2 @@ -37171,6 +37989,35 @@ license = lib.licenses.free; }; }) {}; + org-recent-headings = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , frecency + , lib + , melpaBuild + , org }: + melpaBuild { + pname = "org-recent-headings"; + ename = "org-recent-headings"; + version = "0.1"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-recent-headings"; + rev = "01633b51ac3958b41cc6c79e6d3714047a91c1e9"; + sha256 = "0gsrzmg3mssh9s28yjm9m866fnhm1pcligssz1q6brga6dm6f2yy"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; + sha256 = "0b51pyxdk8fdbksx7h1c88sw1liwng8wkjfb1q7w7lglw6f8sjsa"; + name = "recipe"; + }; + packageRequires = [ dash emacs frecency org ]; + meta = { + homepage = "https://melpa.org/#/org-recent-headings"; + license = lib.licenses.free; + }; + }) {}; org-ref = callPackage ({ dash , emacs , f @@ -37320,6 +38167,33 @@ license = lib.licenses.free; }; }) {}; + org-sticky-header = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , org }: + melpaBuild { + pname = "org-sticky-header"; + ename = "org-sticky-header"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "org-sticky-header"; + rev = "2847035ec559a46bd7b555f220f819c88371d538"; + sha256 = "0g6hdg11jzzpw7h0f6p795l5aj6pag2nhhfbx90cg28j61d28vwh"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9a600bd156eb766ba5ce37e16f3e8253f37ee8/recipes/org-sticky-header"; + sha256 = "0ign3vjckmxp7n3625wb53qlch07c3s4l67jsvk38dhhcsg1rhnj"; + name = "recipe"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-sticky-header"; + license = lib.licenses.free; + }; + }) {}; org-super-agenda = callPackage ({ dash , emacs , fetchFromGitHub @@ -37332,12 +38206,12 @@ melpaBuild { pname = "org-super-agenda"; ename = "org-super-agenda"; - version = "1.0.3"; + version = "1.1"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-super-agenda"; - rev = "f2831038b4964b7873246e96508d560e89b55055"; - sha256 = "14ql68f42qsqna2v9cjqc9d83hvcy7irmnw5z85zbhih9png9hfh"; + rev = "a7abfb677f7ab5453f74e89eba0c461307ee20ee"; + sha256 = "0vzf91lsxnhwf52kvm8ycpf0wb9c8l91689vyhwgv4wz8q6cvjwp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda"; @@ -37519,12 +38393,12 @@ melpaBuild { pname = "org-timeline"; ename = "org-timeline"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "org-timeline"; - rev = "5d1adbbadf3a9ad4a4a70dbf4b7199a6f9992b59"; - sha256 = "1bvbq0xg0lp42pvl8a77f902yhfr5y7zy20jzpfsr94lyryh1p0b"; + rev = "aed995c1db6c8bfd9db0a75a978f5e261aab38e5"; + sha256 = "1jz44lag1j4rawqjpcgb9zrs88vfi7vjgdh756hs2ln7i1cnvgh5"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/298bd714f6cefd83d594b0eea731a01fb2faf1ad/recipes/org-timeline"; @@ -37728,6 +38602,7 @@ }; }) {}; org-wild-notifier = callPackage ({ alert + , async , dash , emacs , fetchFromGitHub @@ -37737,19 +38612,19 @@ melpaBuild { pname = "org-wild-notifier"; ename = "org-wild-notifier"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "5da63fc00db20b60eb46a241cc8308547d85b3ad"; - sha256 = "1269az078d6d0x7ims2qa6wdv8ql2hn70fwigfqw116v9602ywjr"; + rev = "65054365e4b279cef97acc6d20235c4ca422cf04"; + sha256 = "1h6nb1g075anbqw0a5pdfy5194hldhngvdx20naf5y2nznqj7dn7"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; name = "recipe"; }; - packageRequires = [ alert dash emacs ]; + packageRequires = [ alert async dash emacs ]; meta = { homepage = "https://melpa.org/#/org-wild-notifier"; license = lib.licenses.free; @@ -37758,6 +38633,7 @@ org2blog = callPackage ({ fetchFromGitHub , fetchurl , htmlize + , hydra , lib , melpaBuild , metaweblog @@ -37766,19 +38642,19 @@ melpaBuild { pname = "org2blog"; ename = "org2blog"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "org2blog"; repo = "org2blog"; - rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0"; - sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps"; + rev = "55dbed00ebe5c841c43800b39764682759ecf326"; + sha256 = "1fncgiwyigvmkc40bm1nr4nlkm828a04jv33jsnzjzyi2n00mbgx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/org2blog"; sha256 = "15nr6f45z0i265llf8xs87958l5hvafh518k0s7jan7x1l6w5q33"; name = "recipe"; }; - packageRequires = [ htmlize metaweblog org xml-rpc ]; + packageRequires = [ htmlize hydra metaweblog org xml-rpc ]; meta = { homepage = "https://melpa.org/#/org2blog"; license = lib.licenses.free; @@ -38203,12 +39079,12 @@ melpaBuild { pname = "outshine"; ename = "outshine"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outshine"; - rev = "d1e37053f186f9a090573b599fc1c0e88db524ae"; - sha256 = "0r3wj9gzy2m4d9i704z29zh5mps55rxmfavdpwjd1sbrrqwpl4jk"; + rev = "3edf0c61e94d36d174120c8080a98023e30a58a2"; + sha256 = "1lh9f5dgdbwfyzxk6nsg1xwdjs8gc6p9mbyyhp6f8fnk3h0y88cg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; @@ -38255,12 +39131,12 @@ melpaBuild { pname = "overcast-theme"; ename = "overcast-theme"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "myTerminal"; repo = "overcast-theme"; - rev = "faafe7c19106cb4db29ba716d117fbb6ebdda3f4"; - sha256 = "1kjvx2wjb9ksdr7w0c4xnvqa4sbplj6rwlh85lbmcg8lwkb1s2sy"; + rev = "769078cb4a6ea87a31fcea0218c06e1ec689b97c"; + sha256 = "044g4y8ykh41b3ybxsgsrqvnkq8i1q8q8livh64b2qqrrjzq6mxg"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86691c61fc880954a05502a6474cc2fa0d0a43b/recipes/overcast-theme"; @@ -38922,12 +39798,12 @@ melpaBuild { pname = "pandoc-mode"; ename = "pandoc-mode"; - version = "2.26"; + version = "2.27.1"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "d594ce399fc75eb553a6d8572713b827f744d95b"; - sha256 = "1n3rbjvaqf6gzqgqsfcn989cwhi2kva4dr9xy0vdhqxikwm5gkaq"; + rev = "d135bb5b8874f1b16c053215ecb29e22f0f79657"; + sha256 = "1gmw78vjl82xlb4ajfiaf4q6hg35xadhjcvy7kyzr0kzs1zkkk4n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -38977,12 +39853,12 @@ melpaBuild { pname = "paradox"; ename = "paradox"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "17a6690d42a1e854ec270ed930c7494077570fc8"; - sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc"; + rev = "3d918ad74448eb4715be8ac25406e20be552017a"; + sha256 = "1hmkizglppky16k6v1ahxq1awcn8k2x82yrgdvsgkl29qg9s3fkl"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -39234,23 +40110,24 @@ , fetchurl , lib , melpaBuild - , password-store }: + , password-store + , password-store-otp }: melpaBuild { pname = "pass"; ename = "pass"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "2ccf4f68fa4d2aab7efbdc26ebdc45ac1ef1819c"; - sha256 = "11b8c0qihgkl46hjqx6g1p1ifd7lc3q7jhqds3gr41zsrnlyi3p8"; + rev = "cd79375005a1c1d8b45d38fefa91eef0bd23182c"; + sha256 = "05h4hacv3yygyjcjj004qbyqjpkl4pyhwgp25gsz8mw5c66l70cx"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr"; name = "recipe"; }; - packageRequires = [ emacs f password-store ]; + packageRequires = [ emacs f password-store password-store-otp ]; meta = { homepage = "https://melpa.org/#/pass"; license = lib.licenses.free; @@ -39637,12 +40514,12 @@ melpaBuild { pname = "pdf-tools"; ename = "pdf-tools"; - version = "0.80"; + version = "0.90"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "920e598c1ec6eb9a48dde32282d10adc9cc3b011"; - sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s"; + rev = "c41694fb198e644b3da03917e6792c71cf0c81dc"; + sha256 = "0pvid9gzr1ix2d8azvf37iqjpha0arcc1yfny4n19wpq9r2gvayc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -39713,12 +40590,12 @@ melpaBuild { pname = "persistent-scratch"; ename = "persistent-scratch"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "2e6678a837db85e68da713bbd4772c7fb88d83d4"; - sha256 = "0ipr2cnw5b26q560c82mm6bmkx9clw1mrndycs2qz894y53dzlmk"; + rev = "71371a7ce9846754276350fd577dc7543eb52878"; + sha256 = "0n638krbrs2hx97cgkb5nc0fbrd8wsbmb7mz3ym5mx5pvdyxnlgv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -39898,12 +40775,12 @@ melpaBuild { pname = "pfuture"; ename = "pfuture"; - version = "1.2"; + version = "1.6"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb"; - sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m"; + rev = "766cfb7d2df8ebc6144fb644d4d858f66657f60d"; + sha256 = "1zjkpanfxhdfq75dy5x2m541qxpcnh67d7aiijdgkb0g5v3yb61d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -40084,12 +40961,12 @@ melpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.20.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "emacs-php"; repo = "php-mode"; - rev = "a459051036d7c0bedcbf54b904e30d4bc7179ad8"; - sha256 = "16yxwrvyaq0a86i9izrk5bdmxn4gsc2sh2abg038hzg3a1a2dz87"; + rev = "bcde734c37ca36e6c2a925038760247b09ca8825"; + sha256 = "0shrssfjbqykpyz8kmchizgcl2m29bxp1n1331csi0lnqkb9v540"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e41dc09413eaa93704e7d9f55bd2bd01f658806/recipes/php-mode"; @@ -40193,12 +41070,12 @@ melpaBuild { pname = "phpstan"; ename = "phpstan"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "emacs-php"; repo = "phpstan.el"; - rev = "09102b062b607affc93f2d8a113a9fc9f9cf3016"; - sha256 = "0n21vyvd5c42v03xcfx94dz252z3s413i0f9pwjrssq2yd3x2bgm"; + rev = "1151b8d418af532fdf0732b9793b479c64a364e3"; + sha256 = "0wb9pshgcrq2w9d9fpkywz299ihcb9fffh3fdk8rm1r8irylrjkh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/phpstan"; @@ -40505,12 +41382,12 @@ melpaBuild { pname = "plantuml-mode"; ename = "plantuml-mode"; - version = "1.2.7"; + version = "1.2.9"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "82ab084c8631e70b089448ace72525f647af4f10"; - sha256 = "0jcsbswpg41r27i5xb5lvw17n1kndwl8df9iwyhpm26jh2i2hpyv"; + rev = "2b84a2df523904c180a3556c851f59beb0e070d7"; + sha256 = "0l4nxda55ipbrzy0nj59d1vf97m2h9ydviq9r7hiw4mjfq31lzsv"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode"; @@ -41000,6 +41877,33 @@ license = lib.licenses.free; }; }) {}; + poly-rst = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , polymode }: + melpaBuild { + pname = "poly-rst"; + ename = "poly-rst"; + version = "0.1.5"; + src = fetchFromGitHub { + owner = "polymode"; + repo = "poly-rst"; + rev = "68f5e9ee448f4da33d2acab4874d8c9e91190d16"; + sha256 = "14wgfncwsnb4xs2qcr04d0my7dndjkq79q5gr6bjf74vys6a37ra"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d3fb89f58903245a8df75060ddd695a05cedb322/recipes/poly-rst"; + sha256 = "08sdnjb5zvlynyxkmajn1j9gnjdjj81ycid9ziydvrb7hb88x2m4"; + name = "recipe"; + }; + packageRequires = [ emacs polymode ]; + meta = { + homepage = "https://melpa.org/#/poly-rst"; + license = lib.licenses.free; + }; + }) {}; poly-ruby = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -41318,6 +42222,32 @@ license = lib.licenses.free; }; }) {}; + posframe = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "posframe"; + ename = "posframe"; + version = "0.4.3"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "posframe"; + rev = "96dbc49f4f434c0aea59242fbcee663c1533ec05"; + sha256 = "0i5xd7x33zmshhkzpsbpcpc8lgvv5vinnl1a07bnp8r1sp4yahm0"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; + sha256 = "02chwkc7gn7fxaaxsz9msmrhrd62bji5hhb71kdm019x8d84z06w"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/posframe"; + license = lib.licenses.free; + }; + }) {}; powerline = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -41429,12 +42359,12 @@ melpaBuild { pname = "prescient"; ename = "prescient"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "raxod502"; repo = "prescient.el"; - rev = "1623a0d4e5b9a752db45923fd91da48b49c85068"; - sha256 = "0yan4m9xf4iia4ns8kqa0zsham4h2mcnwsq9xnfwm26rkn94xrw0"; + rev = "562d25a1c3c5b2e269d82f374f450e6aa90a970e"; + sha256 = "1ncplx5p3cffyzg9ygzqqxj0vpvwrz9rp2n4z6c375a78fyydrk0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient"; @@ -41474,6 +42404,35 @@ license = lib.licenses.free; }; }) {}; + pretty-hydra = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , hydra + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "pretty-hydra"; + ename = "pretty-hydra"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "jerrypnz"; + repo = "major-mode-hydra.el"; + rev = "ad709e5aadb129d3e4087f5246aa0d6127e73f30"; + sha256 = "1d2rf3as2r93a7l3n0zdksb6kh2naw5zg6mbpj03k79zldqkkqhk"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865917fcc75c4118afc89b8bcc20ebdb6302f15d/recipes/pretty-hydra"; + sha256 = "0gp4cbffpa17svs7fzxighyly7c8brsn3avv3hqvd590kkz3fkri"; + name = "recipe"; + }; + packageRequires = [ dash emacs hydra s ]; + meta = { + homepage = "https://melpa.org/#/pretty-hydra"; + license = lib.licenses.free; + }; + }) {}; pretty-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -41728,12 +42687,12 @@ melpaBuild { pname = "projectile-rails"; ename = "projectile-rails"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "31c9f90d472e07cb8e49fa8992b187b67c9c9a71"; - sha256 = "0j38zbprkga3iq5wb77zvfa5r3sj3sqv8qh0ab62wm68qy60d6g3"; + rev = "78f5cbe2c212ce19d4732212c46472d1c412659f"; + sha256 = "09aby7yxk28rqz0vaps889idl5n41wj72pa0dr7bqmidq8i5jv4h"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -41968,7 +42927,7 @@ melpaBuild { pname = "protobuf-mode"; ename = "protobuf-mode"; - version = "3.6.1.3"; + version = "3.7.1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; @@ -42123,6 +43082,35 @@ license = lib.licenses.free; }; }) {}; + pubmed = callPackage ({ deferred + , emacs + , esxml + , fetchFromGitLab + , fetchurl + , lib + , melpaBuild + , s }: + melpaBuild { + pname = "pubmed"; + ename = "pubmed"; + version = "0.1"; + src = fetchFromGitLab { + owner = "fvdbeek"; + repo = "emacs-pubmed"; + rev = "195e5f6e0cb7b5c20723c2b6adc3ac19543cfcdc"; + sha256 = "0c37kk8lzhlywlg7gagk62c7k21zy6cg9lhz0jy5sab1icrdzps5"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee84560c15e7389e902fb4a4c548c08be231de82/recipes/pubmed"; + sha256 = "048kh442dnzgwz4wml2a5griav8zyrfzn5b43n9ky84pm7lgcxp3"; + name = "recipe"; + }; + packageRequires = [ deferred emacs esxml s ]; + meta = { + homepage = "https://melpa.org/#/pubmed"; + license = lib.licenses.free; + }; + }) {}; pug-mode = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -42547,6 +43535,32 @@ license = lib.licenses.free; }; }) {}; + pytest-pdb-break = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "pytest-pdb-break"; + ename = "pytest-pdb-break"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "poppyschmo"; + repo = "pytest-pdb-break"; + rev = "38840190dfbcb307778d079da5e2373525b3ac18"; + sha256 = "0887620iq8xn28aajx7z2pkgh19778w494n8icibwlk2mj2m3gxl"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7d5d5e81818dad55edda73fbeca8c5021b932/recipes/pytest-pdb-break"; + sha256 = "0dxn53y9zjlip0bjynjql984wrf39pmg5fsx1qgsrj1bw78xqw26"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pytest-pdb-break"; + license = lib.licenses.free; + }; + }) {}; python-environment = callPackage ({ deferred , fetchFromGitHub , fetchurl @@ -42871,6 +43885,32 @@ license = lib.licenses.free; }; }) {}; + quilt = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "quilt"; + ename = "quilt"; + version = "0.5"; + src = fetchFromGitHub { + owner = "jstranik"; + repo = "emacs-quilt"; + rev = "161ce2d8ba225bccef0ea8ae4937251b8ccaa892"; + sha256 = "0r9j71rc2jcwfr6yqg8qx4fwypqg1d7p31af258ixygs3qy69x14"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28ad2d71574c1995287371cfd73648871b9271f0/recipes/quilt"; + sha256 = "0fgni5khjbxy28i2vdwhcvs0z0yx43ll0c4s8br4w7q9s0nlcvmv"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/quilt"; + license = lib.licenses.free; + }; + }) {}; quiz = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -43333,8 +44373,8 @@ sha256 = "00dgdiiwnwynlyyh6pfhljrl363s8zd5ynbx9mhd2y8c3gmvfab0"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud"; - sha256 = "0wbcclgd23d91c7lx8yx7qigcbc0ywr4hjh7h49pi2avy1cm2q0v"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a21be3673962d5706f12efa5179a5426bdce82b/recipes/realgud"; + sha256 = "14n6d3jfhpa29nf4ywdg3aw4i51lfkr99b4z8q4833pmpz1jbq2c"; name = "recipe"; }; packageRequires = [ @@ -43641,6 +44681,32 @@ license = lib.licenses.free; }; }) {}; + reformatter = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "reformatter"; + ename = "reformatter"; + version = "0.4"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "reformatter.el"; + rev = "b2963f51009948d5e4885237a148695008d4ccbc"; + sha256 = "0hhy6x1bkwlhdlarsgm06g3am4yh02yqv8qs34szpzgy53x84qah"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58de8cf8864867f7b3969f3a048a4844837078b4/recipes/reformatter"; + sha256 = "0z4wa0bmhz55c54vx7qxkl9x7ix20mmgygv91sqll68l10g63l0c"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/reformatter"; + license = lib.licenses.free; + }; + }) {}; region-convert = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -43651,13 +44717,13 @@ version = "0.2.0"; src = fetchFromGitHub { owner = "zonuexe"; - repo = "right-click-context"; + repo = "region-convert.el"; rev = "173c86b4b3fc187d54bcd85b4d7df27a5ee24965"; sha256 = "1paljjwr6sfl835m24vj2j4x3zdh3whwayj6dvyfarbhhcwbwphj"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ddcf4612cccb9a53425c5f0324206d70549d9d9e/recipes/region-convert"; - sha256 = "0daghvxc6gxgric1aa1gw036gbpbzilqz72gr1inqy92hz7xrxfm"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f6963fc11d697b95ebbdaf7fe27c91a6229d08b6/recipes/region-convert"; + sha256 = "16i1b83jms7djkyb3n0crfxgpz05m68f4nrlvzxjj7fb56mvf9j7"; name = "recipe"; }; packageRequires = []; @@ -44094,23 +45160,24 @@ , fetchurl , lib , melpaBuild - , s }: + , s + , wgrep }: melpaBuild { pname = "rg"; ename = "rg"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "164349748da570b9b9105fa2a8294c9e1ec4cbee"; - sha256 = "1bmk4xbaipbcwqmvrhab0qp3rxv50486kf32kpm4lad4wis4318k"; + rev = "77670a4bcdba138a0cef3fb12a20b1492dca902a"; + sha256 = "0hpxkpyylzvzzvqc51ac0r89nv1jdymb8nmsb03sq1svsw5nyag9"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "recipe"; }; - packageRequires = [ cl-lib emacs s ]; + packageRequires = [ cl-lib emacs s wgrep ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -44186,8 +45253,8 @@ sha256 = "1paljjwr6sfl835m24vj2j4x3zdh3whwayj6dvyfarbhhcwbwphj"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ce65fff520deed40670c38f45063dd79d3e6b98b/recipes/right-click-context"; - sha256 = "100qsckbq5myhqbkqsfb7703gcy2np66m6qxby7622px87m4vp7d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f6963fc11d697b95ebbdaf7fe27c91a6229d08b6/recipes/right-click-context"; + sha256 = "189nkxkc7lr2fm5qgmylmz6xv6mpphslj4fgpmr8ynnx9z3nxms2"; name = "recipe"; }; packageRequires = [ cl-lib emacs popup ]; @@ -44465,12 +45532,12 @@ melpaBuild { pname = "rtags"; ename = "rtags"; - version = "2.21"; + version = "2.31"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1249950963e494fbd66a4138cef639ffe6e05cd2"; - sha256 = "10bswgpgwl0c1y2qiw3b11fkcz70j54q7895hsm85af84fipdili"; + rev = "fe31db984968d323653da238b0c403951cd1d704"; + sha256 = "0c7payxxd0f4md0jbvys2pn41bazgljmmy2538smfaw3n20m2hmp"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -44646,12 +45713,12 @@ melpaBuild { pname = "ruby-hash-syntax"; ename = "ruby-hash-syntax"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "bc05c3130a5d3237f04c6064297e56de5f73887d"; - sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414"; + rev = "89fc364a837d7a78ecce34380f09c073a83e30e0"; + sha256 = "1nwf3681fa6lfqr14n9wihckpi220hvamv1ppzmrhn4k49vxljy8"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -44673,14 +45740,14 @@ ename = "ruby-test-mode"; version = "1.0"; src = fetchFromGitHub { - owner = "r0man"; + owner = "ruby-test-mode"; repo = "ruby-test-mode"; rev = "a8f41e63d9e9b031fcbad57911b0a28a444f6cdb"; sha256 = "1wck3n2lcsasrg14jimm9iiyxdsh9mr9293q1kx4l0jm0z1k8f43"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; - sha256 = "06j1q9m08jkwlnkccppf2qlcs48nr8ic9sjdv90rnixc18bw7bpk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f781a76a519afc0222cdf7255822a23e33745deb/recipes/ruby-test-mode"; + sha256 = "08x9pskxz1hvvqablx5mdp1g54n28kpmd10qwrasq2zjbdjghj48"; name = "recipe"; }; packageRequires = []; @@ -44798,12 +45865,12 @@ melpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; - sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; + rev = "106aeab800fb3404baf231845d3e3549ec235afa"; + sha256 = "0bcrklyicxh032rrp585rl5mxd26nb61dp6r5bl935rlcmxzsczh"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -45178,6 +46245,58 @@ license = lib.licenses.free; }; }) {}; + scratch = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "scratch"; + ename = "scratch"; + version = "1.3"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "scratch-el"; + rev = "4813d82b39a451f2a6d5b730cd7ec49a9bdabcca"; + sha256 = "0yiwq2gc4gdgfhaagpawhb7yrzc4fsnyb10w5d0q4whv64cj8555"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch"; + sha256 = "1an30pr64fz13s6lghlcb36b7hn3961vv0yipfp9s140ccygdvh7"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/scratch"; + license = lib.licenses.free; + }; + }) {}; + scrollkeeper = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "scrollkeeper"; + ename = "scrollkeeper"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "scrollkeeper.el"; + rev = "3c4ac6b6b44686d31c260ee0b19daaee59bdccd6"; + sha256 = "18pp4k12g5dyma362461gdp4ds5d3lx9gky2ishsq39949pkz7qz"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d9ad5b16ff61c1f8ba1e030ee0988aa51a437022/recipes/scrollkeeper"; + sha256 = "16wqlyxznall4kmd8l68q4d11qyilj8vsji36h7llprxa2m9pg12"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/scrollkeeper"; + license = lib.licenses.free; + }; + }) {}; scss-mode = callPackage ({ fetchFromGitHub , fetchurl , lib @@ -45431,12 +46550,12 @@ melpaBuild { pname = "sesman"; ename = "sesman"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "vspinu"; repo = "sesman"; - rev = "1a6c5448cbcab6320570ca17a04b7487cdae0bd5"; - sha256 = "0r32f8ma9ddczxrrdz0nadp14j3zmk10q1ch02gb82synkx3xdra"; + rev = "3df33018f1c42f09db21cebe39a25b389fe35f02"; + sha256 = "0z5jb4vpbjsi63w3wjy6d2lgz33qdfvrgfb3bszv4hcf6a96y7fc"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman"; @@ -45532,12 +46651,12 @@ melpaBuild { pname = "shackle"; ename = "shackle"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "4189c1c773aab533969b587f7801ffbcd1d7d613"; - sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq"; + rev = "242bacc940c18b6f9c156e1912155d45537fd827"; + sha256 = "0qqx8py21jaq1bdafkfqx18ns4zn305qg84zbmy65spiqnfq8hwk"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -45995,12 +47114,12 @@ melpaBuild { pname = "shx"; ename = "shx"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "a7d9dda0196423bbb673f9a4d30ac948449758f6"; - sha256 = "0hf4b9a2azdj2xh7ffwz5j2b4akpxia0237ibk6g2kv902982n4s"; + rev = "a70f0cdc3c80b7b5b15d287d9b03e49f943bad57"; + sha256 = "0ihwiw9dxr6vln4dmg5dp75353ip9nc80hjfl1w3j0g3m8vhjbs2"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -46098,12 +47217,12 @@ melpaBuild { pname = "simple-bookmarks"; ename = "simple-bookmarks"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; - rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; - sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; + rev = "54e8d771bcdb0eb235b31c0aa9642171369500e5"; + sha256 = "0i4yw341b7iml2j8mxclixsrdqlvixfxpabaxp4jh70aq2zfw1cf"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; @@ -46396,8 +47515,8 @@ sha256 = "05pgcf3sd4dwl40kfw00s3si8rz8rk9pis81jlxdi5w6qzmlg7v1"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f7b49074393c922c4c4da971f1af70ecdba84abb/recipes/slime"; - sha256 = "14l73q7hqwz5nl7nr8f3cc6bzzgbxgavj2f1z8aq76qfyhxc6zl5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/47609a81b81330820f6ddf717400dc7fa06aaabf/recipes/slime"; + sha256 = "1ds8iprxr04wdhnnw4129v5l3w3k5rjp5ax156ppqr5i7wxx1zac"; name = "recipe"; }; packageRequires = [ cl-lib macrostep ]; @@ -46525,12 +47644,12 @@ src = fetchFromGitHub { owner = "joaotavora"; repo = "sly"; - rev = "2bf65222066f4cfcc91f4a34f785ceac07ecb3a7"; - sha256 = "0l632f7mrf1qh00ccngywja4kxdzh7ygqdyjwm32c2kssa9h304y"; + rev = "950b392887ef6f2a5247152383d57d275d3a3744"; + sha256 = "18i87mdqz90s0b9rm21dcc9zgymnxnj4wds4k2rd1z181ly6zcbq"; }; recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/sly"; - sha256 = "18as0g1fi1x6lgjzd9rn2s6iw3n00q3nxi99lchjnn004pwsv8kq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/974d8812a4c5e45221ce3c32ae72c15ed29665c3/recipes/sly"; + sha256 = "000g5qpy45zqrh3g4mk70mh2lakadfq18djrq7cabagw1qmhqy41"; name = "recipe"; }; packageRequires = []; @@ -47622,6 +48741,31 @@ license = lib.licenses.free; }; }) {}; + sql-presto = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "sql-presto"; + ename = "sql-presto"; + version = "1.0.4"; + src = fetchFromGitHub { + owner = "kat-co"; + repo = "sql-prestodb"; + rev = "bcda455e300a1af75c7bb805882329bc844703b2"; + sha256 = "00whmsylr802fx87yqbr06rbymyln7kq7750pcz26xm1jgja7cax"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a21349775e018822a06bca3c3c338879548e286f/recipes/sql-presto"; + sha256 = "1rjfgvwgl63xn047vmsmj1s31wvrd24v6ibf9nri6qmffhv9i9zb"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sql-presto"; + license = lib.licenses.free; + }; + }) {}; sqlformat = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -48489,12 +49633,12 @@ melpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "4a2cee03519f98cf95b29905dec2566a39ff717e"; - sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr"; + rev = "525b2e4887dd839045313f32d3ddeb5cab4c7a7e"; + sha256 = "009n8zjycs62cv4i1k9adbb284wz2w3r13xki2740sj34k683v13"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -49027,6 +50171,31 @@ license = lib.licenses.free; }; }) {}; + taskpaper-mode = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "taskpaper-mode"; + ename = "taskpaper-mode"; + version = "1.0"; + src = fetchFromGitHub { + owner = "saf-dmitry"; + repo = "taskpaper-mode"; + rev = "169dab1eb632e5ac5e34608be2df4e9854368180"; + sha256 = "0mwd9i6mm0h18z7fiqla95bx6c0zb8x4f6380842hgzi9zrnghxi"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode"; + sha256 = "0gayhzakiwlrkysmh24499pyzdfy3rmf8d68vamih7igxpl57gim"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/taskpaper-mode"; + license = lib.licenses.free; + }; + }) {}; tawny-mode = callPackage ({ cider , emacs , fetchFromGitHub @@ -49433,34 +50602,6 @@ license = lib.licenses.free; }; }) {}; - tern-django = callPackage ({ emacs - , f - , fetchFromGitHub - , fetchurl - , lib - , melpaBuild - , tern }: - melpaBuild { - pname = "tern-django"; - ename = "tern-django"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "proofit404"; - repo = "tern-django"; - rev = "3b779469ba7f0249dec17d91b219dc0badf98774"; - sha256 = "0k9fra8nf1zpa59rznw93pa0pg9h98sq6896wdhahcm9z3x0rlhn"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e9e128a795e4949e3d4c2f01db0161a34935f635/recipes/tern-django"; - sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0"; - name = "recipe"; - }; - packageRequires = [ emacs f tern ]; - meta = { - homepage = "https://melpa.org/#/tern-django"; - license = lib.licenses.free; - }; - }) {}; terraform-mode = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -49673,12 +50814,12 @@ melpaBuild { pname = "theme-looper"; ename = "theme-looper"; - version = "1.0.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9"; - sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn"; + rev = "4eea8ec048f1d6f6d875bf25690337ccc3ddf3dc"; + sha256 = "0lwkilvwx87xw1xx384pyz26agxd3rj11dabvb8bb4paw6c8wwr6"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; @@ -49725,7 +50866,7 @@ melpaBuild { pname = "thrift"; ename = "thrift"; - version = "2018.12.31.0"; + version = "2019.3.18.0"; src = fetchFromGitHub { owner = "facebook"; repo = "fbthrift"; @@ -49778,12 +50919,12 @@ melpaBuild { pname = "tidal"; ename = "tidal"; - version = "1.0.4"; + version = "1.0.10"; src = fetchFromGitHub { owner = "tidalcycles"; repo = "Tidal"; - rev = "93d30b30403bbca81d69488c6882e42f2d8dc18d"; - sha256 = "09gs8xby9bbs3fzbmja7w8rkzfyzkmslrh7hk71sh5fmamhmx53k"; + rev = "8605aacc1207ff822dfac4673332a337ac4f1cc2"; + sha256 = "103cy8iiv373yswfsjz0rr4zp3vm2l3vwyb65hvcm7w0x30bhi9r"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal"; @@ -49935,6 +51076,32 @@ license = lib.licenses.free; }; }) {}; + torus = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "torus"; + ename = "torus"; + version = "1.10"; + src = fetchFromGitHub { + owner = "chimay"; + repo = "torus"; + rev = "b6de553eb55cfd9c0b6dce800951bcd8aef5e70c"; + sha256 = "144azr3m8aj77fgvz4qnjzzhpxwz28lqjzh2k49z736iaax394gd"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/efc3b538861084cc13ff067a9258e55dc006b70d/recipes/torus"; + sha256 = "0zjidnc7nwbxs90spp373hx92vksd72vz4avmi4dbmhi89rdfhh0"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/torus"; + license = lib.licenses.free; + }; + }) {}; total-lines = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -50031,7 +51198,7 @@ melpaBuild { pname = "tracking"; ename = "tracking"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; @@ -50049,6 +51216,34 @@ license = lib.licenses.free; }; }) {}; + transient = callPackage ({ dash + , emacs + , fetchFromGitHub + , fetchurl + , lib + , lv + , melpaBuild }: + melpaBuild { + pname = "transient"; + ename = "transient"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "transient"; + rev = "33f538a0bb83c8d4abc8f4c2db0dfbb9b09c4f92"; + sha256 = "1hrn4mgag6rkcqzpmn5ysa9rj79dsgmh8vrihjvaikrdyshf9zxc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7bfefdf4423d63706a6dcf128886ca6b514e6b/recipes/transient"; + sha256 = "04xkdspn475dlch5fcw21phhdhshxlbyznjbi0l7qk8snm130qpv"; + name = "recipe"; + }; + packageRequires = [ dash emacs lv ]; + meta = { + homepage = "https://melpa.org/#/transient"; + license = lib.licenses.free; + }; + }) {}; transmission = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -50121,12 +51316,12 @@ melpaBuild { pname = "treemacs"; ename = "treemacs"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "3ab7593519104ef6852341e900f2682b89f12646"; - sha256 = "1k41lb7pbgjvc6pry629braaca0lzr7pcj09bmff7inj06p7gqps"; + rev = "495691ebafb37b07afb8b549d0fba714ab17e365"; + sha256 = "1fhp1m8hrdbb0mw5r4diq4hn7svz0j23iqzq6x02dzqp3866qiik"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs"; @@ -50139,6 +51334,117 @@ license = lib.licenses.free; }; }) {}; + treemacs-evil = callPackage ({ evil + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , treemacs }: + melpaBuild { + pname = "treemacs-evil"; + ename = "treemacs-evil"; + version = "2.5"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "de1ba5217ca4c41fc36d405832b749b6fffd2b82"; + sha256 = "0wk280qs99py3s3lykm3pd3v3nbml1c9hkal29cx0475m12fc5lw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-evil"; + sha256 = "144klr1gqqzfqy7fx9lzngc2vljy6mnz7awk0z5f8vfclczkihw2"; + name = "recipe"; + }; + packageRequires = [ evil treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-evil"; + license = lib.licenses.free; + }; + }) {}; + treemacs-icons-dired = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , treemacs }: + melpaBuild { + pname = "treemacs-icons-dired"; + ename = "treemacs-icons-dired"; + version = "2.5"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "0e5d2b558486ce9074eccde83cc70ce1a6bfa2e2"; + sha256 = "05dh7dnn2ks03gvbj5f01h1qa87giaapxhdzl5z4s8g6zwiydjy7"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-icons-dired"; + sha256 = "075897b11aaj9h59gbcldz2wd5557h86pq28qkijbgay4i3piv9v"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-icons-dired"; + license = lib.licenses.free; + }; + }) {}; + treemacs-magit = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , magit + , melpaBuild + , pfuture + , treemacs }: + melpaBuild { + pname = "treemacs-magit"; + ename = "treemacs-magit"; + version = "2.5"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "1a30066872fa11612ab4ff8a8565beedb5f2e135"; + sha256 = "1vbqfkn2llw7kzhh5bmfqpq0gg6qmixxcbq5mjyw53l01klvylvs"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1719c6bfc346e63f58221ea2c6e625b98f4ea368/recipes/treemacs-magit"; + sha256 = "10c32rf76w26hhg1pyjlwj94adpjz1kic4hzapbckvcyzcwz6fql"; + name = "recipe"; + }; + packageRequires = [ emacs magit pfuture treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-magit"; + license = lib.licenses.free; + }; + }) {}; + treemacs-projectile = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild + , projectile + , treemacs }: + melpaBuild { + pname = "treemacs-projectile"; + ename = "treemacs-projectile"; + version = "2.5"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "treemacs"; + rev = "ac088d4afd267de2046ce25658285ffb6174a6ba"; + sha256 = "0fzq8q7mm3nxs1aw3qhhw78lnlh8cagf443sn5n38xb9f4m44djk"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37cca017cf529a0553ba73bcb824a945ec8b1137/recipes/treemacs-projectile"; + sha256 = "1lldvpasvgsd5xvnlafddqp47w7rdvf3vqfhr26rxn99kj5s9xzp"; + name = "recipe"; + }; + packageRequires = [ projectile treemacs ]; + meta = { + homepage = "https://melpa.org/#/treemacs-projectile"; + license = lib.licenses.free; + }; + }) {}; treepy = callPackage ({ emacs , fetchFromGitHub , fetchurl @@ -50895,12 +52201,12 @@ melpaBuild { pname = "uptimes"; ename = "uptimes"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "5e81f8bb419836602819045e7d5a74b76ad3e69c"; - sha256 = "04l452k249s3ilfj0da0k7rrfyjnxxdsipa2al46xqjds8l3h2rn"; + rev = "1f726d31b502d764a3e3191aaf92ed4855105131"; + sha256 = "1ymv5fh0bfjzkkd8vc9f1n8921bx1czbb29s0rw6zy37vkhs6v3s"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -50913,6 +52219,32 @@ license = lib.licenses.free; }; }) {}; + urscript-mode = callPackage ({ emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "urscript-mode"; + ename = "urscript-mode"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "guidoschmidt"; + repo = "urscript-mode"; + rev = "b341f96b129ead8fb74d680cb4f546985bf110a9"; + sha256 = "0qhncqsvsrpgc47ixsp436imfm0l6pd1kbpjjk426wrnzaszrpkc"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b4ae680b51a85749ed254215bbd4a35909961049/recipes/urscript-mode"; + sha256 = "1jjmpg9r7vwa8284chx9yc1ifn36m7ml1ks4ls8hnsxachbv7wlh"; + name = "recipe"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/urscript-mode"; + license = lib.licenses.free; + }; + }) {}; use-package = callPackage ({ bind-key , emacs , fetchFromGitHub @@ -51083,12 +52415,12 @@ melpaBuild { pname = "utop"; ename = "utop"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "48100fcf769bdaeb4a6c93bbb33c37b85c1dcb10"; - sha256 = "1cr1i5ywn9abqbrl4iq1c82vdjwrbh43v67zv1a8i4fvh99yzlv1"; + rev = "ea38850e606dd18c94e2ccabc28485fec1c8f91f"; + sha256 = "0g7mj1qag9d7mn58l3lh7as0w4bj7rq3r6d3mykafgyjaajsxnx0"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -51190,12 +52522,12 @@ melpaBuild { pname = "vc-hgcmd"; ename = "vc-hgcmd"; - version = "1.3.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "muffinmad"; repo = "emacs-vc-hgcmd"; - rev = "261ef39b61849326e52465c3a26c3cc7ba0d7610"; - sha256 = "09g91xlm53g1ic4w9k3f7frxhvmggrpswipw6vhgk3fzbjm2d94m"; + rev = "6379ef242cc2ac8366a6e6f1c588245577c76a3a"; + sha256 = "1zvggg9kpl6d2wrsjlrnjmb0dhmwmd9x6q2yj3g08bv6gsz3nfil"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/111142342ab81dcaa88a831ba620be499a334c3f/recipes/vc-hgcmd"; @@ -51242,12 +52574,12 @@ melpaBuild { pname = "vcomp"; ename = "vcomp"; - version = "0.3.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "vcomp"; - rev = "a12363c3a66576b68955abcadf7280de32eaa051"; - sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x"; + rev = "f839b3b3257a564b19d7f9557dc8bcbbe0b95842"; + sha256 = "1xd42bdi6x89gc9xjrwvzzdaanv9vwlbbjwp25bs1nsd53k5nvak"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/561442ea9f75ebe8444db1a0c40f7756fcbca482/recipes/vcomp"; @@ -51567,12 +52899,12 @@ melpaBuild { pname = "virtualenvwrapper"; ename = "virtualenvwrapper"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb"; - sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws"; + rev = "f753e5ad91c2ff5d11bec424aa8cec141efa6925"; + sha256 = "062pbnplb3w9h64qsj71d9fvgicp1x63n05mgvgymjh2rnx7py0d"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -52138,12 +53470,12 @@ melpaBuild { pname = "webpaste"; ename = "webpaste"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "521de6d9d50d1e382bc5425749c3d4958b321c9b"; - sha256 = "11981fhh8vf6cjvcppg5ilk0yysfx91jhglk7jz49i5a3wwygxc3"; + rev = "7345c5f62d5cff4d84379eaf5dc8b2bb8bc4f99c"; + sha256 = "00dfp2dyj9cvcvvpsh4g61b37477c8ahfj3xig2x2kgfz15lk89n"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -53078,12 +54410,12 @@ melpaBuild { pname = "writeroom-mode"; ename = "writeroom-mode"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a"; - sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z"; + rev = "ebe522ba5a0367cf82ed03ffeb63fe597b84f4a1"; + sha256 = "0w2lmkkij79khjpswk2zxj371fa9ws94j9dqzrgzf37lnimgnsff"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -53430,6 +54762,31 @@ license = lib.licenses.free; }; }) {}; + xresources-theme = callPackage ({ fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "xresources-theme"; + ename = "xresources-theme"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "cqql"; + repo = "xresources-theme"; + rev = "5239acb51aa2dfa89a207e57012108d8fcf60562"; + sha256 = "13pls0f85n5rpbrbqcmrmcznv9hxiaglrnwpzivrli33cba92fpm"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/35763febad20f29320d459394f810668db6c3353/recipes/xresources-theme"; + sha256 = "1vsbvg9w5g6y2qlb8ssn12ax31r7fbslfi9vcgvmjydcr8r1z0zs"; + name = "recipe"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/xresources-theme"; + license = lib.licenses.free; + }; + }) {}; xterm-color = callPackage ({ cl-lib ? null , fetchFromGitHub , fetchurl @@ -53438,12 +54795,12 @@ melpaBuild { pname = "xterm-color"; ename = "xterm-color"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "42374a98f1039e105cad9f16ce585dffc96a3f1c"; - sha256 = "09mzzql76z3gn39qnfjspm8waps8msbkilmlk3n2zrizpbps6crj"; + rev = "a452ab38a7cfae97078062ff8885b5d74fd1e5a6"; + sha256 = "02kpajb993yshhjhsizpfcbrcndyzkf4dqfipifhxxng50dhp95i"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -53771,12 +55128,12 @@ melpaBuild { pname = "yasnippet-snippets"; ename = "yasnippet-snippets"; - version = "0.7"; + version = "0.10"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "88e209997a93f290206bb6e8c7c81d03307ae486"; - sha256 = "0rlg8zlg15kpayvwszif5axwfvd9kc60ipppbfhcypas2gmw35ys"; + rev = "827908d7cdc6e7c1504175b4d49f899f0e9ba945"; + sha256 = "017avn7i3650rnl7lppn8k465ni0xy8v3r750f00gm9hxkzrig0z"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets"; @@ -54098,6 +55455,33 @@ license = lib.licenses.free; }; }) {}; + zmq = callPackage ({ cl-lib ? null + , emacs + , fetchFromGitHub + , fetchurl + , lib + , melpaBuild }: + melpaBuild { + pname = "zmq"; + ename = "zmq"; + version = "0.10.3"; + src = fetchFromGitHub { + owner = "dzop"; + repo = "emacs-zmq"; + rev = "12661cbc1acee8506d88b4853214a8a3716db240"; + sha256 = "1rnddd67wm2g7qm06qhn8h3dakhv5lcf2dqhdhf0ian1lw5z0yvw"; + }; + recipe = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq"; + sha256 = "14bbh00a58xgxyxl8zjxl57rf6351fnwsnk4cvvy341fvf86dklc"; + name = "recipe"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/zmq"; + license = lib.licenses.free; + }; + }) {}; zombie-trellys-mode = callPackage ({ cl-lib ? null , emacs , fetchFromGitHub @@ -54316,12 +55700,12 @@ melpaBuild { pname = "zzz-to-char"; ename = "zzz-to-char"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "b62414b155fe2e09d91b70059a909d1403d89acf"; - sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj"; + rev = "e571da33a0dde629314847338eedec84b40e9c32"; + sha256 = "03i5bdq7d8la9kbvykgi7aa7v3c35nibgcd4pam99l47pm599ili"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch b/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch index 7b4cb9d52667..88befda899a7 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch +++ b/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch @@ -1,13 +1,13 @@ Dump temacs in an empty environment to prevent -dev paths from ending up in the dumped image. -diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in ---- emacs-25.3/src/Makefile.in 2017-04-14 17:02:47.000000000 +0200 -+++ emacs-25.3-new/src/Makefile.in 2017-09-25 19:03:02.173861038 +0200 -@@ -532,7 +532,7 @@ - ifeq ($(CANNOT_DUMP),yes) +diff --git a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes) ln -f temacs$(EXEEXT) $@ else + unset EMACS_HEAP_EXEC; \ - LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump + env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ifneq ($(PAXCTL_dumped),) diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix index fe77ffe84bb1..219d5fca86c2 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; - version = "26.1"; + version = "26.2"; versionModifier = ""; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; + sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; }; enableParallelBuilding = true; @@ -44,13 +44,6 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch - - # should drop this at next package update - (fetchpatch { - name = "support-hunspell-1.7.0-in-ispell.el.patch"; - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=2925ce5a7ec1424cfaea9f2f86bd3cab27832584"; - sha256 = "0w7cgw6zgr7phbivb98innps1rlqf5q2lhwkrwdmai8sbca5bd11"; - }) ]; postPatch = lib.optionalString srcRepo '' diff --git a/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/nixpkgs/pkgs/applications/editors/emacs/macport.nix index 486172ac51f4..33c5da8642c4 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/macport.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/macport.nix @@ -4,19 +4,19 @@ }: stdenv.mkDerivation rec { - emacsVersion = "26.1"; + emacsVersion = "26.2"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "7.4"; + macportVersion = "7.6"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; + sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "1xl3rfqw1f3jil20xf6iy0f1hdk9adj8rnv7xhcjq4pymj4w8ka6"; + sha256 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61"; }; hiresSrc = fetchurl { diff --git a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index 38606bc4c296..63568bef6f74 100644 --- a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ gcc8Stdenv , ctags +, appstream-glib , desktop-file-utils , docbook_xsl , docbook_xml_dtd_43 , fetchurl , flatpak -, glibcLocales , gnome3 , libgit2-glib , gobject-introspection @@ -31,28 +31,33 @@ , vte , webkitgtk , wrapGAppsHook +, dbus +, xvfb_run }: + let - version = "3.30.3"; + # Does not build with GCC 7 + # https://gitlab.gnome.org/GNOME/gnome-builder/issues/868 + stdenv = gcc8Stdenv; +in +stdenv.mkDerivation rec { pname = "gnome-builder"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11h6apjyah91djf77m8xkl5rvdz7mwpp3bjc4yzzs9lm3pag764r"; + sha256 = "00l7sshpndk995aw98mjmsc3mxhxzynlp7il551iwwjjdbc70qp4"; }; nativeBuildInputs = [ - #appstream-glib # tests fail if these tools are available + appstream-glib desktop-file-utils docbook_xsl docbook_xml_dtd_43 - glibcLocales # for Meson's gtkdochelper gobject-introspection gtk-doc hicolor-icon-theme - meson + (meson.override ({ inherit stdenv; })) ninja pkgconfig python3 @@ -64,6 +69,7 @@ in stdenv.mkDerivation { ctags flatpak gnome3.devhelp + gnome3.glade libgit2-glib libpeas vte @@ -83,6 +89,11 @@ in stdenv.mkDerivation { webkitgtk ]; + checkInputs = [ + dbus + xvfb_run + ]; + outputs = [ "out" "devdoc" ]; prePatch = '' @@ -91,19 +102,25 @@ in stdenv.mkDerivation { mesonFlags = [ "-Dpython_libprefix=${python3.libPrefix}" - "-Dwith_docs=true" + "-Ddocs=true" # Making the build system correctly detect clang header and library paths # is difficult. Somebody should look into fixing this. - "-Dwith_clang=false" + "-Dplugin_clang=false" + + # Do not try to check if appstream images exist + "-Dnetwork_tests=false" ]; # Some tests fail due to being unable to find the Vte typelib, and I don't # understand why. Somebody should look into fixing this. - doCheck = false; + doCheck = true; - preInstall = '' - export LC_ALL="en_US.utf-8" + checkPhase = '' + export NO_AT_BRIDGE=1 + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs ''; pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ]; diff --git a/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix b/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix index ff6439c8654e..cfd3a4289901 100644 --- a/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix +++ b/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let - version = "3.30.2"; + version = "3.32.0"; pname = "gnome-latex"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fn3vy6w714wy0bz3y11zpdprpwxbv5xfiyyxjwp2nix9mbvv2sm"; + sha256 = "1jdca9yhm7mm1aijd1a5amphgn15142kngky3id2am379ixrq1hg"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix index 1d9908a7cc00..085affa5f7ec 100644 --- a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs"; }; - cmakeFlags = [ - "-DBUILD_TESTING=OFF" - ]; - nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; diff --git a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix index eda2da9f3daa..4fbf3ed297c1 100644 --- a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DBUILD_TESTING=OFF" "-DPYTHON_EXECUTABLE=${python}/bin/python" ]; diff --git a/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix index 891fd32df70b..52888c5f85d5 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.1.5"; + version = "2.1.7"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "1h05b68ka1ka217f6svq8yxvnscwf9sl5cx46c0b6ygcbz1vr3ba"; + sha256 = "014c8xvb7shy00vjx0b1k8zr7iknxskqab1aqvz9md3bn5rwkxm5"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/nixpkgs/pkgs/applications/editors/okteta/default.nix b/nixpkgs/pkgs/applications/editors/okteta/default.nix index f2068eb30df0..ffa80bc68cae 100644 --- a/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "0.26.0"; + version = "0.26.1"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; - sha256 = "0rxvbllisz4zl687zgpb9jj2nbxgfhhf2bj8bnsfaab5jb6jpi2y"; + sha256 = "1bqq3ax47xym3ikwn6xsshs1b5gpfg5djrnkzszqnp127f1fxi54"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/nixpkgs/pkgs/applications/editors/sigil/default.nix b/nixpkgs/pkgs/applications/editors/sigil/default.nix index 142b6fbd1425..bae3c58b8e1d 100644 --- a/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { - sha256 = "0zlm1jjk91cbrphrilpvxhbm26bbmgy10n7hd0fb1ml8q70q34s3"; + sha256 = "05wnq7av7fgqgcqd88qjwgn55vr4ciy4f0rgi722f52vy97bw9bj"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/nixpkgs/pkgs/applications/editors/vscode/default.nix b/nixpkgs/pkgs/applications/editors/vscode/default.nix index ace5bd968cee..189c49cde35a 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/default.nix @@ -18,16 +18,16 @@ let }.${system}; sha256 = { - "i686-linux" = "0yfnsmixw3kh7lhb8npqhyihy146a31c1k90smn4kqvmlvm06jir"; - "x86_64-linux" = "002bbwj4hxr58lbhjc05s3l9aw37ak06kp98hs8fpmznjsa5x14y"; - "x86_64-darwin" = "1f9hkydlyjh2z5d99pwpsqg9yf05pgi5y0mbprgbxacayqcrq2nr"; + "i686-linux" = "0n2k134yx0zirddi5xig4zihn73s8xiga11pwk90f01wp1i0hygg"; + "x86_64-linux" = "0ljijcqfyrfck5imldis3hx9d9iacnspgnm58kvlziam8y0imwzv"; + "x86_64-darwin" = "00fg106rggsbng90k1jjp1c6nmnwni5s0fgmbz6k45shfa3iqamc"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.33.0"; + version = "1.33.1"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; diff --git a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index e30f4a428a3e..719491ac2b08 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,12 +10,12 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in stdenv.mkDerivation rec { - version = "3.4.5"; + version = "3.4.6"; name = "qgis-unwrapped-${version}"; src = fetchurl { url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; - sha256 = "0myw1jgz8v8wncmrjsszn9ixylx84hafn0281c4hqhz623n3lxgx"; + sha256 = "1skdimcbcv41hi4ii7iq8ka29k2zizzqv04fwidzfbxqclz7300h"; }; passthru = { diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index efbf5864faa8..746bddd5416d 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-22"; - sha256 = "1ivljgf192xh7pq1apdic923pvcb3aq74mx8d4hi65hhc9748gv7"; + version = "7.0.8-34"; + sha256 = "0szkzwy0jzmwx4kqli21jq8pk3s53v37q0nsaqzascs3mpkbza2s"; patches = []; }; in diff --git a/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 2c7833acb5fe..83070e04b16c 100644 --- a/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.6.12"; + version = "3.7.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1qsxwqnkqfp4b9sgmhlv6wjl4mirhnx4bjj2vaq8iyz94pz637c8"; + sha256 = "165g63w605fnirwrgqsldmq2gpb1v65dmfx6niy5and7h9j260gp"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/nixpkgs/pkgs/applications/graphics/darktable/default.nix index b15b57d8430c..e16ef45fe1eb 100644 --- a/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "2.6.1"; + version = "2.6.2"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "09ihbj0602spgc5lfbskf9am38n03gam2r8v3kj4dyfgxqr37ib3"; + sha256 = "0igvgyd042j7hm4y8fcm6dc1qqjs4d1r7y6f0pzpa0x416xyzfcw"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index f322c6442b84..75cd9447b86f 100644 --- a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -1,53 +1,95 @@ { stdenv , fetchurl , cmake +, extra-cmake-modules + +# common deps +, karchive + +# client deps , qtbase -, qtsvg , qtmultimedia +, qtsvg , qttools -, kdnssd -, karchive -, libsodium -, libmicrohttpd + +# optional client deps , giflib -, miniupnpc -, extra-cmake-modules +, kdnssd , libvpx +, miniupnpc +, qtx11extras # kis + +# optional server deps +, libmicrohttpd +, libsodium + +# options +, buildClient ? true +, buildServer ? true +, buildServerGui ? true # if false builds a headless server +, buildExtraTools ? false +, enableKisTablet ? false # enable improved graphics tablet support }: -stdenv.mkDerivation rec { +with stdenv.lib; + +let + commonDeps = [ + karchive + ]; + clientDeps = [ + qtbase + qtmultimedia + qtsvg + qttools + # optional: + giflib # gif animation export support + kdnssd # local server discovery with Zeroconf + libvpx # WebM video export + miniupnpc # automatic port forwarding + ]; + serverDeps = [ + # optional: + libmicrohttpd # HTTP admin api + libsodium # ext-auth support + ]; + kisDeps = [ + qtx11extras + ]; + +in stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.4"; + version = "2.1.7"; + src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0n54p5day6gnmxqmgx4yd7q6y0mgv1nwh84yrz5r953yhd9m37rn"; + sha256 = "1nk1rb1syrlkxq7qs101ifaf012mq42nmq1dbkssnx6niydi3bbd"; }; + nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - # common deps: cmake - qtbase qtsvg qtmultimedia qttools - karchive - # optional deps: - # server-specific: - libsodium # ext-auth support - libmicrohttpd # HTTP admin api - # client-specific: - giflib # gif animation export support - miniupnpc # automatic port forwarding - kdnssd # local server discovery with Zeroconf - libvpx # WebM video export + extra-cmake-modules ]; - configurePhase = "cmake -DCMAKE_INSTALL_PREFIX=$out ."; + buildInputs = + commonDeps ++ + optionals buildClient clientDeps ++ + optionals buildServer serverDeps ++ + optionals enableKisTablet kisDeps ; + + cmakeFlags = + optional (!buildClient ) "-DCLIENT=off" ++ + optional (!buildServer ) "-DSERVER=off" ++ + optional (!buildServerGui ) "-DSERVERGUI=off" ++ + optional ( buildExtraTools) "-DTOOLS=on" ++ + optional ( enableKisTablet) "-DKIS_TABLET=on"; - meta = with stdenv.lib; { + meta = { description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; homepage = https://drawpile.net/; downloadPage = https://drawpile.net/download/; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/nixpkgs/pkgs/applications/graphics/gimp/default.nix index 4d835e6590ed..9e4aec16db88 100644 --- a/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -8,12 +8,12 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { - name = "gimp-${version}"; - version = "2.10.8"; + pname = "gimp"; + version = "2.10.10"; src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"; + url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j"; }; nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; diff --git a/nixpkgs/pkgs/applications/graphics/goxel/default.nix b/nixpkgs/pkgs/applications/graphics/goxel/default.nix index 71ee715b535d..371abafbe72d 100644 --- a/nixpkgs/pkgs/applications/graphics/goxel/default.nix +++ b/nixpkgs/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "14rycn6sd3wp90c9ghpif1al3rv1fdgvhmpldmwap0pk790kfxs1"; + sha256 = "03hyy0i65zdplggaxlndgyvffvnb9g5kvxq2qbicirvz5zcsghk2"; }; patches = [ ./disable-imgui_ini.patch ]; diff --git a/nixpkgs/pkgs/applications/graphics/jbrout/default.nix b/nixpkgs/pkgs/applications/graphics/jbrout/default.nix index 9c81fe32b513..42ed667dee98 100644 --- a/nixpkgs/pkgs/applications/graphics/jbrout/default.nix +++ b/nixpkgs/pkgs/applications/graphics/jbrout/default.nix @@ -34,7 +34,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ]; meta = { - homepage = http://manatlan.com/jbrout/; + homepage = https://manatlan.com/jbrout/; description = "Photo manager"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix b/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix index ba64aae62159..b24b14698e6a 100644 --- a/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix +++ b/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimize JPEG files"; - homepage = http://www.kokkonen.net/tjko/projects.html ; + homepage = https://www.kokkonen.net/tjko/projects.html ; license = licenses.gpl2; maintainers = [ maintainers.aristid ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 36087aa84bb3..0f19a296df39 100644 --- a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, python3Packages , file, intltool, gobject-introspection, libgudev -, udisks, glib, gnome3, gst_all_1, libnotify -, exiv2, exiftool, qt5, gdk_pixbuf +, udisks, gexiv2, gst_all_1, libnotify +, exiftool, gdk_pixbuf, libmediainfo }: python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1517w18sxil1gwd78jjbbixcd1b0sp05imnnd5h5lr8wl3f0szj0"; + sha256 = "1nywkkyxlpzq3s9anza9k67j5689pfclfha218frih36qdb0j258"; }; # Disable version check and fix install tests @@ -19,24 +19,34 @@ python3Packages.buildPythonApplication rec { --replace "disable_version_check = False" "disable_version_check = True" substituteInPlace raphodo/rescan.py \ --replace "from preferences" "from raphodo.preferences" - substituteInPlace raphodo/copyfiles.py \ - --replace "import problemnotification" "import raphodo.problemnotification" ''; - nativeBuildInputs = [ file intltool gobject-introspection ]; + nativeBuildInputs = [ + file + intltool + ]; + + # Package has no generally usable unit tests. + # The included doctests expect specific, hardcoded hardware to be present. + doCheck = false; + # NOTE: Without gobject-introspection in buildInputs, launching fails with + # "Namespace [Notify / GExiv2 / GUdev] not available" buildInputs = [ - libgudev - udisks - glib - gnome3.gexiv2 + gdk_pixbuf + gexiv2 + gobject-introspection + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gstreamer + gst_all_1.gstreamer.dev + libgudev libnotify - exiv2 - exiftool - qt5.qtimageformats - gdk_pixbuf - ] ++ (with python3Packages; [ + udisks + ]; + + propagatedBuildInputs = with python3Packages; [ pyqt5 pygobject3 gphoto2 @@ -54,11 +64,14 @@ python3Packages.buildPythonApplication rec { requests colorlog pyprind - ]); + ]; makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set PYTHONPATH \"$PYTHONPATH\"" + "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool ]}" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}" + "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/graphics/seg3d/default.nix b/nixpkgs/pkgs/applications/graphics/seg3d/default.nix index bca88cc70130..58cec2ec1703 100644 --- a/nixpkgs/pkgs/applications/graphics/seg3d/default.nix +++ b/nixpkgs/pkgs/applications/graphics/seg3d/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation { "-DBUILD_BIOMESH3D=1" "-DWITH_TETGEN=1" "-DBUILD_TYPE=Release" - "-DBUILD_TESTING=0" "-DWITH_WXWIDGETS=ON" "-DITK_DIR=${itk}/lib/InsightToolkit" "-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a" diff --git a/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index 354e9725a43e..f31b6d323995 100644 --- a/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -1,31 +1,89 @@ -{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib, gcr -, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook -, gobject-introspection, itstool, libgdata, python3 }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gtk3 +, libexif +, libgphoto2 +, libwebp +, libsoup +, libxml2 +, vala +, sqlite +, webkitgtk +, pkgconfig +, gnome3 +, gst_all_1 +, libgudev +, libraw +, glib +, json-glib +, gcr +, libgee +, gexiv2 +, librest +, gettext +, desktop-file-utils +, gdk_pixbuf +, librsvg +, wrapGAppsHook +, gobject-introspection +, itstool +, libgdata +, libchamplain +, python3 +}: # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling -let +stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.31.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1pwq953wl7h9cvw7rvlr6pcbq9w28kkr7ddb8x2si81ngp0imwyx"; }; nativeBuildInputs = [ - meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobject-introspection + meson + ninja + vala + pkgconfig + itstool + gettext + desktop-file-utils + python3 + wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gtk3 libexif libgphoto2 libsoup libxml2 sqlite webkitgtk - gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee - libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas - libraw json-glib glib gdk_pixbuf librsvg gnome3.rest - gcr gnome3.adwaita-icon-theme libgdata + gtk3 + libexif + libgphoto2 + libwebp + libsoup + libxml2 + sqlite + webkitgtk + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libgee + libgudev + gexiv2 + gnome3.gsettings-desktop-schemas + libraw + json-glib + glib + gdk_pixbuf + librsvg + librest + gcr + gnome3.adwaita-icon-theme + libgdata + libchamplain ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/kde/minuet.nix b/nixpkgs/pkgs/applications/kde/minuet.nix index efe850ab414d..cd98d56b86dd 100644 --- a/nixpkgs/pkgs/applications/kde/minuet.nix +++ b/nixpkgs/pkgs/applications/kde/minuet.nix @@ -2,17 +2,17 @@ , lib, extra-cmake-modules, gettext, python , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools -, qtquickcontrols2, qtsvg, qttools +, qtquickcontrols2, qtsvg, qttools, qtdeclarative }: mkDerivation { name = "minuet"; meta = with lib; { license = with licenses; [ lgpl21 gpl3 ]; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg HaoZeke ]; }; - nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ]; propagatedBuildInputs = [ drumstick fluidsynth diff --git a/nixpkgs/pkgs/applications/misc/alacritty/default.nix b/nixpkgs/pkgs/applications/misc/alacritty/default.nix index 327272ae39cc..18546e9f3cb6 100644 --- a/nixpkgs/pkgs/applications/misc/alacritty/default.nix +++ b/nixpkgs/pkgs/applications/misc/alacritty/default.nix @@ -47,17 +47,17 @@ let libxkbcommon ]; in buildRustPackage rec { - name = "alacritty-${version}"; - version = "0.2.9"; + pname = "alacritty"; + version = "0.3.0"; src = fetchFromGitHub { owner = "jwilm"; - repo = "alacritty"; + repo = pname; rev = "v${version}"; - sha256 = "01wzkpbz6jjmpmnkqswilnn069ir3cx3jvd3j7zsvqdxqpwncz39"; + sha256 = "0d9qnymi8v4aqm2p300ccdsgavrnd64sv7v0cz5dp0sp5c0vd7jl"; }; - cargoSha256 = "0h9wczgpjh52lhrqg0r2dkrh5svmyvrvh4yj7p0nz45skgrnl8w9"; + cargoSha256 = "11gpv0h15n12f97mcwjymlzcmkldbakkkb5h931qgm3mvhhq5ay5"; nativeBuildInputs = [ cmake @@ -92,19 +92,20 @@ in buildRustPackage rec { mkdir $out/Applications cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app '' else '' - install -D alacritty.desktop $out/share/applications/alacritty.desktop + install -D extra/linux/alacritty.desktop -t $out/share/applications/ + install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty '') + '' - install -D alacritty-completions.zsh "$out/share/zsh/site-functions/_alacritty" - install -D alacritty-completions.bash "$out/etc/bash_completion.d/alacritty-completions.bash" - install -D alacritty-completions.fish "$out/share/fish/vendor_completions.d/alacritty.fish" + install -D extra/completions/_alacritty -t "$out/share/zsh/site-functions/" + install -D extra/completions/alacritty.bash -t "$out/etc/bash_completion.d/" + install -D extra/completions/alacritty.fish -t "$out/share/fish/vendor_completions.d/" install -dm 755 "$out/share/man/man1" - gzip -c alacritty.man > "$out/share/man/man1/alacritty.1.gz" + gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz" install -dm 755 "$terminfo/share/terminfo/a/" - tic -x -o "$terminfo/share/terminfo" alacritty.info + tic -x -o "$terminfo/share/terminfo" extra/alacritty.info mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages diff --git a/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix b/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix index 912f18890b5f..3c18d70d6c26 100644 --- a/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix +++ b/nixpkgs/pkgs/applications/misc/asciiquarium/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; - homepage = https://robobunny.com/projects/asciiquarium/html; + homepage = https://robobunny.com/projects/asciiquarium/html/; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.utdemir ]; diff --git a/nixpkgs/pkgs/applications/misc/bicon/default.nix b/nixpkgs/pkgs/applications/misc/bicon/default.nix new file mode 100644 index 000000000000..22eb3e3d8594 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/bicon/default.nix @@ -0,0 +1,36 @@ +{ stdenv + , fetchFromGitHub + , autoreconfHook + , pkg-config + , perl + , fribidi + , kbd + , xkbutils +}: + +stdenv.mkDerivation rec { + pname = "bicon"; + version = "unstable-2018-09-10"; + + src = fetchFromGitHub { + owner = "behdad"; + repo = pname; + rev = "38725c062a83ab19c4e4b4bc20eb9535561aa76c"; + sha256 = "0hdslrci8pq300f3rrjsvl5psfrxdwyxf9g2m5g789sr049dksnq"; + }; + + buildInputs = [ fribidi kbd xkbutils perl ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + preConfigure = '' + patchShebangs . + ''; + + meta = with stdenv.lib; { + description = "A bidirectional console"; + homepage = https://github.com/behdad/bicon; + license = [ licenses.lgpl21 licenses.psfl licenses.bsd0 ]; + maintainers = [ maintainers.linarcx ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix b/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix index e0d284c838e3..6602adb2f2ab 100644 --- a/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix +++ b/nixpkgs/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.8"; name = "cli-visualizer-${version}"; src = fetchFromGitHub { owner = "dpayne"; repo = "cli-visualizer"; - rev = version; - sha256 = "06z6vj87xjmacppcxvgm47wby6mv1hnbqav8lpdk9v5s1hmmp1cr"; + rev = "v${version}"; + sha256 = "003mbbwsz43mg3d7llphpypqa9g7rs1p1cdbqi1mbc2bfrc1gcq2"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/copyq/default.nix b/nixpkgs/pkgs/applications/misc/copyq/default.nix index 5609b6a8bebe..c77e47df34ce 100644 --- a/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.7.3"; + version = "3.8.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1nxxxq0lfs4r673i70dh2xwdn3chcjl913bkz14kyna29i6n1nwm"; + sha256 = "0kbhgg0j6iqfrpixvwl1mk3m0bz5s8bd6npk5xqcgzp1giywdc4i"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 51683a0a7208..626b62ed7d0c 100644 --- a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper -, fontconfig, freetype, glib, gtk2 +, fontconfig, freetype, glib, gtk3 , jdk, libX11, libXrender, libXtst, zlib }: # The build process is almost like eclipse's. @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "6.0.0"; + version = "6.0.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gtk2 + fontconfig freetype glib gtk3 jdk libX11 libXrender libXtst zlib ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1v7zvvphkyw7x5ziysk4gs2rpgc4dr108fn4ja80kijs1jmj5dxr"; + sha256 = "12zqz9zi4jryvlk1rjxfl4jdj4a6n00018yyk95glfdrxda2xyib"; }; installPhase = '' @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ])} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" # Create desktop item. diff --git a/nixpkgs/pkgs/applications/misc/dunst/default.nix b/nixpkgs/pkgs/applications/misc/dunst/default.nix index b28e76739929..309d4d54ae5e 100644 --- a/nixpkgs/pkgs/applications/misc/dunst/default.nix +++ b/nixpkgs/pkgs/applications/misc/dunst/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver -, libXinerama, libnotify, libxdg_basedir, pango, xorgproto, librsvg, dunstify ? false +, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false }: stdenv.mkDerivation rec { name = "dunst-${version}"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514"; + sha256 = "1rwbylygd88r61yrxc7ckg9svgq8b1i2falr0mk9sabqxzn9050s"; }; nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; buildInputs = [ cairo dbus gdk_pixbuf glib libX11 libXScrnSaver - libXinerama libnotify libxdg_basedir pango xorgproto librsvg libXrandr + libXinerama libnotify pango xorgproto librsvg libXrandr ]; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/applications/misc/eaglemode/default.nix b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix index 255396a79502..6c802e683ce9 100644 --- a/nixpkgs/pkgs/applications/misc/eaglemode/default.nix +++ b/nixpkgs/pkgs/applications/misc/eaglemode/default.nix @@ -3,11 +3,11 @@ librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWra stdenv.mkDerivation rec { name = "eaglemode-${version}"; - version = "0.94.0"; + version = "0.94.1"; src = fetchurl { url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; - sha256 = "1sr3bd9y9j2svqvdwhrak29yy9cxf92w9vq2cim7a8hzwi9qfy9k"; + sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/misc/exercism/default.nix b/nixpkgs/pkgs/applications/misc/exercism/default.nix index 946f3695f166..21fed2e28def 100644 --- a/nixpkgs/pkgs/applications/misc/exercism/default.nix +++ b/nixpkgs/pkgs/applications/misc/exercism/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "exercism-${version}"; - version = "3.0.9"; + version = "3.0.11"; goPackagePath = "github.com/exercism/cli"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "0nr3dzipylicrbplh25dw0w84qklr0xcyq442i9aswzibqrb2vc6"; + sha256 = "1wg23bvibsk6j4iqwyw35wl9plfwdqxiql81zci7r1x4d5cp26av"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix index 2ffa784360fd..f8a02d2f78c6 100644 --- a/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, +{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.4.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; - rev = version; - sha256 = "0v6zn25vxsn3ng31zgsgkb2wwrl0kdv4ikw4ij4yqv49aid3qjd5"; + rev = "cc057f3e93f5b1033b04decee03cdb44177e48b3"; + sha256 = "1xg80bi2465p5r8zfmb34iga9yqs3is1k4f13hw0ligvhb58gas0"; }; nativeBuildInputs = [ @@ -38,7 +38,9 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme ]; - patches = [ ./correct-post-install.patch ]; + patches = [ + ./correct-post-install.patch + ]; mesonFlags = [ "-Ddisable_pycompile=true" diff --git a/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix b/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix index 724707d0be5f..eecf9bbd88f7 100644 --- a/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix +++ b/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix @@ -1,21 +1,47 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gettext -, libxml2, desktop-file-utils, wrapGAppsHook -, glib, gtk3, libgtop, gnome3 }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, vala +, gettext +, libxml2 +, desktop-file-utils +, wrapGAppsHook +, glib +, gtk3 +, libgtop +, libdazzle +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "gnome-usage"; - version = "3.30.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f1vccw916az8hzsqmx6f57jvl68s3sbd3qk4rpwn42ks1v7nmsh"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ + desktop-file-utils + gettext + libxml2 + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; - buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ]; + buildInputs = [ + glib + gnome3.adwaita-icon-theme + gtk3 + libdazzle + libgtop + ]; postPatch = '' chmod +x build-aux/meson/postinstall.sh @@ -29,7 +55,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = ""; + description = "A nice way to view information about use of system resources, like memory and disk space"; license = licenses.gpl3; platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 0aed767675e1..da48f702f737 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { name = "hugo-${version}"; - version = "0.54.0"; + version = "0.55.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv"; + sha256 = "063z79m9rganzjzqvy7bg6b29m877asm5haxp0d5cb5ac7cx55rj"; }; - modSha256 = "01gni3ksw9whf388c6cj0vcbpsyhdrwfl8cyw85kjx8r56dv88y5"; + modSha256 = "0yrwkaaasj9ihjjfbywnzkppix1y2znagg3dkyikk21sl5n0nz23"; buildFlags = "-tags extended"; diff --git a/nixpkgs/pkgs/applications/misc/jekyll/default.nix b/nixpkgs/pkgs/applications/misc/jekyll/default.nix index ce3c318f6780..34cf0e21db7b 100644 --- a/nixpkgs/pkgs/applications/misc/jekyll/default.nix +++ b/nixpkgs/pkgs/applications/misc/jekyll/default.nix @@ -1,17 +1,10 @@ -{ lib, bundlerEnv, ruby +{ lib, bundlerApp, ruby , withOptionalDependencies ? false }: -# Bundix: -# nix-shell -p bundix zlib -bundlerEnv rec { - name = pname + "-" + version; +bundlerApp rec { pname = "jekyll"; - version = (import - (if withOptionalDependencies - then ./full/gemset.nix - else ./basic/gemset.nix)) - .jekyll.version; + exes = [ "jekyll" ]; inherit ruby; gemdir = if withOptionalDependencies diff --git a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index aa49f0e3d751..bf2de7271abd 100644 --- a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, appimage-run, fetchurl }: +{ stdenv, appimage-run, fetchurl, gsettings-desktop-schemas, gtk3, gobject-introspection, wrapGAppsHook }: let - version = "1.0.140"; - sha256 = "1114v141jayqhvkkxf7dr864j09nf5nz002c7z0pprzr00fifqzx"; + version = "1.0.142"; + sha256 = "0k7lnv3qqz17a2a2d431sic3ggi3373r5k0kwxm4017ama7d72m1"; in stdenv.mkDerivation rec { name = "joplin-${version}"; @@ -12,7 +12,8 @@ in inherit sha256; }; - buildInputs = [ appimage-run ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ]; unpackPhase = ":"; diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index 32d10712b763..22a1a4ba2adb 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14760"; + version = "14945"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ya05z3i37ynpaqrm99cirkbap03q7wgbbps2y95l7r2k9l4sxsi"; + sha256 = "0kdfdn0i7gjfkkllb93598ywf0qlllzsia5q14szc5b5assl8qpb"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/nixpkgs/pkgs/applications/misc/keepassx/community.nix index b6258491a8c3..ee99e21f6ec2 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -1,24 +1,29 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, qttools , curl +, glibcLocales +, libXi +, libXtst , libargon2 , libgcrypt -, libsodium -, zlib -, libmicrohttpd -, libXtst -, qtbase , libgpgerror -, glibcLocales +, libmicrohttpd +, libsodium , libyubikey -, yubikey-personalization -, libXi -, qtx11extras +, pkg-config +, qrencode +, qtbase , qtmacextras +, qtsvg +, qtx11extras +, quazip +, yubikey-personalization +, zlib , withKeePassBrowser ? true +, withKeePassKeeShare ? true +, withKeePassKeeShareSecure ? true , withKeePassSSHAgent ? true -, withKeePassHTTP ? false , withKeePassNetworking ? false }: @@ -26,13 +31,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.3.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1gja402dsbws4z8ybnhqbw7rc9svgqnshqjgf7158d6x0ni386m3"; + sha256 = "1cbfsfdvb4qw6yb0zl6mymdbphnb7lxbfrc5a8cjmn9w8b09kv6m"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ @@ -50,23 +55,27 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch - ./qt511.patch + ./quazip5.patch ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" "-DWITH_GUI_TESTS=ON" "-DWITH_XC_AUTOTYPE=ON" + "-DWITH_XC_UPDATECHECK=OFF" "-DWITH_XC_YUBIKEY=ON" ] ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") - ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON") + ++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") + ++ (optional withKeePassKeeShareSecure "-DWITH_XC_KEESHARE_SECURE=ON") ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); doCheck = true; checkPhase = '' export LC_ALL="en_US.UTF-8" + export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen make test ARGS+="-E testgui --output-on-failure" ''; @@ -83,11 +92,16 @@ stdenv.mkDerivation rec { libmicrohttpd libsodium libyubikey + pkg-config + qrencode qtbase + qtsvg qtx11extras yubikey-personalization zlib - ] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; + ] + ++ stdenv.lib.optional withKeePassKeeShareSecure quazip + ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; postInstall = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. @@ -97,7 +111,7 @@ stdenv.mkDerivation rec { meta = { description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; - longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI and via CLI. Includes optional http-interface to allow browser-integration with plugins like PassIFox (https://github.com/pfn/passifox)."; + longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; homepage = https://keepassxc.org/; license = licenses.gpl2; maintainers = with maintainers; [ s1lvester jonafato ]; diff --git a/nixpkgs/pkgs/applications/misc/keepassx/darwin.patch b/nixpkgs/pkgs/applications/misc/keepassx/darwin.patch index 1edf0a573a31..d7ffb7dbba1f 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/darwin.patch +++ b/nixpkgs/pkgs/applications/misc/keepassx/darwin.patch @@ -1,52 +1,53 @@ -Remove the use of macdeployqt to avoid copying dependencies and -reduce installation size from 90 MB to 9 MB. +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 658548f7..f8f10bdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -250,8 +250,8 @@ else() - set(PROGNAME keepassxc) - endif() +@@ -288,6 +288,7 @@ if(MINGW) + set(PLUGIN_INSTALL_DIR ".") + set(DATA_INSTALL_DIR "share") + elseif(APPLE AND WITH_APP_BUNDLE) ++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man") + set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") + set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS") +@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON) --if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local") -- set(CMAKE_INSTALL_PREFIX "/Applications") -+if(APPLE AND WITH_APP_BUNDLE) -+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") - set(CMAKE_INSTALL_MANDIR "/usr/local/share/man") + if(APPLE) + set(CMAKE_MACOSX_RPATH TRUE) +- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH) +- if(NOT MACDEPLOYQT_EXE) +- message(FATAL_ERROR "macdeployqt is required to build in macOS") +- else() +- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}") +- endif() endif() -@@ -262,7 +262,7 @@ if(MINGW) - set(PLUGIN_INSTALL_DIR ".") - set(DATA_INSTALL_DIR "share") - elseif(APPLE AND WITH_APP_BUNDLE) -- set(CLI_INSTALL_DIR "/usr/local/bin") -+ set(CLI_INSTALL_DIR "../bin") - set(PROXY_INSTALL_DIR "/usr/local/bin") - set(BIN_INSTALL_DIR ".") - set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns") + # Debian sets the the build type to None for package builds. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 69526967..38f7c5d4 100644 +index 110dc606..f9b58818 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE) - set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}") - include(CPack) +@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE) + set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}") + include(CPack) -- add_custom_command(TARGET ${PROGNAME} -- POST_BUILD -- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src -- COMMENT "Deploying app bundle") +- add_custom_command(TARGET ${PROGNAME} +- POST_BUILD +- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src +- COMMENT "Deploying app bundle") endif() install(TARGETS ${PROGNAME} diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt -index 08c53278..b833b692 100644 +index f1c5387f..abf70b48 100644 --- a/src/autotype/mac/CMakeLists.txt +++ b/src/autotype/mac/CMakeLists.txt -@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE) - add_custom_command(TARGET keepassx-autotype-cocoa - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR} -- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src - COMMENT "Deploying autotype plugin") +@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE) + add_custom_command(TARGET keepassx-autotype-cocoa + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR} +- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src + COMMENT "Deploying autotype plugin") else() diff --git a/nixpkgs/pkgs/applications/misc/keepassx/qt511.patch b/nixpkgs/pkgs/applications/misc/keepassx/qt511.patch deleted file mode 100644 index b4d312c8c263..000000000000 --- a/nixpkgs/pkgs/applications/misc/keepassx/qt511.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp -index 6fd65c1a..e99275b0 100644 ---- a/src/gui/entry/EditEntryWidget.cpp -+++ b/src/gui/entry/EditEntryWidget.cpp -@@ -29,6 +29,7 @@ - #include <QMenu> - #include <QSortFilterProxyModel> - #include <QTemporaryFile> -+#include <QButtonGroup> - #include <QMimeData> - #include <QEvent> - #include <QColorDialog> --- -2.17.1 - diff --git a/nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch b/nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch new file mode 100644 index 000000000000..ccea841cac7d --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/keepassx/quazip5.patch @@ -0,0 +1,27 @@ +diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake +index 8d309181..92aa892c 100644 +--- a/cmake/FindQuaZip.cmake ++++ b/cmake/FindQuaZip.cmake +@@ -9,7 +9,6 @@ IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + SET(QUAZIP_FOUND TRUE) + ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + IF(Qt5Core_FOUND) +- set(QUAZIP_LIB_VERSION_SUFFIX 5) + ENDIF() + IF(WIN32) + FIND_PATH(QUAZIP_LIBRARY_DIR +diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp +index 33f5ed1f..5fcd9202 100644 +--- a/src/keeshare/ShareObserver.cpp ++++ b/src/keeshare/ShareObserver.cpp +@@ -46,8 +46,8 @@ + #include <QStringBuilder> + + #if defined(WITH_XC_KEESHARE_SECURE) +-#include <quazip5/quazip.h> +-#include <quazip5/quazipfile.h> ++#include <quazip/quazip.h> ++#include <quazip/quazipfile.h> + #endif + + namespace diff --git a/nixpkgs/pkgs/applications/misc/kiwix/default.nix b/nixpkgs/pkgs/applications/misc/kiwix/default.nix index 9ea8210e67e7..bc49e810d4e5 100644 --- a/nixpkgs/pkgs/applications/misc/kiwix/default.nix +++ b/nixpkgs/pkgs/applications/misc/kiwix/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = { description = "An offline reader for Web content"; - homepage = http://kiwix.org; + homepage = https://kiwix.org; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ robbinch ]; diff --git a/nixpkgs/pkgs/applications/misc/krename/default.nix b/nixpkgs/pkgs/applications/misc/krename/default.nix index 52233ad2f2f4..8b6b7741c7df 100644 --- a/nixpkgs/pkgs/applications/misc/krename/default.nix +++ b/nixpkgs/pkgs/applications/misc/krename/default.nix @@ -17,15 +17,17 @@ in mkDerivation rec { sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a"; }; + buildInputs = [ taglib exiv2 podofo ]; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + + propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; + meta = with lib; { - homepage = http://www.krename.net; description = "A powerful batch renamer for KDE"; + homepage = https://kde.org/applications/utilities/krename/; license = licenses.gpl2; - inherit (kconfig.meta) platforms; maintainers = with maintainers; [ peterhoeg ]; + inherit (kconfig.meta) platforms; }; - - buildInputs = [ taglib exiv2 podofo ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; } diff --git a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index c27fda31a8fd..e560fa302940 100644 --- a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.6"; + version = "0.8.8"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "1qzf9fkfkbv8vnc9p6lm7ya9hzydwk2f7671by9ij26f77lmxfb3"; + sha256 = "137s7rx35a5qrfww3q8bllj4zyjfa7l709snvdfj34y7jbq7p6cd"; name = "${name}.tar.xz"; }; diff --git a/nixpkgs/pkgs/applications/misc/mlterm/default.nix b/nixpkgs/pkgs/applications/misc/mlterm/default.nix index c872af68cef7..2cfa6010853f 100644 --- a/nixpkgs/pkgs/applications/misc/mlterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.8.7"; + version = "3.8.8"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "10j7q7rk6ck86xl1898maxhgkp1h7vy7nliv9sk5bqgs7rdwn4kl"; + sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index 8068a8cfd7e9..cccd36d7ead8 100644 --- a/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -13,12 +13,12 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.14"; + version = "8.0.15"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "0mz615drx18h0frc6fq9nknqbpq7lr0xlsfmxd5irw2jz629lj76"; + sha256 = "0ca93azasya5xiw6j2map8drmxf445qqydpvrb512kjfqdiv67x6"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/navit/default.nix b/nixpkgs/pkgs/applications/misc/navit/default.nix index 3e763f157985..8dc288c01625 100644 --- a/nixpkgs/pkgs/applications/misc/navit/default.nix +++ b/nixpkgs/pkgs/applications/misc/navit/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.navit-project.org; + homepage = https://www.navit-project.org; description = "Car navigation system with routing engine using OSM maps"; license = licenses.gpl2; maintainers = [ maintainers.genesis ]; diff --git a/nixpkgs/pkgs/applications/misc/opencpn/default.nix b/nixpkgs/pkgs/applications/misc/opencpn/default.nix index 120d3a82b5e9..e4f2fd7ce8b9 100644 --- a/nixpkgs/pkgs/applications/misc/opencpn/default.nix +++ b/nixpkgs/pkgs/applications/misc/opencpn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "opencpn-${version}"; - version = "4.8.8"; + version = "5.0.0"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; rev = "v${version}"; - sha256 = "1z9xfc5fgbdslzak3iqg9nx6wggxwv8qwfxfhvfblkyg6kjw30dg"; + sha256 = "1xv3h6svw9aay5ixpql231md3pf00qxvhg62z88daraf18hlkfja"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/misc/orca/default.nix b/nixpkgs/pkgs/applications/misc/orca/default.nix index e8843c1bd6f7..b20227590572 100644 --- a/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.30.2"; + version = "3.32.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53"; + sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/plank/default.nix b/nixpkgs/pkgs/applications/misc/plank/default.nix index cc6b74dc9989..8aff573ab839 100644 --- a/nixpkgs/pkgs/applications/misc/plank/default.nix +++ b/nixpkgs/pkgs/applications/misc/plank/default.nix @@ -1,36 +1,49 @@ { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 -, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus -, wrapGAppsHook, autoreconfHook, gobject-introspection }: +, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee +, wrapGAppsHook, autoreconfHook, pantheon }: stdenv.mkDerivation rec { pname = "plank"; version = "0.11.4"; - name = "${pname}-${version}"; src = fetchurl { - url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/${pname}/1.0/${version}/+download/${pname}-${version}.tar.xz"; sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8"; }; nativeBuildInputs = [ - pkgconfig + autoreconfHook + gnome3.gnome-common intltool libxml2 # xmllint + pkgconfig + vala wrapGAppsHook - gobject-introspection - autoreconfHook ]; - buildInputs = [ vala atk cairo glib gnome-menus - gtk3 gnome3.libgee libwnck3 libX11 libXfixes - libXi pango gnome3.gnome-common bamf gdk_pixbuf - libdbusmenu-gtk3 gnome3.dconf ]; + buildInputs = [ + atk + bamf + cairo + gdk_pixbuf + glib + gnome-menus + gnome3.dconf + gtk3 + libX11 + libXfixes + libXi + libdbusmenu-gtk3 + libgee + libwnck3 + pango + ]; # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" ]; # Make plank's application launcher hidden in Pantheon @@ -46,6 +59,6 @@ stdenv.mkDerivation rec { homepage = https://launchpad.net/plank; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; }; } diff --git a/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/nixpkgs/pkgs/applications/misc/playonlinux/default.nix index 3cb9bc8c9793..da09c123dcde 100644 --- a/nixpkgs/pkgs/applications/misc/playonlinux/default.nix +++ b/nixpkgs/pkgs/applications/misc/playonlinux/default.nix @@ -20,6 +20,8 @@ , which , curl , jq +, xorg +, libGL }: let @@ -50,7 +52,7 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ]; + libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; in stdenv.mkDerivation { name = "playonlinux-${version}"; @@ -66,6 +68,8 @@ in stdenv.mkDerivation { [ python2Packages.python python2Packages.wxPython python2Packages.setuptools + xorg.libX11 + libGL ]; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/polybar/default.nix b/nixpkgs/pkgs/applications/misc/polybar/default.nix index 9e2beb5b07cf..e6507845d4cc 100644 --- a/nixpkgs/pkgs/applications/misc/polybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/polybar/default.nix @@ -25,13 +25,14 @@ assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { - name = "polybar-${version}"; - version = "3.3.0"; + pname = "polybar"; + version = "3.3.1"; + src = fetchFromGitHub { owner = "jaagr"; - repo = "polybar"; + repo = pname; rev = version; - sha256 = "18hrsbq62na2i4rlwbs2ih7v9shnayg76nw14i6az28wpf8kx4rr"; + sha256 = "0qwi6q3qkrz2ip1jd4pxlnsrs2a9ywxyf8rgvbzyilr334rsiywh"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index d995bfcc0f3e..df5f35102e01 100644 --- a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -29,6 +29,12 @@ mkDerivation rec { variables.pri ''; + enableParallelBuilding = true; + + postInstall = '' + ln -sf $out/lib/*/libqlcplus* $out/lib + ''; + meta = with stdenv.lib; { description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc."; maintainers = [ maintainers.globin ]; diff --git a/nixpkgs/pkgs/applications/misc/rtv/default.nix b/nixpkgs/pkgs/applications/misc/rtv/default.nix index dd60147f4e6b..d3f2d5a74e56 100644 --- a/nixpkgs/pkgs/applications/misc/rtv/default.nix +++ b/nixpkgs/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.25.1"; + version = "1.26.0"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0pfsf17g37d2v1xrsbfdbv460vs7m955h6q51z71rhb840r9812p"; + sha256 = "0smwlhc4sj92365pl7yy6a821xddmh9px43nbd0kdd2z9xrndyx1"; }; # Tests try to access network diff --git a/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/nixpkgs/pkgs/applications/misc/sequeler/default.nix index f7f4b8985f0b..4947bcf60bd9 100644 --- a/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils -, gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }: +, gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: let @@ -11,18 +11,18 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "1rx8h3bi86vk8j7c447pwm590z061js4w45nzrp66r41v0rnh5vk"; + sha256 = "1x2ikagjsgnhhhwkj09ihln17mq4wjq3wwbnf02j2p3jpp4i8w1i"; }; nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ]; - buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ]; + buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ''; homepage = https://github.com/Alecaddd/sequeler; license = licenses.gpl3; - maintainers = [ maintainers.etu ]; + maintainers = [ maintainers.etu ] ++ pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/synapse/default.nix b/nixpkgs/pkgs/applications/misc/synapse/default.nix index ebae6fd7cfed..3e7983c667f2 100644 --- a/nixpkgs/pkgs/applications/misc/synapse/default.nix +++ b/nixpkgs/pkgs/applications/misc/synapse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobject-introspection +, keybinder3, json-glib, zeitgeist, vala, hicolor-icon-theme, gobject-introspection }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gettext vala_0_38 + pkgconfig gettext vala # For setup hook gobject-introspection ]; diff --git a/nixpkgs/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix index ab1e0b5dda26..6c21f9e81e98 100644 --- a/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "006pzx4crsqn9vk28g87306xh3jrfwk4ib9cmsxqrxy8v0kl2s4g"; + sha256 = "1h3ifiklzcbrvqzzhs7rij8w45k96cir2d4kkyd2ap93akvcnsr9"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/xiphos/default.nix b/nixpkgs/pkgs/applications/misc/xiphos/default.nix index 7148caf35d34..88ab52313b06 100644 --- a/nixpkgs/pkgs/applications/misc/xiphos/default.nix +++ b/nixpkgs/pkgs/applications/misc/xiphos/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { export SWORD_HOME=${sword}; ''; - configureFlags= [ "--enable-webkit2" ]; + wafConfigureFlags = [ "--enable-webkit2" ]; meta = with stdenv.lib; { description = "A GTK Bible study tool"; diff --git a/nixpkgs/pkgs/applications/networking/brig/default.nix b/nixpkgs/pkgs/applications/networking/brig/default.nix index b86cb7d3dd92..8b7bc0bb899a 100644 --- a/nixpkgs/pkgs/applications/networking/brig/default.nix +++ b/nixpkgs/pkgs/applications/networking/brig/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "brig-${version}"; - version = "0.3.0"; + version = "0.4.1"; rev = "v${version}"; goPackagePath = "github.com/sahib/brig"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "sahib"; repo = "brig"; inherit rev; - sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy"; + sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix b/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix index f9d5f01be201..32de4871186f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/arora/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.phreedom ]; description = "A cross-platform Qt4 Webkit browser"; homepage = https://github.com/Arora/arora; + license = with licenses; [ gpl2 gpl3 ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix index e4ec550d60c4..a8bdb7d5b2d8 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "32.0.0.156"; + version = "32.0.0.171"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0mf2p3qk82s2nwz1x8g92434wpdqgnd9jj8w88z4qksa9qhbbfh7"; + sha256 = "1rqf1kidpf2jqf20dw3hscrapdpm2j751742i6xnvj9mp66nczyg"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index d60cb4203501..e09cf7bb8bf8 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0.2"; + version = "66.0.3"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ach/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ach/firefox-66.0.3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "65f92c4efa17af90eee9c44add39c3b3cc0749a334043fbc56d24966979631248de2bc2f9f7978e97482a363528412bf38780d84955d8cd0edc05898dadc30dd"; + sha512 = "4aa9ae4e34aef99424ca5cd01dc3214d0091a0c419d54647a213e78182f0cb1529e2021b3cdb25b35565a52f04f2e9ec4122635dc49aee0e403cf5c0b480c507"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/af/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/af/firefox-66.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "06f8e60fda4ce450ffbdaf12dc95cbf3dd8ec7cc6b9bbc8ea76c144e800a17b96fbdbeb31c6f118a50b14ea7f55b5ff125380ce86b4ab2d2bdd05d5ec4e33881"; + sha512 = "5fe5707286b531e23f31f7f80e8f25b08c0e51072494c88d426f4b088063a07a25d36e13182f08ce0a8f88f8abdade59e6f97b7186c89e0de3de463b5070d698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/an/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/an/firefox-66.0.3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "9f3a0c73bcca0445ea9002e46c4d42d8ad2cc06419f663270cfcd4c6a57e1937530e6a1b0302648fcc7a64e5e3b7fe41424e56ba9c81a6726b556630f81165ec"; + sha512 = "f58e0f1b026cb3225e8316249458777acf3528ca2da0843b7449abbb64e046f1e8b779a93c131fce99339c781e5d83dbdda321e0b8558e554f92518625292b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ar/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ar/firefox-66.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "f9db879e2aedbc09f58a004a6b7e4836da8c0715367335028176c7051b831e5f88c9d7cacea91bcd3ecfe4f0c041f9f8d16c1a27ccffa9a89ed41b7dd3b4c472"; + sha512 = "bc72e88090fdedd5ca5ffe1b43df899f83e9eeacd3b9cea8f12cf53e6e3197644553fa3398c11c210178bf91efa3b52c17b9e24226c3dfae2a2096bac17e40ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/as/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/as/firefox-66.0.3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "3be820595d129db7cbe07d6500c9d9128a55adacf6f1d3d53fdec8d705453d9f94c53ff489de74805237024cd668f2c9568bc67fa2df686c3a4e7544a252b694"; + sha512 = "b408a63cdd34aba329b82980d3980ea449d1ceb4f05fe99cb8f502cee6e0d6e5eb974ab848929bc53323f4b725331df42c2c34426df67bb3bc1725de6cbdc975"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ast/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ast/firefox-66.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c04842ed940c442549504cb8b26610c00508fa1d7155cd690d43227b343816d8c780282d330ecfc2ce951a486f022adbe18ffa8008aa3a43c89b079af968b466"; + sha512 = "3320205930f8b12bdbc618d6588a044b5670e1bc4370c5bff58fd26540561b6d9365bc79fa7084664019ed5d3e0371f135b1ed0906ae7ff3e61b10383bba1e31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/az/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/az/firefox-66.0.3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2deb0ebfa3e2bb74c3c7f80c08b0323d81b38f9399037a3955fbb53e219850a8899ed19aff5b81188c3c8e4bbecb411ad046e0fbb5fe5834d5023935e1e10968"; + sha512 = "6c733a65af52a081dc895bb3603fa1dbd96757da79822bc10378bbab0fda0ce8561b5be58db3282761afad786398186264b7e678efd1c7e7e5d48740cf34cc79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/be/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/be/firefox-66.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c7012a19e0283cf0b7c45153f078eb9170447c95c62141bb1ea54516e363b11b306e1d7d89f673387ccac727b36caf51ead6dcbae3d290923eb05bc792c06187"; + sha512 = "83558f99541aaa238508d7a751594b3ef319a0b7c0e2552856ba31e7bde54646fe70cf31d01433a3f5c605b43c6568d34862f70a49571ad14f68df51f36e3483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bg/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/bg/firefox-66.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b9e54ea4d35e4f2d53c8e87e86f1b4d245ca677279ad16ff4d10abb252801245c80666d977993739f14ecc6ee5d80e07abfdd0ebb096c71a65eec4fa7df3bbbc"; + sha512 = "711c9f038a3838bb1e0a2d7ff1182ff16825e3b4bd8de03da41391774ba3fd5bd88882877961d625f796b2ab2c032cd928da7e06b25c3bbd1e4930805d78573f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bn-BD/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/bn-BD/firefox-66.0.3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "bf75162072dfafaebc0c02339d5e2697ebf27615cc7d902c0d2504e986592764293272573d23f5faee12dc253b8ec29fa994106fac21a8fe9f11cacff2b28fc0"; + sha512 = "bca2117b3c5155a792d8b5c314bb825b8fca897a6419337ef0dbd64ea32c9c054fe11ecc7510aadbcc9e2242e807857d0c31728a47516c02a6a20009eda917f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bn-IN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/bn-IN/firefox-66.0.3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "c7bc4d575ab66066c88a5cdfc65cdb958479973ba44a909609aaf71022a427b982918177c2ee80ce692030702191d02408d775d262882809583e2e057a7e7fb4"; + sha512 = "139411d16b006279272fea37e8803c93096c7846d2c5be077cf4e0b0e00cbc820496720250c438f7f78b59f47774d77b6c16bf2d713ee2c4703e2ac5a7668ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/br/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/br/firefox-66.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "3e929becf7b4ed961c5aef6627e6537b2f9ac71804e206a0a29d7b538dc53a09c7c8b018655846ee16caaa8d704082a5ae25d6b74ab2cf859d78ce58e8ee9617"; + sha512 = "462dbb9305813ef8c528f1b5665b7e27d790c00af40a83e7fc46da9c04dcea17125601cc8763dc3cdadfc4eb523723bb1c5b5b2ee8c3bed4be7d4644a20bdd6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bs/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/bs/firefox-66.0.3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "13f7240e1c27a7223e37b1fea9885f75969857857e880cb960059039e39fdd5d22100fd693a213cd5e471aa112ae05a9eef3a5a26d277e2b83286769d1333920"; + sha512 = "0a40bba9e04a7970f0c4c1b22032bc530facf90f32d3d8af6117d89b4e7118027d463d58441c4ba4913097959bafc8fb687d07945d74a26a6582b54fcc14f6a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ca/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ca/firefox-66.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c9ca70971a8ce500c12fabcb4b13f6ee92d3ea55c7db4936fd5be238217af7541b7d87b6d61355d91ef44a0aa98f584d76e99b80fa42eb43da6da12548170942"; + sha512 = "363fb5222734f98bad579fce6042832089737fa76d14072d887582989b0a944b70804b1c5e8cbccde01124d6e4b3cce3d2ce28c9d9d14825a76f3f116887e3e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cak/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/cak/firefox-66.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "3496530d20164aaa8af56e72b294d9e68139bf3c8140a7d94647d0deb802f4dea7801643ea08dda69546e8bacecd29ab1bbee7854eddd3c4dd8d931d902f865c"; + sha512 = "60491e41bf9887b09d72eabd184ee847f6a8c87a13f472a84d7d50aac4a44d3119a5dcbb3635e2ace369fe0e9331de47584bdc09b559a2445e911c094e71bef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cs/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/cs/firefox-66.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "065e44c11789e2c12bb1a1ae4aa67d986c8e718ee964108d8bb9697050c534ce01ef0d1c9b00eb03b28a55a31ed7ba7741fc7fb692a09c1b8512f4f4f2d77d7e"; + sha512 = "66a39a0d2461b9157925c9eadf3d496ebbb43555e4b91d9f8d232ced6b78a71f623e8a02941ecf2a2c0a128d9cbe106c01c84a94358dcb1f8a5399fe17e77c5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cy/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/cy/firefox-66.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "824263895aaf97000efe2bd59345ddfb4e3f056fb15f93c7c211f001c3921c83d736b8c03c68fcf7b2a35560b12f6581b0df30e9382ccd3d725839d9385b0f8e"; + sha512 = "ae680998cd82fd70de4ee55ecfca4b289d48d943ca193f1ff2a6d156c6142218542228bff5b429f68bfaadfbb0c43273c68eafce333fb1ab68f2cd6c092df235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/da/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/da/firefox-66.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8804542db2d736139718e45e5e549be9981469d4e68d7f6ce0a362289f8ab72994983309dfe1c6c0d1d73694b3b9bd726c13c62048397d8c865717596939bda1"; + sha512 = "72715546481c63dcbb194a305c8ee1cda05d52d7da1c69ce3a755145e0127bb2118ff5cbcb04ccdfc7c8c7bf22e42feddab81e936b92f367a6198b09e7d803a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/de/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/de/firefox-66.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "44e233c9023d574c0c9a24ac12e91311327b513d790efaddc76d46c869ca6297087039201e4b886575509e78cf9c4a6a18cc898d866e85aea5790dfab8674987"; + sha512 = "fe1abb6ec0a550a3c1bbc6fea96c26a4d848771dbe45ae75240017d1fd4397e2c80742f95a03223356b5374969eed83a3a92bc86e433cc1b85443e4e41136e0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/dsb/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/dsb/firefox-66.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4d5b87e5310655138f3300a0c6aae55bdd7a8bff419ca1798ffabf54340eb61981d48d17ad8bc9ca396271ed8e57afdb4cca0e1954a66daa8588cc2f954b8d44"; + sha512 = "442fa757fc7f72a9b0b6b2a19dc72a87ec2cd24834378d2aa41788c1bd015f0eaf51acfe7769a4c5cd27d157c777d3b6e183dc134516ca0ebb0870fa667feade"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/el/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/el/firefox-66.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "add0ed575851a65218361802a597fbcd26cfee5fea3bd76f15c32f0045eace55a65158aa56d50039d1fd5866a34fb3eac091c3746f69ef6529fb6fa5abccb095"; + sha512 = "84995e7632805e78e2b9b710c8b42881dc071c51f6336c54e30b49640d3bb5284534167392665ed15b88b092cf55db174156ae5f8120324faa842f802790ee77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-CA/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/en-CA/firefox-66.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "f02ea6b747a8f3753de493820e21d0b61ab7ca6aa5de7d5b8fbdf9481ccf59d9ce79b3622b10ea13ceddb329d9369a857fbc972932f6b08c25bb9d5177ee4108"; + sha512 = "0b687a2271363be6c1458501ba8af8a9ea3f6279f07b89a70b9ed5dcfb0a406215621aa0d001309b823c267932877a2e9634aa14339340f7a259820f5a55c60b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-GB/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/en-GB/firefox-66.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "0afeab9506114ccc8f64299633e19382c1038cef090d7a257a6cbf2b4d89986111c72b7273c7c803d870d05a9456cc8e761d2527d17220f8d70c97738068936d"; + sha512 = "5a772190ee12a2d0d400f5aa91780ddfec29e4c2f867288e374880e4602efa747555b97ab40eedea5c812ee6f4fc2986bbd98c5f7c9054bd027490df4e9850bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-US/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/en-US/firefox-66.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ee23f32f5efe24652a21a32e23d39bf3ea566a9833352b99a051e56da2b9156852d36e922e8afd08c4910bb8e921d1a4e0f49d3dd34d7e0b369584572d7e62a2"; + sha512 = "bc585bcce2f44354db372c9f96ce5eadb5128c051f4afc95df5a38a68c4c6a8be1f20f7727fd030855d5dd0f36b00e28ce3af0b0b7bd20fb2e380034cd21d381"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-ZA/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/en-ZA/firefox-66.0.3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "1165fe055f78c7cf6f7771869dfe710b7d55836a6ad3c09697252dbd7e79f9f597cb97cf733f1268b59f6823f2d456ec8b0af13fbe3c68cb3df8a08a57bab95d"; + sha512 = "ed01d89a7fcfdcccd50712ad631fd9ef65630b23e3e6ab68b04aee28fa092cebd0a008f9f1e90a2a3152b03263db78ff6c6c3b67ed9f81c7ba6ff62656bdfee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/eo/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/eo/firefox-66.0.3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d3d5fd7ac3b89e21d857fd94273f1df7c1118f5be25c294b38cbcf0a6594afd51fd58a164df04e93aa991fea44e51c7fc974d44213ebde1f2415cc43cb242af8"; + sha512 = "8d38c8d9bce68051eecf89220e5b2c128dd2b5ce48107750139d1fa0bb836f3f583ff6dd8e776321dc0f6c72a8bceb262dd37562545f58a290cc42631f37c988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-AR/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/es-AR/firefox-66.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "77332230576e3babcb71b9ca74c14266733fed67a370d7adac8f0bdabaf16358a1ee7188211a3590cfd02a7cbc06e5e125b20f0f68468f3900e94d332a39ef3f"; + sha512 = "d8824e9a261b662dbde83b4db3fbd1254a6de0721df7da7b77bba6eeff2306eb61198f35fce1fc1e4a8c8939d42f332ad8169cc6a27ee757af483e887599482c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-CL/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/es-CL/firefox-66.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "0a28e64b356f9deba612365ad615f2a5e5d0654ee20e4361ea7959e791faf60aa116f3bd3e451af88cb6738cb815b78cfd26e44c012d03aa624bad4e1257dd00"; + sha512 = "0b912fde247c288d718d7f75c1986c4196c787dbe3377101627338aaf45aa12eafff2fe7321a2bfef47bf3b7a16a8a3c6119ce330cbb577816df85885dfa952a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-ES/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/es-ES/firefox-66.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "90b18eadcfa5099785d0b46203866e575c4f065f9e70d133393caf5a1551c0f3e22051e274875e6b039b310f2b230e8c85af38eea722e50b357ab3eaf338f9e1"; + sha512 = "f7d7e0542f80bfdfb75592a938f1ce27b454d994f281a91a3baa922d5db55b9a40ea09c9dd03d9d3a61c62667fdac6e537a567865627277e7db2c855aec89f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-MX/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/es-MX/firefox-66.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "ae8bb311cae77f2bbb103a2221c42cdb26699c258fe077f0a5871068b66c8ca3cf0df5fdfc6ef58bd5ff91fbebdf519c7f319c9e1a6702cef9fc260c6788fd57"; + sha512 = "6f823f7bbb72440429d9c2e16f8e8ccc7a9df5dad199306cf8e5be96a994294b06a67c87bf232a3ede28bfd75bab42b6efa61f3535d6399fadc30c45a4e55af3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/et/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/et/firefox-66.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "45d48243b86ee2601368ff1a14e918aee4e5f02d3b2e6a8fc2b5f6c97ee76d7b2caad0131863a192651049e099688b3aa27308e121ed49cfc11a012c71978ae5"; + sha512 = "f03bd296e2cae8e28c44732cd05b34866fe6e6eea1b6072e1297f9a3e5ea62be8d6c9fb1da1cd0019f9e760a2a4fbcdcdf3c2b998e0d4a304d9372b5f2c6aea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/eu/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/eu/firefox-66.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "9357f45c6c484adafd58a204a233c2620e3493aff2b5a1cae16dd8ca7f73003fb6f6d01bcfa8924c499a3052ac6a5aaeb7dfc0cca3d7a664a12219fd5b57b4e5"; + sha512 = "1563e8e3de7c2c47fb2a3095bf9560c2a5fc79eada4ef89e1a53fcdc5b27f6902607aaca09bcf20d78e784fe2730722466f23ddbacc95687eca047cc25fcd9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fa/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/fa/firefox-66.0.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "72d81059001c37edcfbc2e994bff4f9c2dff57fff85a562d389789b8752931a898bfa058225b66868e17db9333449399d23f0043b1c4c102a92739f90e61be40"; + sha512 = "9eb2c3634d3c188b20cd30c61ea7517b710bc8abc703bfa33285a59c3922104b136f30978660de884089a923b5364226198d170a0c94d8262daa744cccc0576f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ff/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ff/firefox-66.0.3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "fdd14ec7cc8be41fcfd9f2013fd9ed032c119a34cba51642fa3c18cd8ae8ac138859218985a6481d0ac5aa974b226b550eec0f99ea1c62ef65da8c17ad019f22"; + sha512 = "05723ea64a84eaf5be466b1087a1a47b1fa86f4f0643bfeebfabf42c59fdf9ffa1613fe754f0c84c027b884e209ad90bc917806bca4da0d6bc8c3c7970de4144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fi/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/fi/firefox-66.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "fe15c43cff8159abe81ae0f51569d5aa4185d7583d92086491d694792c46b10520f77e187dc75379fbbe432da78d869172502e8b8fd6542f3f4d2641cc6df402"; + sha512 = "afd9ba38430f04d15508c45e5ba69d9e1ede7e967f57581457723873408ac4205b5caa2bb5b799144962c2735012fe60c778196a607989c629ffa77e3c8fdb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/fr/firefox-66.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9125d6bd70290423cc9913146707a50accd43ac1f05ec58257e41805d7a052fcadb25629926e0b20d53c2553476d58b9691f48f59538e68aa7b661ff655c6ca3"; + sha512 = "11c83c09bbc02032f99cebe5c6df42f58eac90d16593218ea36f7f0a6c5afa7c2286372b5c187fbc66665f00b23a1b9fc10d773237be9324aceedffe8a9c242d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fy-NL/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/fy-NL/firefox-66.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b4d4ef0ecee7e0b0f8b429b7cb48641f6d8fecd89962587e5daee7ad43d18ef99c6a03292624ce634c1630f147626df6dc76713f3f9187b63a4ac501180979d1"; + sha512 = "fd1cc534781849e1af4159244affbb67b6a153a8de13a1bdd5c91ad0f2d4622e042ba67cc457bc293cd480dff120f084b89eec0bdb443c5dc86af1c05c720969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ga-IE/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ga-IE/firefox-66.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ec94b0dd54d36a78f7ab05901f22eb93c963b48e57b49253f3a3de6a7fe04de227f856fb82c4414d264143bffab5789a9eb3882f8d2dfa8ed6bc0c7d757e2602"; + sha512 = "36abf4c99f93595e2e39ae5a5bab73407605ac6f8ba22b623558586b866766215bfef257a416183c8cf7ff13a58bb790ed72552707f994acf930e5a00d9ce324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gd/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/gd/firefox-66.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e283b895cdcb60d5cab1cdcbf64022306e2f7617b880c386096d800c634469f45543802f489a6160eaf531fb35e744d78b806990a776df27a150f06e479d4297"; + sha512 = "48c68cdc63c78f37166dcbb144c7363fd27ba98c71c047a245c69a7e76750650f02964119c33d6aefef8114397fd2f2dc7860bb47247a19ffc0a6d850c64e8dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gl/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/gl/firefox-66.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "4db9cd8584f30e75e30545803d8dffa935fb75a2f091d20d213f3cf7a55ade3e406d066142d7c4444fe0ef9309f265320caebe07b669c253685c1a0fa4319e91"; + sha512 = "76a82f38f87fcb5c43cf3e7eedf807862f52febf6d354925fc37bbd9f109e6b8f655823c4c0badec050c8ed46c2c7ee5fb1985934473ee9eafafbaed86c22766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gn/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/gn/firefox-66.0.3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "73a5bd92ce989a62f060ae5be5993188b186b26ce3c818b14366d1fd1da09059d02e30ca239a32b74a4cbe2116c3965e5301ce42c2fa08b5af554b399b4cd6e3"; + sha512 = "556b6f2b5e959571fdefb047c0d62ec85ca6160e9752bb579a0fc5c94174d70ca0febbd91429aa10c85c40d3643230531dd7c2594e49723a7eec58cc74e2d464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gu-IN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/gu-IN/firefox-66.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "628e0460eddc0b748cb6968d096836a9e88e44ea43facde7b2969a7c262ced4aad51d97f335bd3ea26b378c102b131411d1de0322d618ed47025092647f02e99"; + sha512 = "276f9fd0601f83ae9c5743df43c91cd1fd9cb6ac8d4d67c06b31f002a0c3875bbde567fa2b0522ee863c1f47f4effa15c62461ca11a30f71cf2a709b54ea1288"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/he/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/he/firefox-66.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "315ec2d0af7bf39dd4aff5f7f3ed41b24d9726b3b02003d282dee80f7ab785cedab0ee0d47ef004c5b30407b72228bbc84ae21882268ae34210d5e5cdd9a3be6"; + sha512 = "72cdbb5359408a36f9b31ad7f03761c76f5a13a54b201a9df8cea712964b5b86b6b09e9ccc38bf2873361c7fabc7c96dae0fdb03e3ccf85b7e8025ed63978f57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hi-IN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hi-IN/firefox-66.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "63edbdae70206aacd70b777e551a2d2af8226c304f3d8c3052436749f71556f4a8f1d11a941f6918878de3d33491a0bbbd198da80780f7aae8a70acd1b8495ea"; + sha512 = "9af2079adabae3d7cf3517cf43969eac917ae50d36b1f7cad64b0ccaac2db06f1636dc96a071af08359f0fb0e51acfd9567e070508b9c3bdd02dfdbb8206f0c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hr/firefox-66.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e65fce5ab014392710f9dfd4460db1748cc04f9b36e91d358bea411aec32494717956ff4268c19a3263ee296f52e24a9c9d83cd210f82fb090c1e4df7ac77cf1"; + sha512 = "273a5732f53df6c69672e3eadd272d35a2421ef6391e360829c42196db33969de86e90dc95c9fbac65ad8647657bca69500a4876845d064a8f8dfad1c2301242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hsb/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hsb/firefox-66.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c0b164a380f86a90489a201c0e4fe5fed6eb5461a90ebe2b241beb8eeeb6680f10963e589dc52ee1568d9e25989514fbf8ba80c53c1cbb6c2fa931bede95e674"; + sha512 = "13605134e7a95f04e8faa64c41babfa7f1b84fe1bb0410c17518e847a81b47ed16794f17b4e833175be79756b48868aacfe46bfdd5365c24ad47075c9f99e5bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hu/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hu/firefox-66.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "6535c5b15f2321d8b69e6c59fd06b5029611e9b06bb4cc967741aa6edd9eba734f84776a35b6c76ea181481c965fcb452fafed80ea07973e9d6d5ce1cea01005"; + sha512 = "17637c96d5bb0e33c6bc3f8e58435a82a53b648b5d665dfd7a62b913ac3d04030379687e1c65b4a9ece119e92590ba0e141f1903236b623e2b398c2e00417d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hy-AM/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/hy-AM/firefox-66.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "af9091a8868031fbc840a00bf584f5c8d868db0b308bb7f492a2257a16ac0c52bfac9da77b07bc4a575ca05854e58c8b892d4b989e199b50d66a4cfb5cf2f2dd"; + sha512 = "02067f5fa5d206c1c8d8392dcff21738f615f8bc77b44e038261cb3f6eacec7be102da3a0d52cefc280b0b71340be5b4ddd9b62524859da99b7554b3d52349c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ia/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ia/firefox-66.0.3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "50a73f0d3260ba21698c59a1a806e47a8329d2f20bd1983d3201de4c0f85599698b0afb5c42239aa8b88bb3e1becd1eaee26643088f55b51b4c3830bde4828e8"; + sha512 = "1195b5031dfdaa35507de6aef21446ace0e68279da0b128e5acacd98d42a09b97a9d1c34e7505cf76c116effb105090dfb623b79a9992e518481bac3121beab5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/id/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/id/firefox-66.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e77b80bd36b21bea3c614c4e1b72d41b9fcccd24be0487b98ddb3d94db53ec703cea8103c1d5dd6f037eba8158aa1a3b9f22ae076f7acd9bd8d5b3743c56d7d3"; + sha512 = "c6649b3d953f3f416d695a1eaf2aaacde12ce90dbed59f16b312118b1f09ebe98b5a905ff7f55b599166c947a57a8d902852520568dbd31d48f4464acdb3be56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/is/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/is/firefox-66.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9b3ee06f79c82ee4215f5a046102e0da4280e89948f5c15b3b8f7cec512b722f6015ee00fa961f2424fa3eaa9d05eb97bfa4514833c8607f8c856fc1ec15e719"; + sha512 = "cd2da470396ba1966ee751aa644a7cfeed284dca10ce723805d7f9330bbf2b8b5e4c3c51e2c798b6654743d62d8d57fd3ebceffc3da55c38f8fac3a7d3732341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/it/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/it/firefox-66.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4d03f5c013142361bac168ddc1f1b3195e6e095d281eeea6129d917ccb41007ad7d1c16ac30c49047c3b620ac4e89e6af69fe3ec2b614bb2e6f647e303ee6dd3"; + sha512 = "0fe8149fb6be846a6532ca7b1db8694900b431f3e4f8ab27c2d0785438baf6799df107b346ed2c814ce9b7f21671b22fe6246727ce83320199f72a3909ac541c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ja/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ja/firefox-66.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5cc48652dc4a23c5fa8f41568cc0a51da5fb6039a5235f6cce79362958b5b7ad0f04ef6d8d832d4d60c39b7802bc87e6e95f2803f2d07a98f7a66ee87e49a2d9"; + sha512 = "1e7eb7798a2cab863986d95384021f8116dc949aedb3a121f887532d57f512756d6782614b623337f349ca27afcfb80545a450ee3af2a3872cc46cd657115208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ka/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ka/firefox-66.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "50277cf7e49d986746bf2075db7b4de1fba6a793731a82d7b53669cf9b8bc6a4036413611a20700a5e6cb91fc61be8189f86dc47e61a9c493cba17719f668c11"; + sha512 = "e3191ecc3a6fa93515deecce972232cd064602c1f2a5f7c807f62ff691459d8f4cba494b33ece05c4662115616099a1232955091e4e647b3f74d6ee4f1b20ebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kab/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/kab/firefox-66.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "df71955a1ef801b49e86de2be14a9a1cdb325a45a8f9424829fc3333841b9019cc927aff9c7ece78b1e9e7df77f88cd899737dfa856a08e0440a6212acc8b9aa"; + sha512 = "27130d1f1ebddec899eb91abd57c8adac8dce60dac6c66e8ae44419ea5924e3c9d46960746b96855c11f903e2dd59d483e9cadc0bc22a33f37faedea3f200fe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kk/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/kk/firefox-66.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ca589dc0d215d8b470f36b05312ad016c523fe4ebb54e37220ad1322e99b5ebf8a3874bce6d131ad6f7ff1008ff29d23393b347dd216bbb0776077a54f84b664"; + sha512 = "84b0e49645f9fb63f3455e43836778fe839dae24e9ccdcd950ff20dbb3d6258337fa489d22c6066bca71c0b827284459a52154ad037c1ba7ee5acb9e4c88b926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/km/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/km/firefox-66.0.3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "46d8788fe845ebf00bfb7c69122e74c5345295aecce61d2903cb55fc85830378aff0280c297082f88a681c393c948a07593c402faeb25c2f22c301207087d930"; + sha512 = "5f1219f19b112a811cba1585eeb99447d5c6f51c657a7f200a5f5620ed5ad849e16ca11e4bf82255f2045a36e9263ca4928a2d930f053cac4a507a748bd00896"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kn/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/kn/firefox-66.0.3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "97fa909c1d3468c17a122e248758fca50a8979ea7cb964dcfddaa17804abf56b62af730665efdd45e9cf617f4ec3f238e6ffd9977a64ee42eb4dddbcf7fbffe9"; + sha512 = "9375074fbc21d3d29fd01123c498b115195987c71583c431fdec621a59ffbfa2f2c64c2fa2ef0a2c5c78776c04f7f25777a3ebc0c1022c91d4072624793455b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ko/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ko/firefox-66.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "56c3d254ff64554180a1fc6e968a653ecbf8e31403f37f211cc9a41fae9a51b21260d5804ab8c6a36c1feb2b479e55b3c568a46609b3bbd56ad05d47c6ecbe76"; + sha512 = "60e9a077cb23ab7192ea835a9cddc3ee1326b6bc7d2e6b53aad81eb3ad0c230df906628eee531f5fd4fc13b48f77b6c5a0c142cf149314c772bc0f081cc1060b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lij/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/lij/firefox-66.0.3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "ed2eb3aa60089cbaf3d606959bb8b6f5cc80b0baa466796fa1e2587558bb0e1f62445760f2ecc93f83394a246555660e8fd253dc621ffb3f3ae55817e368d630"; + sha512 = "22df2f25d025f90571b4f14c92be175108ffbbfa6c34aef1ea8e906c1537e15838b3bc6ef00e4824df4f78840d092fee859ace906efc3526f4a41e60db8c26f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lt/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/lt/firefox-66.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "b22a7db91c29a934dd1ec57bcc77869cd28baa6884e61b25c2b84e4dff5fac9d55e0a7e38f1e8301383644799e5dae8b7fa330d554a9309ef0b58a6bac5ca964"; + sha512 = "6fd1a4742ba994bd65fd83c3936795d88a92655e6334837fbcc2efc8b4bb4fe75741f8dbe0c0aadf1b69e8a48577d7ef3c0322abd2c3fec3eddb09a098843c9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lv/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/lv/firefox-66.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "77bd42fe4966a7dffdf34470cd5657aba9aee81157a78a98a20b0200d71d11162058dfdb9d5a96f9d6648b0513cea3b5c97c8e59e169fe8e955e81c4578ac3bf"; + sha512 = "4ce0f5a1cfb19f763567278b644fdb8a004bd7b4d65e85b46f2235c67dcb2b04f630f0988fef6d5d55e04ddbb8190fb187b0d81dcbf60ddb20629580007d9788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mai/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/mai/firefox-66.0.3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "c110e1559f8f9972b4696c8ee463f813d5088d1babc62333060debf77eac52e7d5b96733bc82c8ffe22aeccfb30c076bba204dbd87890763f3e538a41e2fa414"; + sha512 = "c26bbf25d31eb551bd477b99cdfaa9670205b36562e211418ba110eda6f87e06880695620b840e1a767c98dc7c6311e9ee63f1e52c113bceb53f62ac5289c9a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mk/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/mk/firefox-66.0.3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "57cfad52e649aa43add6f3d908c2f45005bb1e6cd298bd7158e4ed62013c0de053169e5f52ef4c4e0c5521a7b952b26a3cee8ebb088ef26f769a76d025f6f9ec"; + sha512 = "33893eb9cd5638c2d24403144301c6daf8a3fa4e76a30ce5027213e2a78ba906b73ab4c08e19a4b8b62cceb360263c1efddeb4ef848784ed19f846cbf5706478"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ml/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ml/firefox-66.0.3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "df9c00947fba8e813895dab7f31d284187482a640d880841093e2638ae04c8f12bd8239a35dfd5d5ede4a219300306ef449295431eaa1e3480510b1e63a7e281"; + sha512 = "397688afaacd32ae434e5e2ee338059d3333ba9e9f73c766960e0b424bbb7b634bbe0a7d1a09d51a3f41b83b4b466bc50dbd4e0658d8e8f21c59e3013c273240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/mr/firefox-66.0.3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "4afff5982f466eacb86b1a429e68a17c9cbbb9d7a6e59b3ca7eb33341fec9ce904a4289911a0f39f52d4e8eaa5996c3db97d1887209558238f241847a9f941ad"; + sha512 = "885033de3913e8d6eee8e5fcef49166ebacbed5f344e930a809ba48ecb71a253575d52590def405ae0a48d76317d102559038e54b1164f1674c5910c40ca3e84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ms/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ms/firefox-66.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ba2b33574bebd9f34a0503f5c651837a3ea278eff635d486f99102e3f25c3130dc496debbd40d7268af3aa37d2b69a7b572eb7b794c44049bde1492e60b2c534"; + sha512 = "61e217ad17b4d27c68ad4f16ba07d8ebc059d6bbd1ce58489d65d8229589ad9fbb2a6dd378a8da338c419928247c12cc123f2fa70e6f97a67aec019fbc6939ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/my/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/my/firefox-66.0.3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bb5480f0d995512f274eab70ec18160714559f5dc36c937dd4fedea483c2c42964765863c696bf44f1bfd3491b706e14ac223817f1f97553c3968c6c8843a71c"; + sha512 = "4f7ba2e7e59640db6c4d32ccf9c620c3c7895b0763da0e0dcf56b0777b6254a6c33a5d7f80ec3848d5d3f587e0387c9657db4f04ccb84dc08ad4341382feebae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nb-NO/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/nb-NO/firefox-66.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "cee130f0e6a4a18612b8e90fddbf923456deea6d8ba452a01b06b03e637c14b4131160f3bddf9f4feee05a5a675150c917e891b02c04a42234cda6229de12122"; + sha512 = "6b43b1f00866ffcf059d4406c2186e18ceb7216ded302df42a5cdc2c5ec8fc154c9f8a3a7f37fa6865128ce2d788c9e4c1e3e43fd9ba8fa759ca414879693199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ne-NP/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ne-NP/firefox-66.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "cc75630facb9471172e2419d0addc02b1afde95fbf43a53afca63bb6af353adc3dcf45ca7199daeb6e2db312c48ccdffe520b09d316f195f614f5922831791ac"; + sha512 = "47a40aaa4992d953788ec4a2481705653acb8424f8fd11004ff24e9bb6ae8015e27d7610620940f36b5d0bf25a3c426ed3ce53b97e16fb891da3674c66f713c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nl/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/nl/firefox-66.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8e45b9250267a95f583744c94dad0c7bcdc7c00e2dbb1d91efb8b8e56b1f2bff81037936eb840f68e83433590b26a1db18cebbe1dc2ce1f2bae05b65099492d0"; + sha512 = "adca9015850c34ac1cc81dd441b2374bd83aef70914de377b3b9892e0be5cbccb52adfdc40c99db3906214adc5b33ae1885efa10ddf5f14ff958fff2b84bef4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nn-NO/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/nn-NO/firefox-66.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "689c3ab0d66991573990ff8a3e1e7e7d878addc15609b4cab2b97faff6e8fe44513183f03dd3d23c22795e80e4028f18d2c329cd14f7e7808e784e02a1bc8aff"; + sha512 = "bd47c8a559ad3c005ac3463cb1e3f600d67cce0f7f1b6d07722e37c5bb3a47e99699c8ba75c1173b5da626619fd535572fd58f21f01b57e2c5e54c68ae8a4810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/oc/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/oc/firefox-66.0.3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "834d098342739e99bbb2ab1dcee997bfcd433d357962e25bc5ecf3026e2f41525c19b9d11ccf2ca0705590d23f8a13ab316f41a90e1d605dfd284421f502a6f1"; + sha512 = "b43b79ee7331a0b13e9ac839fbba57a12c9375346ec0f56c0e873f4e14c4d4eada3346179ee6a4aef801039e3e8f890df3c5ef293a11893aed4a6e0aa6251b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/or/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/or/firefox-66.0.3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "62a696155aa25b6cc62885f15d29988b50b9a4e8d127ff259759b948be0c6b73eb99237116c188b5a46c638525e5890768a6d3978e9a1fad5a1748b917f2ea7b"; + sha512 = "306980db14e5c728257eafb79a095e1829130b2add9e7798d21f8cb1e0af80688466a809b945617588534de6f8fc0e9de8ad5b1eec3e2d2f1a41cbf580cb307f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pa-IN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/pa-IN/firefox-66.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "cc5a35cfba0b96a5d526196b2c56eba9a2cbf75d5bdf564bf85dbc6676849505c62f8e6d8c8a88cc5e6cb7f67d8670878dfe05a074d28bf895790efe7aacf404"; + sha512 = "d322060a28bae771316d36d0509e792babfc3d569f5fe9dd5c4e9a1a5da7391395475df6eea8a845932452016b2b8b69f5a745e53111c0cfc939022e73eea24c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pl/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/pl/firefox-66.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "1549a76ead00ecff081580f1fc77b31c3c7f57aa9d2a7a24231cdfd20f5ec12803ad61b04bfd1693a571f51e18ee9f29d51b5f60361ea5c5fcf7764b04ff102e"; + sha512 = "6a2cfe2969ba9a778ac604cc80b7418f233e6f87c649f48e2c584e21de874f3b5f6a2eb99669d40e8d091b9f559c7aac41ad513eada9a62bacab420569d9281b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pt-BR/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/pt-BR/firefox-66.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "fec6c531e4ccdfce86c461744e4ffac4238ccb3c1e4134c09828e3bb171561241f9e683a2cfdb22dc45f674c03b0d59b212a242ac4344be2a74dca7bcc39ccd4"; + sha512 = "5f1d94976c9f495f861881d61c65b51ce75509ee92b3c1b23ec7eeb7ca3c4280b1630e05f1b451a252713c988682e900663e98e4bd3656bfbce1574d9ecb0d6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pt-PT/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/pt-PT/firefox-66.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ffb01c1fe171dd86c86617ecf752b196ccf48f6aa117ed86447a741fe82adb00fb908f2f7e01fbea57f6a2cd9c3dc603da47838e61c28a2e1e56a03df9497e80"; + sha512 = "2ab8a70d502b1d92842dd579f49e055a9f4c8f5548154579508230219b44f3d0c045331948257ba167aaa2e9e02aa702130289d20c492c508b3bf97eea9eb224"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/rm/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/rm/firefox-66.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "941cb0cf6f67146216553804629001f317f0c3ca4c3cd9525cca819a73aac72b31bf62ed6efc550301b870916f2e697dca6d840d7495c1276a9a031e5c173ef6"; + sha512 = "9dec6e52b55f2a5e7fd511b4efa0a237fddb62545441b9af9f3d3cd50fdb577b8f1c8eba0461258b20074f23d37e5a88f1ae4a2b7e7ad598e2c6624ab509aef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ro/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ro/firefox-66.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "53586bc5d4420435005fdb0f920fd4d7812dbe381119ca2f97c91cf60191c794070f301c4b65903fa3dcdba7045636e868cbda8f3e1e20592c226b38b6a51a84"; + sha512 = "0e713fd4fc4c936124fb18c62e198790eaffe4b9e8956724f156f6445505cdc4b29bf463b4192d3868a56f7460f2574f3b9010d60cb2ea1b0bbb6a43c2156f5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ru/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ru/firefox-66.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "efa1e8b1c63dfccb1bcd04c943e21cc7529de39ac710d1224588cb9f6e47bb0d600457e49510deb924bb9de32bb61c4aceb027a803e47c75b40f8b00c95bac69"; + sha512 = "dbb1d1e62bbbb20adca252221c0a01dcf1f7f47eef94918076b57fc61062fbb5f936dbb6727c3c8b109b2d40983b716b389f78e091f1da1097f957f1451e00b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/si/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/si/firefox-66.0.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "cf38f59d72961e3adf56ffcdde2cda6923b2fb09fbed09b3eb5b3bc843905773dafcbab858fbf50328e22f7b36c580d1e6ffe4481827cea006f1901fc04c9899"; + sha512 = "87c2e84635fdb44cf221f84f1fae161c3bb39c06c6c31b1b375f9aa1ee58d835d21fe2958dbd8916fd7dbb96bd8a707bba6fe7f15b83bb77b614d40828af0c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sk/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sk/firefox-66.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "e05c3b45a25ac44d3c6b46dcfb9214fb9c2e40453bf041352e10d6790ccc43a9523c541fa0aba473301b4a0298b74e6e74ee399cd65bcdb59dfdd1b2390d3fdd"; + sha512 = "7cc106554dbb7bf8d0f9dfabdd29d0c0d443b11e084f9db1b1d78e56fb5ae7c251c9d89bdfe02677d2d366c0c75f43b669cf6852abbec8dfc2d28c24f7f2c904"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sl/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sl/firefox-66.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2c1728a9f4f2754d8381aae570c61be4806725ed5913e16bec06d871f101454218e9165daf323d496d94ca3ada1e83e69d2b7947641082a70b99f98844d06650"; + sha512 = "ba298a83e0c429ff6d8195c0b35c3c4c0dbe434f2dc9d19b47e218a6421261ea08b8a767343f120b2ecd2e061bb52fc9184391d994538304cee91727cff327a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/son/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/son/firefox-66.0.3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "b3752b9ae75efe0c9eca05f17bb5b9d9e62f92c6ed3fe2602c278f0c2c5e2916400eb1b077054612f21e63c0c26752ec2f03cc34820ff95e4e2d8efe66e15804"; + sha512 = "620e40c8484fee31620a2dd838c484cf971e2d677a21ead71f2043a2f81bd7e1ed2c70c6778922ad337a2fcc87724f919305b78e31ac9880139a68cd924d3bb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sq/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sq/firefox-66.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "056f6c4a5547057ed8ff3cbaa77d270e5ebb6d315aeabea9d552690eaa6f7c9a5365cddb5c5eedd07b1fcbad64b3bbadc9390c886656650018dd2cb690a29acc"; + sha512 = "7b4653a69e11df2a3f0b4e40315fcaccdc8f7de179774a4f1709a85534520d53739b76e34e43da5dc7bff36d8a7db1388a0507242c70a351a14cef081261d15f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sr/firefox-66.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aa8e8164be5f6c3d40af39807b8f20a4cc5dcbe2230156c60ba92c635b828a40d93918484350e27046464ed67cd3fc4e87ab8bbb0ff4d2594f7d916caa9b6806"; + sha512 = "5990ee7d8f68705501f81d48b687b5bff33f9be0912f4cf4c0a3ba23acaa22b3168420b5c4dd8d6dd7968f194b7280c9c34f8f24da9d10a80bc3b2a03e00f436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sv-SE/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/sv-SE/firefox-66.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "81936ab4ac5f876eea54a833c2f6c447a74ecb3636461b0334f4126f890aac36dfa77eabd9e16e8f9943ff40fc9a862ff2b1e2f3b3ed1eab51a6beb5516f55da"; + sha512 = "ad9a81e3c384ef559d30ee537e3d8a966d5b1c118c3185de2e5062a29b1f2b88b9394e0a480cdba8bf02ad60984badfc0329f576c152837ebef47ddbc4c1ffb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ta/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ta/firefox-66.0.3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "0537cfad54bec863b83e27a7a36c8fe5126cf704c6a5dcab3d4319a55b27533d66ed98b43a664ee3513b2e8e0cc96fd56126d4045a93db7487e76ecfad967250"; + sha512 = "ae78e4ddeeb2853ba83dc41c703f63e22d3bd2d58ad53118603f47ead33d656582ca579dee1b4eb4330bd97d605cb14c10e36889e8bb43ebf17d36a165612d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/te/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/te/firefox-66.0.3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "1084fa1da0cafd8894659636f7cb14498beac52adc92ab0ae4b9ca1e35517482a39a37d1d4906b4bc6a5a1ecb3c443681705582be5a2aa21745c767b0672078f"; + sha512 = "d57fbe1c4f6c8af40c8f55912ef0e1d2f38118737a2fdbec18dd71c97618342b9100d7f6fd884c72191c587f64b1d08f16959b7eb4b6c48d43f755f43cc35fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/th/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/th/firefox-66.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "fa6a5eb637154f9eabd3d5e30eea90d17a2281d65bb25d283a91f36a8db05d615fcc633cc77845e29b898699d9b4c091aaf5d1f81b71aa2d60fc2007040068cd"; + sha512 = "6eca812c1277cf9859722c38cdd962dd1f9039617cffb48882bad55b4e8cbfc8138ff230ee491d19b042b3c10ee5499720ec494605bd3c266cd2aa29d9b44a70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/tr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/tr/firefox-66.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "a5df3fb13b78f1cc85bc0881e99390183251c4f8cc108e346bf257a2ca757a6232469e11e8c533b4722cc1381723fae7aa0132e3300bec500ed2c5e5f7070527"; + sha512 = "1cf21e60a8212503d1511b3372e2f9948a6f8e66db8e53fc0d825a4e581afdac173b8518dced34303aca7eb126b9cbd4e0c23c4a1969ca1e68f63f8aede32275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/uk/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/uk/firefox-66.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "7925b95cc4ac4b35bfef29d715ae21bf6f98ab7fc99bfda66f3514cc2d67f9a3f327bcb74a8e1545ad20918c8e50488ff0dfea478a08e9f1bc0c5d28cd8c9a35"; + sha512 = "c24711ce6ca420121fe88c90f610a08ec3230a0f323cf5fd80511c65f8188126f31b6e40b1a4b9f9465c7ab72b866879528080018163dcba3769e1f958580257"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ur/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/ur/firefox-66.0.3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1fd3b03251130cf5b13a98135a5820379c4cf771ba2fabf0ae34d2dbfadca2b5d971c7c0db588fa75ba2594d5c88493961fde59cf743024bc31a7e2aba149b3b"; + sha512 = "358f004569d6a61d57af6305e6b02d5e30d699002e524bb5b73d72ec42c427c63a8f0a5b1fcb11136140b4ede6dc2d705553d5dbafad9bada1a9b1172b4e9af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/uz/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/uz/firefox-66.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "9baf67bb532ba992d9e28a59348836fcecab10bf793c2504a93822641fbcd3fbdb1922f4ed68cd5ab9783ca2c3a382360eb9eb50889bf3979e7f16b306320c35"; + sha512 = "e0fceb8f52939cbb37df6d5fcbb95d1d50a22f1910c653778381e6c1fec14a3014ec01119e06a958768677a9ad54765d6c4387c9edd9c6ac57d2c37334bf6c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/vi/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/vi/firefox-66.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "12afad955cc1674b89af3a8861c3746318fae7e3683ea35e26d3c2f0856c86bb154b860baadecc9d7bedb520e1dea6af0ef73ae420a2b551d5730bfca3c4ed23"; + sha512 = "94c0f9c8df20be53fd6a34388c9be4f3984c437ab270dbc18318e272c234b791911e099dedf9bc6f837ff290e3a2e0a8946078ca830ec24a052044093be2e8b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/xh/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/xh/firefox-66.0.3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e9f4f9576e9a0195c6ff8f67cca6bb3794294886ac2a71376c7bf9f8da824b7c15c59d09645e67fdb9f6371142b29d8cf3a45f80039ec405ad1ae837ca105764"; + sha512 = "891dd4fb85d28cffe312c6310c9a6cb2a70f3ccc9c07d510553790cca51068bbe07e406ff3a7b33c690e26036a7676ebfef68af2819db3ef6e88ffd0557fc8e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/zh-CN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/zh-CN/firefox-66.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "4b1558c2b211f9fb69b8b5f4559f1f35bc547a1ee65ee81ce4d9639b886f765fc97e62070cf39d425dcc8f1fa0d13b7c4dfafc3daf60b660b751d8904f46452d"; + sha512 = "188339263557e356ba24b4a78f715e36c2b5a43af3a9e229deebf9e84e01e3673ca5aa73a271db130455be1f0047591c54745968dbeeea0ce071cb38ffe73851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/zh-TW/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-x86_64/zh-TW/firefox-66.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "73c4940b6fb87f3f98341bafd894189d9d24357fe3fd1ba28397ffae365f4883933fb759d90a385bb306269376cb2c30b4564e2fd585978ec2fdb73b657e3b18"; + sha512 = "52a39dfc7caa53ce70bda4acb1e2c472981df6e457baa143ea3a1a5f6e77f8de1d64663ac7f7a21c56032cf6e9927d191b30a1c615b19a29ca2142e46d736672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ach/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ach/firefox-66.0.3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "ad20dd3b682f6809f499349fc50131a016fdd424dc87626d151c7b9283d6ed1ef585c829519a434da39ba33a31f6a855628f5e6a950eff89b97465d4d6f97838"; + sha512 = "134b66544e203956007ee47b649ec61adafaadb0e03b0a62c83f16f4efc984ad9c765ba92a46f53f78589f09e224bba731c3322041e2b6d3f46ae6919e66fbfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/af/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/af/firefox-66.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "8151ed85053d31956fa8f12e296d5d694066b001f07648845cbacbd206e252fa4bb962f349472475feec99f6a26f30a2fc1e63000664bafff6dc83db7674bd7e"; + sha512 = "71fc9af0dbccb2eace1de118f528430fb5ef26d6ace6ed0f8bfee065c4a5b3049097847f4785bca543f3a77abc64f8dbcb0311069c6120dadf653ab98848af52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/an/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/an/firefox-66.0.3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "fcb83bf9b222eb5a6d872d6c2b4b7bde7ceb7e97ecf9c908d8dd90a7edb52a10378de453f8ef9643735fdf1bb6459610e77e4c05d14c9c594d94314d707fc222"; + sha512 = "c7569fc44cb6db5c5f9b2242faadcfad3d7d957d452964ef806547b03cab10776177f05b0a3a308aef09723e7a2c77529fa0ca746a5d72f3a554c8b49ff4e0df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ar/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ar/firefox-66.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "b393dca33c937d282c7658a635808682e1c9829a2c7d567f5e8f854295a9dddbc88971c929ae7ba65acb9cdd7f31f6bb1d8b27fe93c3f74bbd82fde6022ca9d0"; + sha512 = "d5e5f0be178bf719e465f8b62650b65f731db4b101075ac69b59b4df75e6eb21a3d4b848dc977aef8adff51e39ecdbb67530f575c9e0311ce583e9c072a0868c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/as/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/as/firefox-66.0.3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d53e0d3f7892fe68434e6f5bfd4e6e894077932c0c757567c15a43495a2372a97015f0a78ad47dabb7b7bd21509373e9d034ec5db3d0ada955ada23bcf860467"; + sha512 = "e7667f0705766c544909f512d7ca801ec8ab3c0428f0c5be01dee574ebb4b7ddda15b8a0111a35bb75729fb6f12669ef73cb0dc3479faf54685aa8d644fdc9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ast/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ast/firefox-66.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3ac14d571276b03d4ef74123eeb85a79a422ee9fbd014ec369e0bf7c8efe1d4d3f435897e72a43475e13e0a9ea4a9cfe277455e08bf85d70c2612357ec08a789"; + sha512 = "b64eb2c9194cc9a62c42efc89086ce3e0dcadf2b8728bbedec31f4f258aa9fb5362a555d4379f70f53d4d14ee1f0574739b901fe510ffb47c8a65cc314447dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/az/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/az/firefox-66.0.3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4894d809e0b3db5f01e898e14f396bb4ecb968e5d0129b55ccd3de31c31c50ddaaddd09742e092f4cc62969e70b5e4d821e1a206bd676d98b346e45e1510c3ea"; + sha512 = "8d7674eca828f2cfe22fc954222c43298ee790b00560735ee571c9edc98a719d9c684539c8f2d1f47ff18371b7860de8a7ba33f9154a534ca7918337bcf3dd11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/be/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/be/firefox-66.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ac0d6cbd5ce46d1cba9405ad097291ff36038be8631b46703b0ed7fcb93cee6a88664d3c73216f6fc21ff3c16f4c02aae31860d49b9b894aac7b79b01faf720b"; + sha512 = "5951d05b4130403436b8667b5286569d341e3499f1f2bffe959ef4eff384b79ead9b276074836c4fee41ed7fb3f36f17efe1bf552f7507cf19b03505d3893353"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bg/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/bg/firefox-66.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0c097df8470e5fe5241525662b262fa1f3d088c3a82c596636a2fc79b9a99263717a4cc6b06734e134511f395ee211f95985f287455541f71f09d5522a85807b"; + sha512 = "8176952179a38572bed2624819e9bfbe271e94c6b60277e19d301e902c21934d1c787acd3b0003027faa0f3b8907b01e52731c38ae80ffffd0deedff86412125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bn-BD/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/bn-BD/firefox-66.0.3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "886bd3d7ede79f0fabba534a07abc26c44f58250f4ec8447b176562cf554aa988f8c88d6f8310cc00f431a9710c4d43a5396312546db1adb81cd40684b83887b"; + sha512 = "98da4add6c85ef6b3f19e7ae1b7b1be340c0d78ce17fd409c919926d75fd06f54607272d0404a4700e482f94cd6ad72937cbe82c7fbc0ef41a862ec885cf9987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bn-IN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/bn-IN/firefox-66.0.3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5a686bb6a1ffac5473056ecb6c15bfed19f58d118b0b58fe8a058a66eb3ff6ed9793aa5d67eda8357e7652127a887a244d1bb2cf218ba459e18a791b188a13df"; + sha512 = "3f182c05b584c2d09fef0981340c71e28ad10c41c031aca0dde1f2d217522b1d3e7a3e785c6fa634952bd8a8ad6b401d502ae07065e838a3d0cc59e13d313364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/br/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/br/firefox-66.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "87b7e90a5ab950e428b0a794392b5458e2d7e0e5224982b78ce600adbbf89085e45d6ecf194837e9437465f10e01cd0405d1df99afe90612551af77510514666"; + sha512 = "ea9e175c2c06a051e1d01bb2e1d61f1d0f5e75fb8956516f6a4a1ac52c55e5eeed6405771598ae36c69087c7275d5aea3325ae44b477639ea8423a3aaa4ffe2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bs/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/bs/firefox-66.0.3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "80b0dfe3801ec8c979fb0caacccc6409d64b839c40d4ba0ca6fc114e4dd694299197a24b51138c734c0eac85feba9eeeb4ccf187622632db362b8ba4069b0e83"; + sha512 = "88344099457ad847be785ccacd930f34ad5e08b0a0594c6719865a0d1ec5a01c5e5f5095dc01ef399aee19494d5108a86e8bcabda642ea966912466863a38715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ca/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ca/firefox-66.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7d186f282f82b73433f49bd9f0c3703ecf74d5cbca452ac2469123cd99eaea9f47e0bb46d4f5dba37f291fd0a7bff1136028651118a8b46cb362a5b41ae7e83e"; + sha512 = "e9f0aeb2a3ee8cd118e0afc59909df7ea4f87b737a3786b11841d2e85ee3a61747c525cb2c1a707d480238fc00c128062c2bcbdce6c0249ad1404e06d9d7f1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cak/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/cak/firefox-66.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "9a7c2bc579913f23fa0a9e52c077e52516c66afd5a2319290d8a074e2bce6ec86ec2648f45d810c26e2d60c0a6e1e6ce8c810bc460285eaf268f193e9034faf2"; + sha512 = "21f48505956ac21cb74140f39923364e578c7eedf3fa180a5114c400431476f489bbe14aaebff9003ed7a958e8970fc9c713d52fd3f4388f21152c570ec082b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cs/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/cs/firefox-66.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "1068f4851c0ffcd92cfec959ece7264fdb218920d805dec670c57648e59d10bef3a7df1a4de330bde7d99fc52211ee4f862fc9c414a6f2e096e63d4b9afb789a"; + sha512 = "8b89cd378f4705e96547fdaa0693b359c617fcd0d76931d279ac176cace79d12ea4f7644b82e4835575d78b564ec6c00b667f1e98204886e3a2e990756a97de9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cy/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/cy/firefox-66.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1bc1629faef6fc5bfda6f294bcb6b97f120c65b9251128ba7157a36502ae8f22f9bce27cf0a32395f3e2a43e952a8fe2d509ddfc0e6e7f282d30a32310c68493"; + sha512 = "484808fdbaa1ada47b5a05be161c67202c8d82bbd3c8eebff37aed11d5e763679a2236ea74f08286c70602d8a347698f2bbcdc105c3fb9e0cf835600dfd28a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/da/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/da/firefox-66.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "b8fd09ae3071742598466eae89d4d038bde1c0a07d1849d9b25269806b64b22371f046ede66e130f6a249e7746d58553c9e79bf918e96a4f22c4d176304ebbab"; + sha512 = "207e10cafb402f2b1de2f2141822e68951f06a30e8ef4fbbc337fc103d826f0af15f5b8790c618dd423e52436c6a07bd9db4759c10297b51e1cd1a3ba3045e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/de/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/de/firefox-66.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "226265a47392fc10a9c5638df606bc0cd47403410dd503ea1988dfca29a3c1f6a75ce053e2c604138a453cf5998489396ba5dc173993de5053f9bf0f6dd95996"; + sha512 = "09550ad63b619376708e51b967fcdf0c0a9b0921ee2444cf10b08e8b30264ce45130502fb29e8a70c887f3465aed3d737d9a45b134f16a181f3ae094afd5c717"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/dsb/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/dsb/firefox-66.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ebe9c8bb5f55ec3915bd1e53ff78005d8799d6ec0e3a7fd940394084aac0cd54fe8852f5e9ecfe63e15efcc48439849c6a8801a8c7127d4bddd880ed4b13b1e7"; + sha512 = "6ab4b87adb70b3c5f015e4f96b5e932ceca421f552f30acfd9e00d171b428529e8280937eb5b89086eb8389a9ded86b61f45dd2362767b49fb25a11d9b9513ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/el/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/el/firefox-66.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a54f1c2b0d38268a7517ae5436be6194039926d162e10c8deda35d328ad8b367dbbdeef00e727e504726d5e93bcc04dcb254bf92072022eee1b327735a3bc230"; + sha512 = "e80dc8fdc61f1b19260c1eaa0717375402dfeba3b00d6a8e60b4074d260239405958b34902e954063d2877dd026e9b19d74a6e6cacb60e42ee5940ebd1077e60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-CA/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/en-CA/firefox-66.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "78bfae33a23334bc262c0f311a6bafd7e1175235311f7e48017173aeecce29d771b2f70223ce6f54bbb08a7796e18ec53c75499c4e6a821bc5890c14339ee3a2"; + sha512 = "e832f717ee292430ff5335e1be7cfd4081fba289be7e62a153282bb5fa5f4d37673f994160e436297f542ae40845ff09843632b66b37af2ad392d05c0104088e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-GB/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/en-GB/firefox-66.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "6119e0c74ce896ac4569efeb4660feafb1097162a908a68df0cf33cd5bea2633e85ee2149cbec2ff85bdb1579a055d4776b7d4c2473baadcd9c17a2e9cee1dc5"; + sha512 = "aae266e5e46a33da09d8b656ea7d0112ae4c612216bbf4bdb5db0d0e0b231c7e83ffdc085e34ca996958c0d56c2c03f42988efa783644c1ba249c867cf1aa48b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-US/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/en-US/firefox-66.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "5fadbcdc7d39f21bb8c5051702a1239945e53a058fc61a2fffec0e51c4e31898b0ef5625d51c87612e4fcbf9fc8f3be9e18d6cb86e832d895278965a5c21e034"; + sha512 = "55ec374310abaed9cff7ff17cb4b4848a2ba8b7803846f6a1aefebc14ad8e3c62ffc066bd6c44d9bb208e82d833738df9d5d0a0e19d90a64f4ba1889994637c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-ZA/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/en-ZA/firefox-66.0.3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "7abc0ce1d718bdf2d3d1c47449ce4298194b061f6ef35c95577beb1036e5c4a2fc99bdaa145a888bcae0f316034d522a4766c7b1530e7b4b1c9b7a3066d2a771"; + sha512 = "1ca7a97219fc9aeb790046adf4545e20a3aa3a382a74ad4621e0df89584984ecec212492016d680b512dae0341130cc4618f61cfaba86337ba3e0d3deebdff88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/eo/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/eo/firefox-66.0.3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "67100d6438b6b7ca5072ed1cbce1b77387042f01f0fbef87105c535048e44cbe057996e5441879bbbe2066233a638e1b1faf8e880337bc2cc1488893d14a7aff"; + sha512 = "1ae8bf9caf03ffaea1a6f6a071b1d26818e39b0b4e33e75ad4ebca7a2f0b20b8c0450a1f24466edd59b211a1d7f2667c447fb19297e42f4d32e6d676b634696d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-AR/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/es-AR/firefox-66.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4ec1451840a7cabac57feca4d62a572bc3719444f858a07d6b664ec649bd4a2f2f5cd78d9b30663ff1e2f6b0acfce864ecea60850ef4972f3ba00f42b979ecf4"; + sha512 = "0c48e15544335e4d061db1b12e82ef7eaecdd542391c0e5fed91fb74755cfaf6766bdad02b4f70c1c7522eb1cebf684b400db92bc632aae2012a9f9627e04552"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-CL/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/es-CL/firefox-66.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "a75fda20a7c8c0ccdd5ab857f62c59b7e843d5f47ce5ea2aafe0459298606f4e66bbcab6e825134b7a35f4f7b217550b8ebcee780cbaebf5bd438fc382fc49d3"; + sha512 = "c38c5dd28313333849cd00a8f35a91fb261e3cabc8edc71bb74b3b0152b9375ae915a6c26a7ac2334db9805a6630a394ae14f53e3de048f9808ce07cbb14816e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-ES/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/es-ES/firefox-66.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "76d8438d349e1d52097208000d96e7994ff3fae46e6a3ed6db0977492b4ccd93b49104393779db6f85d5b8303c01bc1d30c93013536b68992b59063a931948b3"; + sha512 = "b7019e49956fb4038f445e7425e99cd19ee23d12ea32b53d664898acc3c9f23e03168e1d35fd731cf88d3ed98ba0a487c288f457a79721df0c49f0a66f5d32cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-MX/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/es-MX/firefox-66.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "34cc6dc8bb07b76e322b3da263be6d91468634a08074da8000ad69a4ef3d93aa281996b5058a24f163db52dad7c73f7264c37bb6905217ddabbf8844076aa934"; + sha512 = "ee4abe8b333f3de4b70d0ecc9d76c040d4b268b0c797eca6eb0eee89cb3950310b73bc0d07117aadbb386c7e3957d0aad97089cd6d352c385a5849f426bacfd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/et/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/et/firefox-66.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "84f6514e106ef5457e20d25497a93f44d6968ed3b44d513325926abbb7c3fa36db8c198f71631f28f03afea4d8d1994de07a2aa14fa64693196b4693e1820a6c"; + sha512 = "238c68efd328ec4fbd679a573da18cd48ac3db6553e31ad49f3d0a08392b6fbfe907d9b4b996764d1f346fee66c9ce660af4fc8c2dd8fb87f8734c688b9aeb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/eu/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/eu/firefox-66.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "dc0713db71626da9224050e3af5f94158002b8eeba4ae0a5f7bcd1e837e4bb1850bc180bf77c35473d6395728397af15eeb0082570e9ef62b3690c73f84cd7dc"; + sha512 = "30e5ba2be30b4db009bb88461b7425efe3a7c1f8b292c3a47ddcd6d82f85e69a2b283c54c50905be4b5d4941f788b4a2ff1878430d7f6918a13080c6e8d2116f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fa/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/fa/firefox-66.0.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "6634a79d9e3be0050fb4c13a8a39e7316084ee7ef48c32b826954133c516f271672f2b89f91d1e62af7ecdaebe33be3418a8a128b2b0b91388ff18d13e265207"; + sha512 = "a00b712dd49e0ee6bac17f67619c92ccc6774de7e9e078f5d95a38ad0bc6b8a16405cced536d111043fc0cffdaab420d5d12694f452a8839fc750b8a06b38622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ff/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ff/firefox-66.0.3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b5954d6f5ab4a3fb3c337a67a590513003d781825ff870f8c7a4d10bf73476f017141763f98e433c0f1ba6668f2a76ebcb76bca80e2b73757b3fb2abd98c1ae8"; + sha512 = "008a099bf92ee2e1911717e470de41b563d1db63ab165df70140a287e4accba7ecbfed08e9f155696eca24d82b5e3710a51deae00b9cb3ebe2c154cec52b55bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fi/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/fi/firefox-66.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "2973860cce56da4e81058e565d541fa4f785ab8d567486f992e67d6ae2de60e334fd114adb6b584277ad6c01cd4019b1d1917c709bc1437ecd927c9d7851768b"; + sha512 = "7107756f54bb5f388ddb88f3bfaf0f24302f66e47864a68f66596960f7d2d344aa10a8af674a681ec1cec7af4d554365cfab18a9bb7c341cc953d4bb7f0385c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/fr/firefox-66.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a3f58d4926dfb07c51b21cb900b654a56aa7bfe238c36eef104d66d72fb52b431a0cd5684fef6b20c8aaa6b89203116d6ed18a5f1ee0fa79879c25b64931fc3d"; + sha512 = "b5124721aef078386a4c9dac9dda7fc7cbbb7aa35f4797e6689c74db39d18b23eb92d87b29a2e5ba718944c7bcb80cd26f33248091a0f99be854566f68377b7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fy-NL/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/fy-NL/firefox-66.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c9befd42b54c68f2fbb5cac27b0c84f0d24691999a3d6547b946b574e959ce895a1b7dee37873f9ab19ab1cbe5f1a313d5b9bd251dbf68d50aa009d0a6952f68"; + sha512 = "9cd219aaffda54d2b6807b7825557d91651861a3fb2d99c33623f04450d799d029311a7cbeca3062b372e59c50f0b0ba169a38a0a87c676b57ebb3b6b70c11fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ga-IE/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ga-IE/firefox-66.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "52cdf9616308625a57a56029fcfac0e0a31879b24112a946f219ae86bd72453e04ac8bfb910b387972b398b21e2f26cedb58a6c21867511261946de5bfbc74ae"; + sha512 = "6044ace615e3133677cdf53c6fbc1b4b9f02d57363fd6f9b802a4501da92a604a539689dec774339b4590f17f3e05a28dcd1ae1c306d76fe75b4ebf18a0310f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gd/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/gd/firefox-66.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e1aa8899fd0b14e34d195975fa9fcd08135dd4a9ba51bb315bf906d924ba962ce39e343a412cc2fd9a01a902ee627809512e9fc476c5630d5ae026feefbf84d2"; + sha512 = "eb8bec22155e74d2e8da88741ffe596174000ab92859d7f06ae00c6280a0f564c1cc03d06312ef1960d182b61543c88ad5fefac977cac2456a2002bd22a13eab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gl/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/gl/firefox-66.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bf9746a296fa402d3165bcca29257bf6953c49164dae50611de14fc0244c220d3904b0f24dfc1045849e12c37e30276fee9efe8f6a857833347987fd87c58e71"; + sha512 = "e98597c41cc48fce17c0698afcd694bcb772d62671de6bba4db8afff8c02ae2c11627a4b6a17f719bf86f5425783e3c7ef94124c49732447e356b67f35b97b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gn/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/gn/firefox-66.0.3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1d320e4ccc4f2b8108ad1cd4d1427104aa76a5214259b70ccdcd3dc797dabec0839653e310c74967b99c60f017371db71b99aa695fc6dbec0a7a5db16906d987"; + sha512 = "7f89a5cceafca50806a61ef748319fb2897ba71993b99a8e0fa951a6e1d0f04af4c75d4cd18a2061f6a56fb66fde391382fb4b11e3509f9ab227c48ddcc53fd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gu-IN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/gu-IN/firefox-66.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "98854b4e0d44e55c797a79df6a12dd473e70fd030f410944097f7ac3ca3ca50d80768cc627aa55cf8a686b47fa8ee1c15ea9c7ff89f0c4eaf2a1760515372482"; + sha512 = "4a50e5397349d68a1d3c9d1595873b16d4bfb8c28bc588bccba4d9f7a804374fb2094cac8584ee62cc415d4cfb22e1af42820ce0d3a8642d985910785888900c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/he/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/he/firefox-66.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "bfcfda4c361ef95c85ee3b90daa2b641cf0846e242d71321662000eb2e0319eccd01f0382df41053e10daf9a9a5cf97972ab00889d6f1eaaa41a83253e2261fe"; + sha512 = "98cdc96eed8b3d56a4b23ea7b5ef044d385b01635c4da76a36284e69f1feb2426c370af907e81121a4ad9baeb7899f98ac76ad477a6e74f1fcb6333a35fc635d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hi-IN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hi-IN/firefox-66.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "0fc7933d48d7a648780e7a0aded7912b92749aef7f873338f9eeac6c59e0fe86e997d69886bd2083ea987cf74b176e477ec70a33eafde3aea3f1492da1077c74"; + sha512 = "96d4388edb544b9dfaae47ffc87d426f9a3e13a9eddcbf6d83e60f8d0bd7b9bc0565c2ff8c610881c4853a7739d3aff9d64ccad8dddc27d2ea6588a077441d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hr/firefox-66.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "0cf72ac981d5a2cbafd3d3b4dccf821d235c5743556703cdf2ba1405181342b29c3830b8693b54757404b8ceb3a51c7f8d1a812a26088f21954c37d308c79fa9"; + sha512 = "4f1e2112d4771ac198a6739ebbd4738e8977a84b740e8737569afec5570d36aaebcdfde4da54e818c2782c6f31d785c84114be9e33a6d17db480ef5c9955c62c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hsb/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hsb/firefox-66.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "35d81a78827e8faf1f1f9b939427b2f7198e84aa841cbe2bc764f7531ab26e1e192d539c9818a0b7c8d77bf0dae15ce24bf805f0c7164db509f359be649e1041"; + sha512 = "27e284f211b9f3f76fb7bca2db5ae92ba336df2df838b4566ad7b7a538229911717f8a7d3321264d5034a7cbb57df4283b13742a2aa45b7357efce8365551640"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hu/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hu/firefox-66.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1d7b3c5cae0f9478b1a68d3c6e9bf4098a54579872fd38440e9bfd118151efadf35dd8db54441861bf4de11bbaf0358df74f26eebbfbff352de7cbaecd04a091"; + sha512 = "08dced3a7979fa7692e9bf4d5070925fe06ec7af1b261d56f36e55a068bbc994e881540eb7830abd418c44895edde460fb43beea84753e5d96ee35f224ba60ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hy-AM/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/hy-AM/firefox-66.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6d36b676b98c749ffc88bf831be7d9be27bd4b435ab32be9b61bf93edf69a3d8ec91a1b6ec2b16d1e5384c6cbea5fe3300e98d6212f5d3260cef121f75e24bc9"; + sha512 = "6ad25162a877f821ea0a4aa37ff92e89c45b1dcca03324d79950aac451afe8d3acdd86f0eba20f9bbd058ab260b4d64e6ceb6e5d1698893d05611c6759274e14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ia/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ia/firefox-66.0.3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "38a4baf9dd145fde8400a2c08f142565c41d6dd63ca4317c759e9dddbc76fdebad588127279b31becd0b4033c3d610fbbc6dee4ad3d23d4bee5c55904a8ef939"; + sha512 = "fbaf8495d07d270bb1c80afbe47820193e3aaa52f396b281fc0a3a468e987d1d24abfcf9ba02aff58d9719cb97d96f5a4b0ad016acd79aa8097e88b737bb3179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/id/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/id/firefox-66.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "06814d2b227ee60324a1e84a7e41b8fcd8e1b8ac35ffdd34b0d45ba528ca12a3d1fe9a60a14ce5b16fdf795f5c4d31d1825f3addbd8300c76fe0eb60bb29d52f"; + sha512 = "8cbda23ddfb9a62c3e19f24ff036c0f569c0de3c9598932ee8c63f89252f1c0f71d61fecbd270164952236a6a9a86724d1ab86eff644a31e6c0c46fe94f4b11e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/is/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/is/firefox-66.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f1b062932ee0b4ddd7aef3944d1d819e6ec0a2fcf4606ba62bcdbff55b13897a09265632c4f7451f673e82de0359e0dd2e927d3e538f32390d3bf2f0b794ce41"; + sha512 = "302951a92d245bb25600cf7a791087398aca5e053ed50ed3008c5da9f24cc049c34be0bde5cc4d8d54a272fe5c85b8c29d067563c33c7a03b2466bebf805233c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/it/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/it/firefox-66.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c4b456da77214a6a8e435bf347ecafa49e3513e0788f750ead5fc17218a5a52809756c02ea0c44d29adc037605b365651eb81eaaada2d21f0235865c1d585e95"; + sha512 = "4eb888408e72385ea976b2b6f6fec3304cac26780724d570e715625a5a1c04c38c34349256ee8011a643301c3f1075a9cac407c3e3f44a18de30b555a34c8ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ja/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ja/firefox-66.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "63f460ece90c5d360060fcbba81db3a62508f915608e393d0610ba1696ee030d81cee4654a25cd1e9e4ef374f3f5c1529d8945c38e10a6552f269beaf2bb71f3"; + sha512 = "87d0c8b7d8ec1cdc085d911b8af9a29ecafd4dbc0717e333ecc59af1bfd245cde5f76a42686d58ab7b688bad33e76e1771c47746a1cff5fc8351cda7bfc1819d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ka/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ka/firefox-66.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "12ea4c14139457b125fbd92b6e23c26b178637638d205a7f19c90818f97730bc7a1ea947ced3c3daa79bfded228d8afc9178c0cb885334db7ee30abbcb909beb"; + sha512 = "63f1e3b1160d7baad2522a833dc817343fe208c347941c73eb67764a337894edb67c81eb1e9751475e0e36d4654f3cc2f17e15f1d2a1fe0d2a0a166fb7db354b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kab/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/kab/firefox-66.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "64f1c0d5a332e1c7d97a6dfc2f3ed71f1824af41d849113daadcaff8cd9bf6b7b630a2b39468a6ac3599fa69be05abec44c9319658728ac2c666d22e0026ea6d"; + sha512 = "bda5d6e27e1e4346b0fefeca8242d1d5300116242c2387fcd1c0a38bdd413e3b8fdb9bee91778be58988eacd1dcb7273a152e8ab43b624cccf5f0c92115f4c4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kk/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/kk/firefox-66.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a4b75e4fe66d2e0ec08e87fcade8c990aac5f1be28a98f35aaa3f43a7064866ea5ab90a738ec30e7d00dc1111896a3fe3a976b6f97ad1db08177d73fddd60bf9"; + sha512 = "ccdc808818e5f9e27260125c8d8015730593b64afab1905c1e17e047263215b3163049186e21f511752aa5adcae085311d7d4bcda657b92d3ccf640f2b210975"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/km/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/km/firefox-66.0.3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "026c8356efce7734a392f2fbaf8328f22b3a58e32bc8fd588ba73f7aab5f77cb0de2787db652abdedeaf79ad5c2628a84841f5b08e4477d911ea185f1bfb3fdc"; + sha512 = "8d384412ae5af3b73f175c27606e44e5c030f9438aea914b6ff2509fd42bdfe54469a5d5a6e0bb6363b74664bb185e24e2187fdf4013f6d5f7c49ac2a75236dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kn/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/kn/firefox-66.0.3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "a10623c4a3e123ed826129d67fddb74e027274440b7c21cbb2c8adcb50a1b7e486b6cc5f16cc8b07beed3e056d034f35ffd61742fa6e77f001fa6b9e5737d938"; + sha512 = "9d20cdb789ff63e6f25862d7d4342d170c47979353b605bf7fff1d58dc0244f7f9d13fcd1020a9f0934d72aea2b5571a08b2781cc0efd8bdbc923b75e1c30600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ko/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ko/firefox-66.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a598ecf2cd1e6171209cf99fe32e6a9b981ffb92921a738237d1a7c7d575e284943da6cf37b531b3cc5ae3f08e02c2dea0d41a36f94147500977107d4d0f5884"; + sha512 = "a1bd8b36e95342539b0ec4d8c624ba3a38a9b39b683f74d474a1c5420e3693aed3660122d1593dae95efd9fc1d938281728920b64b06d353d029926eda901d3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lij/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/lij/firefox-66.0.3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01c8ce34b83bd851d92bfa47c9d79dc04a17fe925a7d14d0a21e6f2dec7b467ac27c3ecbb48c6cd24254f435208123254ba23ed4b7f4230fcd1108efb597aba8"; + sha512 = "5e1a9ccc0e2265e5f79dc2f5f315567deab1840051ed16b5d78009bc4c0c8a7a70841828c816877a50ea73baa51bef00bfa987107218a7ca137cd2fe6ec57a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lt/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/lt/firefox-66.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ba92713101a02cbcf0f7851b9bcc623174101ef2c7d974fd6a7e47db812347f4319d5b55404a0d5c00707f3bc1c065ef98e0e7ec5112114bbb0704d10de2be80"; + sha512 = "1b5b1bdf7c360622f2e1727674349f142bb2912aa4d94de24722c3c3ea2e304a0c6a9ace091e455939441fc03f6b84cb77064eb0e86aabc083f0f4b090e0117e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lv/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/lv/firefox-66.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "eb9cbf6331da0cf7c1af6d1c69f4b832c07879631788cd4caac865fc9884cceb5f63fb63dab024ac4d4d2cde5bd75b90a46e38473e68cfc800bb2326555980b7"; + sha512 = "aeb4de3b3eecf08a627512d6c73755150d8cdcd00ef9f9d834b9de72e6e21e0df6b0fe2f248919e7c6219a4eb3e6b63dddd60da08742af0297264f3da655a580"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mai/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/mai/firefox-66.0.3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "78e1e89f86e875b31cccec93bc0e85b9c7c9952553724ccb7929cfdc6eaf7f0661d5d40e6d4494528953e30af80a9b83cb16b49ec555fb4556eae8f0e29cccf7"; + sha512 = "27c2e1581a08fcd530acc8728543304f5ffddbadde8855dc241dcf3c4374dacf5092ce32f90a0147540d832d4c3221416d9c9d8741bf3df75918fbae5c1bafdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mk/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/mk/firefox-66.0.3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "45c965b386a88f1ff266d6aa5b50adff28c5b8c5e60cbaca96133ded59eca8c7a9068179e4ba84ee35a48be949a59a1eb81f1b82beab5eef8fc21ddf5b387db1"; + sha512 = "968bc246c79685aec397dea83aba70be43db5198849a868366fbbb201b032cf48cdbfab1dcf8472dc34d43269f9f89969e0142391a1404eb514a4c002afc41b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ml/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ml/firefox-66.0.3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "4785519f5fad4d1bcd3f5fdfa219eb0d9373db6d7187b0ccf57056718214206b9d1d73a3fb99f73403bf11bcedec360ec58b22640bd27c15e0ad981516a062c4"; + sha512 = "06915e32d05ba2c2e51afa0b93da0347c4e9a2d1e13fe07f63b3e923332e693155046d27c3cbf653c1f4e2c0803e9d44a92c2c7d6c51e57d68aaf0928829f1a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/mr/firefox-66.0.3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "54523da6bdc639c3a803a161f670185395f3955093cf4dcfce3e209e5c041af7c12098d1d9c7918888cd826d3e2aa63d645f363f5f82b7b6bfb8a845c35b3db0"; + sha512 = "db3d3a4f508596fdd52337101521b4adc4ad9ef65f076afac0eb35060e8def5dfdeb8cb2294e80ad6bde8c8d38b8e7302985fec191d5aaa78889c0a4058d9a9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ms/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ms/firefox-66.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "916ecf06b7426bbb7583ae124c9400a8fd505d764fc190a28b906165737cb9e087a96bed97f566459574cb99e96773a1c458a8a3a97d48075aecee4b30d2f7de"; + sha512 = "f0dec83a8e4df4702c48519d00588b8fcc437c6c4f2314e4e2479045b0b610193e06744fb2ef53239840f73efc641c5ed4c542c572e5c1a2efd3906f91109da5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/my/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/my/firefox-66.0.3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f1afaca5fea61cb66379c4fbaa3d1ef89438984ceeaa3eef687b43d5ab9ac00ae9ff8573289aa6b0cd353a11c784eae188f70dc4b314f45058362540e9cb4d3e"; + sha512 = "82091b20acb72e105384cf203c26752667535cb9741484599904a3fcf995730cde7e4fae644671a5a43a75cf1c426fe0b4a4e4a8cb47e5649414dbf340f04a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nb-NO/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/nb-NO/firefox-66.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "1a53aa28d7ad3b7aa88fe3014dec35b9ecf2995fb51e49a88574fcdc2ba08f421654c1c4458ea0ed7a9b1acf8d4c70269fa55f37c8fab92331b593b0b27a0421"; + sha512 = "5ea64b98cf0941a00c884ae02727858a3a4d1bb81f1b926f39f4cab30340d889b6a7250bfa615b806964baab46a97ab379fcc32eb27ccfe120c474d38da1e00b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ne-NP/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ne-NP/firefox-66.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e9f402763dd04f2eb556ec6101749c1203db89305c3be56bf63931d3ab61230303f3b35718fe0aab896adab22248b8c5ecb973a1784d5ac10ea84c3efa0079d2"; + sha512 = "ec88e2fcb98afae35bc9fba6bd9c835e0eb47c9ee65c5147c49ecd1a5c7e3a4303a31f24cd1cfcdd0483282ac5a277dc31a1c31f1a6af16ea87d98f72b1c683e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nl/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/nl/firefox-66.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6c5e493e2b8d6a065c1db11c84850c462a5e5d68e0bbe97903f76dfda6e150a244236524f2bc82ef75850c84a2cbbdc9bebde4d587f24f3065eea071b74189e2"; + sha512 = "3c63b8d51d900fcf1d84dc2df5ff60d80180aa57ab6b51748c3e6c493aa5eb76dba394f57c6563272346a728a6a432d63b660ed252faadc520732fcec2279c04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nn-NO/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/nn-NO/firefox-66.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "134ae8ffe1039df99e7eff2ebd5a86639d4b80b4d19b7382b2948ccb910f1bac4372d0a670faa0ffcf47722bea6c980238c00c338b4625adaa37927dabbde416"; + sha512 = "996587a51fea3c960133862dbefa9f6639f3512edf81cbe3740b88a76651753faf7e49fec1b657d039e2f1970137933ed3b3ad3a09f4c9476377282af22b1a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/oc/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/oc/firefox-66.0.3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "889ed30b46197a79ab9eeacdb72dac673dd3f584ed23a528ebfb3d2819021f7c08867503086c62a4cf29258a48ea2d370b0480d3096489d1d0596761a05c2b35"; + sha512 = "1e156c39ebd5d74c6327fa09e04046cc2efa013747b574916a203862e5fa19c921f223ab537a91ec613282821c4916a73ae8e61170c709752cf3f12ffede6dfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/or/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/or/firefox-66.0.3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "57ad08fa2a598f58480e618d6d78ee691512594dca86d391bf1c9d87c6c06e3bb863b596c1812117c7994e06ec06936d48c81b0cb67750e117740b907ef528a4"; + sha512 = "3113556bd37eafeecf562afc068fd8608e387fbbafc7e7d6ece475678c1cb0a025d4ca92de569ea6a78e1f83755bf0aacea6031d36ef67ba43de48d124e8e766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pa-IN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/pa-IN/firefox-66.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f4da8860b36a06e8d7ed5e782f10a0181075b7f4ce85f75ce2d9009a2b5ac089b4df208ab29253414c1aba4e4d954866368b7de57b8f71aa894814008135f613"; + sha512 = "c74d08d019b0257ade3e6c9bcd9a30d102523cac3740bab5d11a7543181de8623e6b12930e0c57fc3a261a496db886ca1c8225bbb46ea0fcca3ac6ccaa2c34cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pl/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/pl/firefox-66.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ab449c5f797218f92923abb9bb891ca2b8181f9a858c65515c72808efdf6535e1c0540a74b3038938570f210eca6be446edb2e4dd55e9a5f6e1a55f6d3fe6aeb"; + sha512 = "54a0666be5524e49e4f3cf11ff19c2cfa66c65524bfbd70ee3cb21428c75f84afc8625a2bc35ffc8a4d8b79074c7b1d0f81770a0bc392ccfd7bf1dfe8805c569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pt-BR/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/pt-BR/firefox-66.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ce1436189aece0310f4a817bf838b88f5daa85c4c11ab14a93b48a6e7f779dc26c3a8ee5e1a0eb7d09a9d8f856c30ba0196e8ebb6e319883c917f46e7f5f4ecc"; + sha512 = "122b4dda0fbe80776b50a6dafda9fe9b5c08a0bf48ceff3bf3ba4c759ced6a09e76dd1b7faabc937233e8efe5a4f37d9ec54c4370531e2ede255463cdc20d4ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pt-PT/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/pt-PT/firefox-66.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "dc07a770cbdfc80a65a48882b3c4a96a74a9771ce75806956cefce7a5748c065b92cfaa066e7a59ff1c78a8584e06aeef96021ab9d22388fede1b824a8740fac"; + sha512 = "2fb9253e60407d5deeeaafc61919d7cd7caa7b183d8ca000b4070da7c3f7352bc1fbd295fa10a77365afd2c0566257b60ea4d6718f25ed39f282682a0a4c6ae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/rm/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/rm/firefox-66.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "507825359c936c0030440b3ebfafb11e344c0ff1e1b610d23c0d432265c5c5e1de9ce00f69fcbadf87295c4b29be621325a114ed084547bcf6de79e0fd091ac4"; + sha512 = "c44d99c714ebeb4303c3344ff5a58041a4c93f8a241271c8fce72c6fe3048cd966709a412d7b589bc540754db16a622a12c81c885cb0fa8c072277b2b32b6c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ro/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ro/firefox-66.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "89df1ca413857d9ba492bcfb460d0a9ad8d08ada7064b52a620a1b7534d7e2c063c5bedba6daeb25bd11f10360f4929cb4ae279ae9aca4d9a2d77d9c070cdf4f"; + sha512 = "53e1343c751a0dbd53fe7a6a53afc54807e7d745f811ce9032d2edd60721e9e01a59a547aadfc9c62aaea9c825da9e02794520a03183318dab7cf08a4969eed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ru/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ru/firefox-66.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7bcb17030fbb31c5defa72341ec1d4f6194d2c6bb88636ce75ab4b4af387550915a3527aaec12b67bf7993b5bde4ea7087d59c0d46b62c5acde03d162f1fd408"; + sha512 = "cfe85e79f0cabac2ef0939cd6001939a0dfd1525b1612bd991101e22078f9e94965ea52ee8fab38a6744cda0ab410d9cc638c706c61717f51f989d5efec241fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/si/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/si/firefox-66.0.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ab54d6eb2f9e6d964b03c50d524d08e2906a6ee4e2161a516e26bafb4065b67cfe613782f57cfa4fb2e0f04204b62fd013ab6f75596d6f3f9162a24f6126b611"; + sha512 = "0736e18ef2f6c3112cd8a5142f31b45a05cd6f6a6028b5011e35c72b770787bcc69d86e507c1ac292e194f80e041590bf23c981295b7193b4dbc3f576c8d55ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sk/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sk/firefox-66.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "db88ef36e7053594acdf0d46e42e948cfaa5e792e1782f9400343070aed8ace2793e482f25f7e1134ece6ca64ac27023b11888b012d74fc0a0af523a7984cdce"; + sha512 = "525a589b137ff53ed8aac506ae11a62a94e02cd3fb6322a2078523d630fa86fdbfd1e1ebcabd627a2d34a1232666cdb7fb4b265f17199c063eb73cd2499decf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sl/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sl/firefox-66.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f98af8f8d38bed7b54955536a8d68de4dc49b6a7bf672c4fc9a5ccc85cd41e5299d3ab897cbc794f2427a0c44da5b54b855c4680315ce6d5b13f378381216a7d"; + sha512 = "805b5cf866b80032467b3a0d825c9a31243de48a0588b966788ae31495bebdb1038ff5c1f342dff86d471786d680c67f1469af70f0058dbb0daabf11633c89ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/son/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/son/firefox-66.0.3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e146a52b975fe95e5bc5b832a84ed352310f981ef87fa0ddec60cdd05c630db24f8661504a7854a17d26f68042021c4431e5c4199870fb26a060365d4ee8dfd4"; + sha512 = "c03faa7bfe24157e053694d80a521bde6aa8e79e8c832ebb026b01a95ef84c5e3a87e674b4fb1cd8292f1a9fd7ac9686157909b0e71a81495c98c77692934703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sq/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sq/firefox-66.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "0904eb3aa5ce9fbd51094b751220f33eb20a2eb5eaa1768adbae36d7caa1c9b1d69782e6392fac877297628f0a075bfa8eeac67c96884f40830d10254ff5f6bc"; + sha512 = "27a3d25c9ee414c933a01db42a1c8fc288324b1fd280462e5acb38707b142ff140f0e77d3a1f6bd234cfd12a8b945a36557b2d7b09cde92c77aee591d1c5a4d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sr/firefox-66.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "984c046333eae94afbffaf8a8b93dc141f77216fa425e3663656487c36056c45cc922fbd0e7173f6c271e1f7b3a3b07caa9d0a21881e6b9de3a9e86a5330d318"; + sha512 = "e053f3e8c0cdffca1fa2ba875186402906afdbe7196cb2ec926fb1ff749e391d21beef1f4721cec48edf2a230317a1adaf9b3314586f5a2e8cb840e08f52cdc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sv-SE/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/sv-SE/firefox-66.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "55e4fde42ee9b1bfbcf223d8e277101569e914d3e36f74c2dc003a22f1b7f36920a4e7cbb146ee72f6ec4edd90d6e0cf159bd74bd4725232b7e8fb61e9e838f2"; + sha512 = "1027ee7d4454466a7c4b378e8b0410de2059fa166797efedd16f9c71f38f536f2a70a1a32296f0dc2bf71c1710f59379d967e841eae9bf7a6eff5a66e0616f15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ta/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ta/firefox-66.0.3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "f4c00470d6bf3adbe864655b87bc40bbe018cd132204bebad3273f5454966540f724cd135fa53adc432c27fc5876245ba5cf0b9fca1887ee37ab572b7a74cb36"; + sha512 = "000303c245dadd0f7d36477d645215d7f8623e693217182e378ecad059ceabf7f5b9d0f8aaf303417c90fb75d4c0c61de0c75e616c90d68ce74d4564aeba0eda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/te/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/te/firefox-66.0.3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "eae9d861788975ebd216d3775273c51dbbb6bfae08eda8bf883609950b1d28de38cb3cc16b48f3f93b15065e2c9b69b882077786398b4ef0794442a3a9377045"; + sha512 = "d720d75fe3f5fee87cb65dc3df64960699bd6b879ec79e94de06a3426481487f44b3b7cc2a727d1110c8de104e3b52efaeda44a942b986add3a9cee293092d01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/th/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/th/firefox-66.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f25178b67d23a6e04b1719c4553eb30bf6e2563c46ccfc42470d1127c59e4740bfb08589c7a2c034efb37d5b7962d10784ea9a131e265706959dfbf02ccb736d"; + sha512 = "27cfa6611d57bb57d5e1529853c02623ecc6636ef800b7b9854b22495e15e2501a7b4ac6ff0bba0312eea64b1a2cdf7ebcbb2061617253f0f9c012c7ae8f336e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/tr/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/tr/firefox-66.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "9e57dc0338fc84eda2f5aaf4d14e185af061b853e81163b6ee4002e9a7b1dfbd3025d04073d7981e9983de5e27f81e4db3b23397e5083999d3972c02d1fac06f"; + sha512 = "b562ea3e73aeb0d12d14ece571d44a3f86bbe36b7cff9d731918c851c666c1469228c6912d1bf3a740baabd51199cce3ff9a5c246394ed5866c63e90c4984b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/uk/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/uk/firefox-66.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7658f8a0a3679f1c1575d89aee699cbac41c5c922ace6cc9addffd0cefb5c0e6acd8b12797cf07ab1d75a08c8f3ed179af433ef2c18a9751982fba307340b963"; + sha512 = "b0183271adf9c4fdb94a5c936d995ef749125e7031de80fad8d92048e8e260068ebc2dc5fa70ad05940bdccfa78b7ea64f067cd5c367232fe8b43c78f1dfe556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ur/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/ur/firefox-66.0.3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "499b74fe1d42e0680c89b9eb2c4ae6cfecbae6a301f531fd9a858a8cff181dc9bf36e879149aa503159dfbf292a8a75c0b62bad75bb196a5b8fb8c10e62f51ff"; + sha512 = "497e3c0eab42a1fe8b09182f27f7b17b0dd4e776a60d176bb332eab2b38ef5ea697fbad688e34c182e07a8965a8f8be13dfd212609776a30e7aa4419a755eb30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/uz/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/uz/firefox-66.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "84eb5a78e66afd9c64ebcd419eaa4272a699a1a0394cb4d45f148b149bbddd6e0d827f62b353d50b09dd0ef6c111278eb7947bd1bebe38dd0da0b6522c9221b1"; + sha512 = "b0ca42a5af823f144292bb46191f37dc7abf485c4e5207fc50d6bd1277caf1ef3ac39f15430ee060ad7114d3d9f8d56ca2157729aee5384ab82a2352b97d4769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/vi/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/vi/firefox-66.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "cd8ec1c51ebf079aeed69f5875549727851f3999a26d75ef4e6b15f70b4a746f8dbe29f2527e37c4b3b4ad2d83972ebb7e4781b4d9304e6d09939684bf13a23d"; + sha512 = "b6cf7e2d0064b9828e4e030213ee7288749f0ebdc3abb5f480f36e4b13d5d2dbbba3470cc4e6add622fb7198ad99a802081b01dc916247584e728fb8845d20dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xh/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/xh/firefox-66.0.3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "abfa5c22d001e5f8298b29b53f6864f7ab2745ae474b113fb5ec6fcb3ea2dc27b1c98abfd0e55bc9c0fc0e43be55a362264ee6f7ad2938dc846826ba6e4ab516"; + sha512 = "97c5596455e0ca0cdf24c14c5232da07196b20c52ee860bd2a9cccbbfe2a3a68a781c1efb8ba1a7ed6a840c60493c1a3e0cbacd68e03d2f914445e1dccbed9d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/zh-CN/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/zh-CN/firefox-66.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c9e536e63d06f8a1a94d881008ad5d645cb56fd3acd40ec473ee0f0ddc1957ac567fad96057d27ad00000ac40da06c12f8422f743f37bb9a51ba56de214c13ca"; + sha512 = "298d2c45324c9bae65a1859683120e7b13253e289f8471cde434d3927ad33f0a7cf6ec8c54a3e8254eeb02203551f73db0a331407306f2e8baa889971fe10268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/zh-TW/firefox-66.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.3/linux-i686/zh-TW/firefox-66.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a47432a5f5c7e39ff66c2c832161f3105dea259d15a9151ffee8fec04fad3a6760ee06bd4828f7e361d78a1bf08163f17014e3389936ec60f1babe764d263371"; + sha512 = "debd419335edd694ad7fa7f3faf6a2b75e5470ba2ba2777cc6a54d8213d8a4914af113b7670267b9a7de6267c475c3ef9bcaaa2feb596aab728aa6ac68559d2d"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 76e80e517e9e..823bb44870bb 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,10 +8,10 @@ , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper -, hunspell, libevent, libstartup_notification, libvpx +, hunspell, libXdamage, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages -, rust-cbindgen, nodejs, nasm +, rust-cbindgen, nodejs, nasm, fetchpatch , debugBuild ? false ### optionals @@ -30,11 +30,13 @@ , privacySupport ? isTorBrowserLike || isIceCatLike # WARNING: NEVER set any of the options below to `true` by default. -# Set to `privacySupport` or `false`. +# Set to `!privacySupport` or `false`. -# webrtcSupport breaks the aarch64 build on version >= 60. +# webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63. # https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 -, webrtcSupport ? (if lib.versionAtLeast ffversion "60" && stdenv.isAarch64 then false else !privacySupport) +, webrtcSupport ? !privacySupport && (!stdenv.isAarch64 || !( + lib.versionAtLeast ffversion "60" && lib.versionOlder ffversion "63" + )) , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , crashreporterSupport ? false @@ -92,6 +94,15 @@ let browserPatches = [ ./env_var_for_system_dir.patch + ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66") [ + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; + sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch"; + sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp"; + }) ] ++ patches; in @@ -120,6 +131,7 @@ stdenv.mkDerivation rec { icu libpng jemalloc glib ] ++ lib.optionals (!isTorBrowserLike) [ nspr nss ] + ++ lib.optional (lib.versionOlder ffversion "53") libXdamage ++ lib.optional (lib.versionOlder ffversion "61") hunspell # >= 66 requires nasm for the AV1 lib dav1d diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index c985cd8bf29e..a00ea14f16f8 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,13 +1,26 @@ -{ lib, callPackage, fetchurl, fetchFromGitHub, firefoxCommon, python3 }: +{ lib, callPackage, fetchurl, fetchFromGitHub, firefoxCommon, python3 +, overrideCC, gccStdenv, gcc6 +}: + +let + + # Needed on older branches since rustc: 1.32.0 -> 1.33.0 + missing-documentation-patch = fetchurl { + name = "missing-documentation.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch" + + "?h=firefox-esr&id=03bdd01f9cf"; + sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb"; + }; +in rec { firefox = firefoxCommon rec { pname = "firefox"; - ffversion = "66.0.2"; + ffversion = "66.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1dzqzigrwb7q75zlyd74ncic3b39yvziccpgbzh7881lzshj7x6f2r6ssj8ssdkh8lm2ckhjzbn6pf44vlh8ciql9bxb8g8sjpg6ii2"; + sha512 = "31pfzgys4dv4fskaasz47fviksjj9xp60r875q0i7z1n6kx25fzkpsg18a98fkqm3g8qmljccy93w68ysywnh1zzrv8djsaza7l0mz8"; }; patches = [ @@ -34,7 +47,7 @@ rec { # the web, there are many old useful plugins targeting offline # activities (e.g. ebook readers, syncronous translation, etc) that # will probably never be ported to WebExtensions API. - firefox-esr-52 = firefoxCommon rec { + firefox-esr-52 = (firefoxCommon rec { pname = "firefox-esr"; ffversion = "52.9.0esr"; src = fetchurl { @@ -52,6 +65,9 @@ rec { description = "A web browser built from Firefox Extended Support Release source tree"; knownVulnerabilities = [ "Support ended in August 2018." ]; }; + }).override { + stdenv = overrideCC gccStdenv gcc6; # gcc7 fails with "undefined reference to `__divmoddi4'" + gtk3Support = false; }; firefox-esr-60 = firefoxCommon rec { @@ -68,6 +84,8 @@ rec { # this one is actually an omnipresent bug # https://bugzilla.mozilla.org/show_bug.cgi?id=1444519 ./fix-pa-context-connect-retval.patch + + missing-documentation-patch ]; meta = firefox.meta // { @@ -156,6 +174,7 @@ in rec { patches = [ ./no-buildconfig.patch + missing-documentation-patch ]; }; @@ -260,6 +279,10 @@ in rec { rev = "dda14213c550afc522ef0bb0bb1643289c298736"; sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz"; }; + + patches = [ + missing-documentation-patch + ]; }; tor-browser = tor-browser-8-0; diff --git a/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix index 62be8bbc1d61..59ba69c1c4da 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.18"; + version = "2.19"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "0mwhh61klicn2vwk39nc7y4cw4mygzdi2nljn4r0gjbw6jmw3337"; + sha256 = "02ls11c02p7xvsdjyb43rrzr850i1yly003r812z0w5vv5yqqxbh"; }; buildInputs = with stdenv.lib; diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index aa571d175347..417bdf60b128 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "32.0.0.156"; + version = "32.0.0.171"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0h16vdar4p8zj6w57ihll71xjr9sy7hdiq4qwvvqndah5c4ym8xl" + "0dl2kxsn4wh3243qkwyq13ikbmz6ljg95a1v02cylz36kpfl51iv" else - "06l59zid6n4b606254r937cvk95pyymlczadh4cpl6l4xncspdy6" + "1v9imcyml55qlvp0cibi5r5kl0rcivzvmnqgw8ph3xjm1yrxw3fr" else if arch == "x86_64" then - "0b3qssn1fgm2v715l6nksqmwly7j9asgqh9yqjhpp7jsb84bvzk4" + "1f3nl4qkws16q2yw940vvb0zmmwxks1blm4ida65hlda6f9zfq3h" else - "03qdwrlvs4090s9b9fn2l6g3wsbi6q81jf59s1s5gh7qhi4i0lhy"; + "0df9nbxyn4wl4ap333mgnnmy994xj7i5hz07sw83pszlz3pjkc0m"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 0da07f2d2bef..cfee25bf3f80 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "32.0.0.156"; + version = "32.0.0.171"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0fzs2x8yxpykkza1r3yn17hmrdz51c7qigbm5qifvw59q9zl15i9" + "0z4fkqbq1s63lpzfkyxllwx2wpizbabr4zim1dn7n59ld75vjxq8" else - "11733155aznijwhnc5wv0v6wmw9g1akbqwl07kx3lam571s8aywr"; + "0nvgcdmgvgbj6axrh0yzkk437bxwsaxl0mvfkcyyz1hxnq51dvvg"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 07a389af8d61..599a0a20d7d7 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://www.opera.com; + homepage = https://www.opera.com; description = "Web browser"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.unfree; diff --git a/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix b/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix index 9a47e18fad12..b7118b49dae6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/otter/default.nix @@ -1,5 +1,5 @@ { stdenv, cmake, fetchFromGitHub -, qtbase, qtmultimedia, qtwebengine +, qtbase, qtmultimedia, qtwebengine, qtxmlpatterns , version ? "1.0.01" , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb" }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qtmultimedia qtwebengine ]; + buildInputs = [ qtbase qtmultimedia qtwebengine qtxmlpatterns ]; meta = with stdenv.lib; { homepage = https://otter-browser.org; diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 9537f1365bd1..85751e526fae 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.3.1440.60-1"; + version = "2.4.1488.40-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "1vw4lyqs87cw7v1jy3dcsgnb56s61zl21q95a3kiavqw7412sips"; + sha256 = "0w084mamy72v1kkfgg8nn2q3hmfj7v216kkvqb52f1nyycqqzb37"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh index 0b1787176399..fc04137a9b02 100755 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -1,22 +1,22 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p libarchive curl common-updater-scripts -set -eu -o pipefail +set -xeu -o pipefail cd "$(dirname "${BASH_SOURCE[0]}")" root=../../../../.. export NIXPKGS_ALLOW_UNFREE=1 version() { - (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"') + (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"') } vivaldi_version_old=$(version vivaldi) vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p') if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then - echo "nothing to do, vivaldi $vivaldi_version is current" - exit + echo "vivaldi is already up-to-date" + exit fi # Download vivaldi and save hash and file path. @@ -25,15 +25,22 @@ mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") hash=${prefetch[0]} path=${prefetch[1]} -echo "vivaldi: $vivaldi_version_old -> $vivaldi_version" -echo "$path" +nixpkgs="$(git rev-parse --show-toplevel)" +default_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix" +ffmpeg_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix" + (cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash") +git add "${default_nix}" +git commit -m "vivaldi: ${vivaldi_version_old} -> ${vivaldi_version}" + # Check vivaldi-ffmpeg-codecs version. chromium_version_old=$(version vivaldi-ffmpeg-codecs) chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep '^[0-9]\{2,\}\.[0-9]\+\.[0-9]\{4,\}\+\.[0-9]\+$') if [[ "$chromium_version" != "$chromium_version_old" ]]; then - echo "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version" - (cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version") + (cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version") + + git add "${ffmpeg_nix}" + git commit -m "vivaldi-ffmepg-codecs: $chromium_version_old -> $chromium_version" fi diff --git a/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix b/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix index c1fa364a2d23..136c14d34d48 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix @@ -25,13 +25,14 @@ let ''; }; in stdenv.mkDerivation rec { - name = "w3m-0.5.3+git20180125"; + pname = "w3m"; + version = "0.5.3+git20190105"; src = fetchFromGitHub { owner = "tats"; - repo = "w3m"; - rev = "v0.5.3+git20180125"; - sha256 = "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90"; + repo = pname; + rev = "v${version}"; + sha256 = "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i"; }; NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl"; diff --git a/nixpkgs/pkgs/applications/networking/charles/default.nix b/nixpkgs/pkgs/applications/networking/charles/default.nix index 98d4e25ef872..e8d732cf6178 100644 --- a/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/nixpkgs/pkgs/applications/networking/charles/default.nix @@ -57,8 +57,8 @@ let in rec { charles4 = (generic { - version = "4.2.7"; - sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd"; + version = "4.2.8"; + sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080"; }); charles3 = (generic { version = "3.12.3"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index 6d50c598de7f..fdefa48adbaf 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cni-plugins-${version}"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; + sha256 = "1kfi0iz2hs4rq3cdkw12j8d47ac4f5vrpzcwcrs2yzmh2j4n5sz5"; }; buildInputs = [ removeReferencesTo go ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix index 9e991b25fc24..d1e24c56f8ad 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kubetail-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = "${version}"; - sha256 = "159162dazcr0gsq9mkwb7sf4psqq5iqqgavy2mc8qnpswdlq3pfc"; + sha256 = "15f97bzw0vha4nrl9207l7w9mlnx58xlcnmpfjvbpm7x0ivb5l0q"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/dropbox/cli.nix b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix index f09f685ea739..73977b82047c 100644 --- a/nixpkgs/pkgs/applications/networking/dropbox/cli.nix +++ b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchurl, python, dropbox }: +{ stdenv, pkgconfig, fetchurl, python3, dropbox }: let version = "2019.02.14"; dropboxd = "${dropbox}/bin/dropbox"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python ]; + buildInputs = [ python3 ]; phases = "unpackPhase installPhase"; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index 297703cde696..a43d52d73597 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "rssguard"; - version = "3.5.6"; + version = "3.5.7"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "1pdas7hg3nzykm3qi951fk25c9s6gjb7my82b9xzjn2yd7ks71by"; + sha256 = "1v0m2p6y7szdqbd2gl3972ah6cp6prfv2gp2a55ac1l8ba2dma4v"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix index 464722612c7d..cda455d9e56e 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,16 +1,16 @@ { callPackage, stdenv }: let - stableVersion = "2.1.15"; - previewVersion = "2.2.0a3"; + stableVersion = "2.1.16"; + previewVersion = "2.2.0a5"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "116wigkh5kwna00q200yv2wm8dpi4kmsns96iglzwrrl19fk538p"; - serverSrcHash = "1mqwydxn58v5ddpnsxvf6vgqwhrfm3mwjwf030lv83zmcjhx237q"; + guiSrcHash = "03d7yjdnks568njkrgyh7g6c3vf6v7wkifshz2bcvry79pp2h4nl"; + serverSrcHash = "0p331aaqxw16kk5l2074qn9a7ih6fkivm05n8da3fwydzp9hjmcp"; in { guiStable = mkGui { stable = true; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "110mghkhanz92p8vfzyh4199mnihb24smxsc44a8v534ds6hww74"; + sha256Hash = "0p4g5hszys68ijzsi2rb89j1rpg04wlqlzzrl92npvqqf2i0jdf8"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "104pvrba7n9gp7mx31xg520cfahcy0vsmbzx23007c50kp0nxc56"; + sha256Hash = "1yvdfczi8ah9m7b49l7larfs678hh7c424i1f73kivfds6211bj5"; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 42888da842c7..3cb254122d78 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; description = "An extensible Twitter client"; homepage = https://mikutter.hachune.net; platforms = ruby.meta.platforms; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 12348fe548c7..8b6863384b3f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -62,7 +62,7 @@ let unwrapped = stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/pidgin \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index cb3c90923747..ee6a40e58605 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.0.4", + "version": "1.0.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index 25cc694afcfd..b84807c69a04 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -3,1143 +3,1143 @@ packages = [ { - name = "node-9.6.45.tgz"; + name = "_types_node___node_9.6.45.tgz"; path = fetchurl { - name = "node-9.6.45.tgz"; + name = "_types_node___node_9.6.45.tgz"; url = "https://registry.yarnpkg.com/@types/node/-/node-9.6.45.tgz"; sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e"; }; } { - name = "ajv-6.10.0.tgz"; + name = "ajv___ajv_6.10.0.tgz"; path = fetchurl { - name = "ajv-6.10.0.tgz"; + name = "ajv___ajv_6.10.0.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz"; sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1"; }; } { - name = "applescript-1.0.0.tgz"; + name = "applescript___applescript_1.0.0.tgz"; path = fetchurl { - name = "applescript-1.0.0.tgz"; + name = "applescript___applescript_1.0.0.tgz"; url = "https://registry.yarnpkg.com/applescript/-/applescript-1.0.0.tgz"; sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317"; }; } { - name = "asn1-0.2.4.tgz"; + name = "asn1___asn1_0.2.4.tgz"; path = fetchurl { - name = "asn1-0.2.4.tgz"; + name = "asn1___asn1_0.2.4.tgz"; url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; }; } { - name = "assert-plus-1.0.0.tgz"; + name = "assert_plus___assert_plus_1.0.0.tgz"; path = fetchurl { - name = "assert-plus-1.0.0.tgz"; + 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 = "asynckit-0.4.0.tgz"; + name = "asynckit___asynckit_0.4.0.tgz"; path = fetchurl { - name = "asynckit-0.4.0.tgz"; + name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; } { - name = "auto-launch-5.0.5.tgz"; + name = "auto_launch___auto_launch_5.0.5.tgz"; path = fetchurl { - name = "auto-launch-5.0.5.tgz"; + name = "auto_launch___auto_launch_5.0.5.tgz"; url = "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.5.tgz"; sha1 = "d14bd002b1ef642f85e991a6195ff5300c8ad3c0"; }; } { - name = "aws-sign2-0.7.0.tgz"; + name = "aws_sign2___aws_sign2_0.7.0.tgz"; path = fetchurl { - name = "aws-sign2-0.7.0.tgz"; + 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-1.8.0.tgz"; + name = "aws4___aws4_1.8.0.tgz"; path = fetchurl { - name = "aws4-1.8.0.tgz"; + name = "aws4___aws4_1.8.0.tgz"; url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; }; } { - name = "bcrypt-pbkdf-1.0.2.tgz"; + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; path = fetchurl { - name = "bcrypt-pbkdf-1.0.2.tgz"; + 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 = "bignumber.js-2.4.0.tgz"; + name = "bignumber.js___bignumber.js_2.4.0.tgz"; path = fetchurl { - name = "bignumber.js-2.4.0.tgz"; + name = "bignumber.js___bignumber.js_2.4.0.tgz"; url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz"; sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; }; } { - name = "bmp-js-0.0.3.tgz"; + name = "bmp_js___bmp_js_0.0.3.tgz"; path = fetchurl { - name = "bmp-js-0.0.3.tgz"; + name = "bmp_js___bmp_js_0.0.3.tgz"; url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.0.3.tgz"; sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a"; }; } { - name = "buffer-equal-0.0.1.tgz"; + name = "buffer_equal___buffer_equal_0.0.1.tgz"; path = fetchurl { - name = "buffer-equal-0.0.1.tgz"; + name = "buffer_equal___buffer_equal_0.0.1.tgz"; url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz"; sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; }; } { - name = "caseless-0.12.0.tgz"; + name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { - name = "caseless-0.12.0.tgz"; + name = "caseless___caseless_0.12.0.tgz"; url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; } { - name = "combined-stream-1.0.7.tgz"; + name = "combined_stream___combined_stream_1.0.7.tgz"; path = fetchurl { - name = "combined-stream-1.0.7.tgz"; + name = "combined_stream___combined_stream_1.0.7.tgz"; url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz"; sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; }; } { - name = "conf-2.2.0.tgz"; + name = "conf___conf_2.2.0.tgz"; path = fetchurl { - name = "conf-2.2.0.tgz"; + name = "conf___conf_2.2.0.tgz"; url = "https://registry.yarnpkg.com/conf/-/conf-2.2.0.tgz"; sha1 = "ee282efafc1450b61e205372041ad7d866802d9a"; }; } { - name = "core-util-is-1.0.2.tgz"; + name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { - name = "core-util-is-1.0.2.tgz"; + 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 = "dashdash-1.14.1.tgz"; + name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { - name = "dashdash-1.14.1.tgz"; + name = "dashdash___dashdash_1.14.1.tgz"; url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; } { - name = "deep-equal-1.0.1.tgz"; + name = "deep_equal___deep_equal_1.0.1.tgz"; path = fetchurl { - name = "deep-equal-1.0.1.tgz"; + name = "deep_equal___deep_equal_1.0.1.tgz"; url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz"; sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; }; } { - name = "define-properties-1.1.3.tgz"; + name = "define_properties___define_properties_1.1.3.tgz"; path = fetchurl { - name = "define-properties-1.1.3.tgz"; + name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; }; } { - name = "delayed-stream-1.0.0.tgz"; + name = "delayed_stream___delayed_stream_1.0.0.tgz"; path = fetchurl { - name = "delayed-stream-1.0.0.tgz"; + 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 = "dom-walk-0.1.1.tgz"; + name = "dom_walk___dom_walk_0.1.1.tgz"; path = fetchurl { - name = "dom-walk-0.1.1.tgz"; + name = "dom_walk___dom_walk_0.1.1.tgz"; url = "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz"; sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; } { - name = "dot-prop-4.2.0.tgz"; + name = "dot_prop___dot_prop_4.2.0.tgz"; path = fetchurl { - name = "dot-prop-4.2.0.tgz"; + name = "dot_prop___dot_prop_4.2.0.tgz"; url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz"; sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; } { - name = "ecc-jsbn-0.1.2.tgz"; + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; path = fetchurl { - name = "ecc-jsbn-0.1.2.tgz"; + 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 = "electron-store-2.0.0.tgz"; + name = "electron_store___electron_store_2.0.0.tgz"; path = fetchurl { - name = "electron-store-2.0.0.tgz"; + name = "electron_store___electron_store_2.0.0.tgz"; url = "https://registry.yarnpkg.com/electron-store/-/electron-store-2.0.0.tgz"; sha1 = "1035cca2a95409d1f54c7466606345852450d64a"; }; } { - name = "electron-window-state-4.1.1.tgz"; + name = "electron_window_state___electron_window_state_4.1.1.tgz"; path = fetchurl { - name = "electron-window-state-4.1.1.tgz"; + name = "electron_window_state___electron_window_state_4.1.1.tgz"; url = "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-4.1.1.tgz"; sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"; }; } { - name = "env-paths-1.0.0.tgz"; + name = "env_paths___env_paths_1.0.0.tgz"; path = fetchurl { - name = "env-paths-1.0.0.tgz"; + name = "env_paths___env_paths_1.0.0.tgz"; url = "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz"; sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; }; } { - name = "es-abstract-1.13.0.tgz"; + name = "es_abstract___es_abstract_1.13.0.tgz"; path = fetchurl { - name = "es-abstract-1.13.0.tgz"; + name = "es_abstract___es_abstract_1.13.0.tgz"; url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz"; sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; }; } { - name = "es-to-primitive-1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; path = fetchurl { - name = "es-to-primitive-1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; }; } { - name = "es6-promise-3.3.1.tgz"; + name = "es6_promise___es6_promise_3.3.1.tgz"; path = fetchurl { - name = "es6-promise-3.3.1.tgz"; + name = "es6_promise___es6_promise_3.3.1.tgz"; url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz"; sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; } { - name = "exif-parser-0.1.12.tgz"; + name = "exif_parser___exif_parser_0.1.12.tgz"; path = fetchurl { - name = "exif-parser-0.1.12.tgz"; + name = "exif_parser___exif_parser_0.1.12.tgz"; url = "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz"; sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; }; } { - name = "extend-3.0.2.tgz"; + name = "extend___extend_3.0.2.tgz"; path = fetchurl { - name = "extend-3.0.2.tgz"; + name = "extend___extend_3.0.2.tgz"; url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } { - name = "extsprintf-1.3.0.tgz"; + name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { - name = "extsprintf-1.3.0.tgz"; + name = "extsprintf___extsprintf_1.3.0.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; } { - name = "extsprintf-1.4.0.tgz"; + name = "extsprintf___extsprintf_1.4.0.tgz"; path = fetchurl { - name = "extsprintf-1.4.0.tgz"; + name = "extsprintf___extsprintf_1.4.0.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; }; } { - name = "fast-deep-equal-2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; path = fetchurl { - name = "fast-deep-equal-2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; } { - name = "fast-json-stable-stringify-2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; path = fetchurl { - name = "fast-json-stable-stringify-2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; } { - name = "file-type-3.9.0.tgz"; + name = "file_type___file_type_3.9.0.tgz"; path = fetchurl { - name = "file-type-3.9.0.tgz"; + name = "file_type___file_type_3.9.0.tgz"; url = "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz"; sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; } { - name = "find-up-2.1.0.tgz"; + name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { - name = "find-up-2.1.0.tgz"; + name = "find_up___find_up_2.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; }; } { - name = "for-each-0.3.3.tgz"; + name = "for_each___for_each_0.3.3.tgz"; path = fetchurl { - name = "for-each-0.3.3.tgz"; + name = "for_each___for_each_0.3.3.tgz"; url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; }; } { - name = "forever-agent-0.6.1.tgz"; + name = "forever_agent___forever_agent_0.6.1.tgz"; path = fetchurl { - name = "forever-agent-0.6.1.tgz"; + 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-2.3.3.tgz"; + name = "form_data___form_data_2.3.3.tgz"; path = fetchurl { - name = "form-data-2.3.3.tgz"; + 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 = "function-bind-1.1.1.tgz"; + name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { - name = "function-bind-1.1.1.tgz"; + name = "function_bind___function_bind_1.1.1.tgz"; url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; }; } { - name = "getpass-0.1.7.tgz"; + name = "getpass___getpass_0.1.7.tgz"; path = fetchurl { - name = "getpass-0.1.7.tgz"; + name = "getpass___getpass_0.1.7.tgz"; url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; } { - name = "global-4.3.2.tgz"; + name = "global___global_4.3.2.tgz"; path = fetchurl { - name = "global-4.3.2.tgz"; + name = "global___global_4.3.2.tgz"; url = "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz"; sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; } { - name = "graceful-fs-4.1.15.tgz"; + name = "graceful_fs___graceful_fs_4.1.15.tgz"; path = fetchurl { - name = "graceful-fs-4.1.15.tgz"; + name = "graceful_fs___graceful_fs_4.1.15.tgz"; url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz"; sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; }; } { - name = "har-schema-2.0.0.tgz"; + name = "har_schema___har_schema_2.0.0.tgz"; path = fetchurl { - name = "har-schema-2.0.0.tgz"; + 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-5.1.3.tgz"; + name = "har_validator___har_validator_5.1.3.tgz"; path = fetchurl { - name = "har-validator-5.1.3.tgz"; + 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-symbols-1.0.0.tgz"; + name = "has_symbols___has_symbols_1.0.0.tgz"; path = fetchurl { - name = "has-symbols-1.0.0.tgz"; + name = "has_symbols___has_symbols_1.0.0.tgz"; url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; } { - name = "has-1.0.3.tgz"; + name = "has___has_1.0.3.tgz"; path = fetchurl { - name = "has-1.0.3.tgz"; + name = "has___has_1.0.3.tgz"; url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; }; } { - name = "http-signature-1.2.0.tgz"; + name = "http_signature___http_signature_1.2.0.tgz"; path = fetchurl { - name = "http-signature-1.2.0.tgz"; + 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 = "imurmurhash-0.1.4.tgz"; + name = "imurmurhash___imurmurhash_0.1.4.tgz"; path = fetchurl { - name = "imurmurhash-0.1.4.tgz"; + name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } { - name = "ip-regex-1.0.3.tgz"; + name = "ip_regex___ip_regex_1.0.3.tgz"; path = fetchurl { - name = "ip-regex-1.0.3.tgz"; + name = "ip_regex___ip_regex_1.0.3.tgz"; url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz"; sha1 = "dc589076f659f419c222039a33316f1c7387effd"; }; } { - name = "is-callable-1.1.4.tgz"; + name = "is_callable___is_callable_1.1.4.tgz"; path = fetchurl { - name = "is-callable-1.1.4.tgz"; + name = "is_callable___is_callable_1.1.4.tgz"; url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; }; } { - name = "is-date-object-1.0.1.tgz"; + name = "is_date_object___is_date_object_1.0.1.tgz"; path = fetchurl { - name = "is-date-object-1.0.1.tgz"; + name = "is_date_object___is_date_object_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; } { - name = "is-function-1.0.1.tgz"; + name = "is_function___is_function_1.0.1.tgz"; path = fetchurl { - name = "is-function-1.0.1.tgz"; + name = "is_function___is_function_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz"; sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; }; } { - name = "is-obj-1.0.1.tgz"; + name = "is_obj___is_obj_1.0.1.tgz"; path = fetchurl { - name = "is-obj-1.0.1.tgz"; + 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-regex-1.0.4.tgz"; + name = "is_regex___is_regex_1.0.4.tgz"; path = fetchurl { - name = "is-regex-1.0.4.tgz"; + name = "is_regex___is_regex_1.0.4.tgz"; url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; } { - name = "is-symbol-1.0.2.tgz"; + name = "is_symbol___is_symbol_1.0.2.tgz"; path = fetchurl { - name = "is-symbol-1.0.2.tgz"; + name = "is_symbol___is_symbol_1.0.2.tgz"; url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; }; } { - name = "is-typedarray-1.0.0.tgz"; + name = "is_typedarray___is_typedarray_1.0.0.tgz"; path = fetchurl { - name = "is-typedarray-1.0.0.tgz"; + 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 = "isstream-0.1.2.tgz"; + name = "isstream___isstream_0.1.2.tgz"; path = fetchurl { - name = "isstream-0.1.2.tgz"; + name = "isstream___isstream_0.1.2.tgz"; url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; } { - name = "jimp-0.2.28.tgz"; + name = "jimp___jimp_0.2.28.tgz"; path = fetchurl { - name = "jimp-0.2.28.tgz"; + name = "jimp___jimp_0.2.28.tgz"; url = "https://registry.yarnpkg.com/jimp/-/jimp-0.2.28.tgz"; sha1 = "dd529a937190f42957a7937d1acc3a7762996ea2"; }; } { - name = "jpeg-js-0.2.0.tgz"; + name = "jpeg_js___jpeg_js_0.2.0.tgz"; path = fetchurl { - name = "jpeg-js-0.2.0.tgz"; + name = "jpeg_js___jpeg_js_0.2.0.tgz"; url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.2.0.tgz"; sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482"; }; } { - name = "jsbn-0.1.1.tgz"; + name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { - name = "jsbn-0.1.1.tgz"; + name = "jsbn___jsbn_0.1.1.tgz"; url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; } { - name = "json-schema-traverse-0.4.1.tgz"; + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { - name = "json-schema-traverse-0.4.1.tgz"; + 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-0.2.3.tgz"; + name = "json_schema___json_schema_0.2.3.tgz"; path = fetchurl { - name = "json-schema-0.2.3.tgz"; + 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-5.0.1.tgz"; + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; path = fetchurl { - name = "json-stringify-safe-5.0.1.tgz"; + 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-2.4.0.tgz"; + name = "jsonfile___jsonfile_2.4.0.tgz"; path = fetchurl { - name = "jsonfile-2.4.0.tgz"; + name = "jsonfile___jsonfile_2.4.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz"; sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; } { - name = "jsprim-1.4.1.tgz"; + name = "jsprim___jsprim_1.4.1.tgz"; path = fetchurl { - name = "jsprim-1.4.1.tgz"; + name = "jsprim___jsprim_1.4.1.tgz"; url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; } { - name = "load-bmfont-1.4.0.tgz"; + name = "load_bmfont___load_bmfont_1.4.0.tgz"; path = fetchurl { - name = "load-bmfont-1.4.0.tgz"; + name = "load_bmfont___load_bmfont_1.4.0.tgz"; url = "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.0.tgz"; sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"; }; } { - name = "locate-path-2.0.0.tgz"; + name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { - name = "locate-path-2.0.0.tgz"; + name = "locate_path___locate_path_2.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; }; } { - name = "make-dir-1.3.0.tgz"; + name = "make_dir___make_dir_1.3.0.tgz"; path = fetchurl { - name = "make-dir-1.3.0.tgz"; + name = "make_dir___make_dir_1.3.0.tgz"; url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; }; } { - name = "mime-db-1.38.0.tgz"; + name = "mime_db___mime_db_1.38.0.tgz"; path = fetchurl { - name = "mime-db-1.38.0.tgz"; + name = "mime_db___mime_db_1.38.0.tgz"; url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz"; sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"; }; } { - name = "mime-types-2.1.22.tgz"; + name = "mime_types___mime_types_2.1.22.tgz"; path = fetchurl { - name = "mime-types-2.1.22.tgz"; + name = "mime_types___mime_types_2.1.22.tgz"; url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz"; sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd"; }; } { - name = "mime-1.6.0.tgz"; + name = "mime___mime_1.6.0.tgz"; path = fetchurl { - name = "mime-1.6.0.tgz"; + name = "mime___mime_1.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; }; } { - name = "min-document-2.19.0.tgz"; + name = "min_document___min_document_2.19.0.tgz"; path = fetchurl { - name = "min-document-2.19.0.tgz"; + name = "min_document___min_document_2.19.0.tgz"; url = "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz"; sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; } { - name = "minimist-0.0.8.tgz"; + name = "minimist___minimist_0.0.8.tgz"; path = fetchurl { - name = "minimist-0.0.8.tgz"; + name = "minimist___minimist_0.0.8.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; } { - name = "minimist-1.2.0.tgz"; + name = "minimist___minimist_1.2.0.tgz"; path = fetchurl { - name = "minimist-1.2.0.tgz"; + name = "minimist___minimist_1.2.0.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; } { - name = "mkdirp-0.5.1.tgz"; + name = "mkdirp___mkdirp_0.5.1.tgz"; path = fetchurl { - name = "mkdirp-0.5.1.tgz"; + name = "mkdirp___mkdirp_0.5.1.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; } { - name = "oauth-sign-0.9.0.tgz"; + name = "oauth_sign___oauth_sign_0.9.0.tgz"; path = fetchurl { - name = "oauth-sign-0.9.0.tgz"; + 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-keys-1.1.0.tgz"; + name = "object_keys___object_keys_1.1.0.tgz"; path = fetchurl { - name = "object-keys-1.1.0.tgz"; + name = "object_keys___object_keys_1.1.0.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz"; sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032"; }; } { - name = "p-limit-1.3.0.tgz"; + name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { - name = "p-limit-1.3.0.tgz"; + name = "p_limit___p_limit_1.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; }; } { - name = "p-locate-2.0.0.tgz"; + name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { - name = "p-locate-2.0.0.tgz"; + name = "p_locate___p_locate_2.0.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; }; } { - name = "p-try-1.0.0.tgz"; + name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { - name = "p-try-1.0.0.tgz"; + name = "p_try___p_try_1.0.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; } { - name = "parse-bmfont-ascii-1.0.6.tgz"; + name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; path = fetchurl { - name = "parse-bmfont-ascii-1.0.6.tgz"; + name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; url = "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"; sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285"; }; } { - name = "parse-bmfont-binary-1.0.6.tgz"; + name = "parse_bmfont_binary___parse_bmfont_binary_1.0.6.tgz"; path = fetchurl { - name = "parse-bmfont-binary-1.0.6.tgz"; + name = "parse_bmfont_binary___parse_bmfont_binary_1.0.6.tgz"; url = "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"; sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006"; }; } { - name = "parse-bmfont-xml-1.1.4.tgz"; + name = "parse_bmfont_xml___parse_bmfont_xml_1.1.4.tgz"; path = fetchurl { - name = "parse-bmfont-xml-1.1.4.tgz"; + name = "parse_bmfont_xml___parse_bmfont_xml_1.1.4.tgz"; url = "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"; sha1 = "015319797e3e12f9e739c4d513872cd2fa35f389"; }; } { - name = "parse-headers-2.0.2.tgz"; + name = "parse_headers___parse_headers_2.0.2.tgz"; path = fetchurl { - name = "parse-headers-2.0.2.tgz"; + name = "parse_headers___parse_headers_2.0.2.tgz"; url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.2.tgz"; sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34"; }; } { - name = "path-exists-3.0.0.tgz"; + name = "path_exists___path_exists_3.0.0.tgz"; path = fetchurl { - name = "path-exists-3.0.0.tgz"; + name = "path_exists___path_exists_3.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; } { - name = "path-is-absolute-1.0.1.tgz"; + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { - name = "path-is-absolute-1.0.1.tgz"; + 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 = "performance-now-2.1.0.tgz"; + name = "performance_now___performance_now_2.1.0.tgz"; path = fetchurl { - name = "performance-now-2.1.0.tgz"; + 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 = "phin-2.9.3.tgz"; + name = "phin___phin_2.9.3.tgz"; path = fetchurl { - name = "phin-2.9.3.tgz"; + name = "phin___phin_2.9.3.tgz"; url = "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz"; sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c"; }; } { - name = "pify-3.0.0.tgz"; + name = "pify___pify_3.0.0.tgz"; path = fetchurl { - name = "pify-3.0.0.tgz"; + name = "pify___pify_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; } { - name = "pixelmatch-4.0.2.tgz"; + name = "pixelmatch___pixelmatch_4.0.2.tgz"; path = fetchurl { - name = "pixelmatch-4.0.2.tgz"; + name = "pixelmatch___pixelmatch_4.0.2.tgz"; url = "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz"; sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; }; } { - name = "pkg-up-2.0.0.tgz"; + name = "pkg_up___pkg_up_2.0.0.tgz"; path = fetchurl { - name = "pkg-up-2.0.0.tgz"; + name = "pkg_up___pkg_up_2.0.0.tgz"; url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; }; } { - name = "png-to-ico-1.0.7.tgz"; + name = "png_to_ico___png_to_ico_1.0.7.tgz"; path = fetchurl { - name = "png-to-ico-1.0.7.tgz"; + name = "png_to_ico___png_to_ico_1.0.7.tgz"; url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-1.0.7.tgz"; sha1 = "9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2"; }; } { - name = "pngjs-3.4.0.tgz"; + name = "pngjs___pngjs_3.4.0.tgz"; path = fetchurl { - name = "pngjs-3.4.0.tgz"; + name = "pngjs___pngjs_3.4.0.tgz"; url = "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz"; sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f"; }; } { - name = "process-0.5.2.tgz"; + name = "process___process_0.5.2.tgz"; path = fetchurl { - name = "process-0.5.2.tgz"; + name = "process___process_0.5.2.tgz"; url = "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz"; sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; }; } { - name = "psl-1.1.31.tgz"; + name = "psl___psl_1.1.31.tgz"; path = fetchurl { - name = "psl-1.1.31.tgz"; + name = "psl___psl_1.1.31.tgz"; url = "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz"; sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184"; }; } { - name = "punycode-1.4.1.tgz"; + name = "punycode___punycode_1.4.1.tgz"; path = fetchurl { - name = "punycode-1.4.1.tgz"; + name = "punycode___punycode_1.4.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; } { - name = "punycode-2.1.1.tgz"; + name = "punycode___punycode_2.1.1.tgz"; path = fetchurl { - name = "punycode-2.1.1.tgz"; + name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; }; } { - name = "qs-6.5.2.tgz"; + name = "qs___qs_6.5.2.tgz"; path = fetchurl { - name = "qs-6.5.2.tgz"; + name = "qs___qs_6.5.2.tgz"; url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; }; } { - name = "read-chunk-1.0.1.tgz"; + name = "read_chunk___read_chunk_1.0.1.tgz"; path = fetchurl { - name = "read-chunk-1.0.1.tgz"; + name = "read_chunk___read_chunk_1.0.1.tgz"; url = "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz"; sha1 = "5f68cab307e663f19993527d9b589cace4661194"; }; } { - name = "request-2.88.0.tgz"; + name = "request___request_2.88.0.tgz"; path = fetchurl { - name = "request-2.88.0.tgz"; + name = "request___request_2.88.0.tgz"; url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; }; } { - name = "safe-buffer-5.1.2.tgz"; + name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { - name = "safe-buffer-5.1.2.tgz"; + 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 = "safer-buffer-2.1.2.tgz"; + name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { - name = "safer-buffer-2.1.2.tgz"; + 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 = "sax-1.2.4.tgz"; + name = "sax___sax_1.2.4.tgz"; path = fetchurl { - name = "sax-1.2.4.tgz"; + name = "sax___sax_1.2.4.tgz"; url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; }; } { - name = "signal-exit-3.0.2.tgz"; + name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { - name = "signal-exit-3.0.2.tgz"; + 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 = "sshpk-1.16.1.tgz"; + name = "sshpk___sshpk_1.16.1.tgz"; path = fetchurl { - name = "sshpk-1.16.1.tgz"; + name = "sshpk___sshpk_1.16.1.tgz"; url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; }; } { - name = "stream-to-buffer-0.1.0.tgz"; + name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; path = fetchurl { - name = "stream-to-buffer-0.1.0.tgz"; + name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; url = "https://registry.yarnpkg.com/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz"; sha1 = "26799d903ab2025c9bd550ac47171b00f8dd80a9"; }; } { - name = "stream-to-0.2.2.tgz"; + name = "stream_to___stream_to_0.2.2.tgz"; path = fetchurl { - name = "stream-to-0.2.2.tgz"; + name = "stream_to___stream_to_0.2.2.tgz"; url = "https://registry.yarnpkg.com/stream-to/-/stream-to-0.2.2.tgz"; sha1 = "84306098d85fdb990b9fa300b1b3ccf55e8ef01d"; }; } { - name = "string.prototype.trim-1.1.2.tgz"; + name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz"; path = fetchurl { - name = "string.prototype.trim-1.1.2.tgz"; + name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; }; } { - name = "tinycolor2-1.4.1.tgz"; + name = "tinycolor2___tinycolor2_1.4.1.tgz"; path = fetchurl { - name = "tinycolor2-1.4.1.tgz"; + name = "tinycolor2___tinycolor2_1.4.1.tgz"; url = "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz"; sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"; }; } { - name = "tough-cookie-2.4.3.tgz"; + name = "tough_cookie___tough_cookie_2.4.3.tgz"; path = fetchurl { - name = "tough-cookie-2.4.3.tgz"; + name = "tough_cookie___tough_cookie_2.4.3.tgz"; url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; }; } { - name = "tunnel-agent-0.6.0.tgz"; + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { - name = "tunnel-agent-0.6.0.tgz"; + 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-0.14.5.tgz"; + name = "tweetnacl___tweetnacl_0.14.5.tgz"; path = fetchurl { - name = "tweetnacl-0.14.5.tgz"; + name = "tweetnacl___tweetnacl_0.14.5.tgz"; url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; } { - name = "untildify-3.0.3.tgz"; + name = "untildify___untildify_3.0.3.tgz"; path = fetchurl { - name = "untildify-3.0.3.tgz"; + name = "untildify___untildify_3.0.3.tgz"; url = "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz"; sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"; }; } { - name = "uri-js-4.2.2.tgz"; + name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { - name = "uri-js-4.2.2.tgz"; + 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-regex-3.2.0.tgz"; + name = "url_regex___url_regex_3.2.0.tgz"; path = fetchurl { - name = "url-regex-3.2.0.tgz"; + name = "url_regex___url_regex_3.2.0.tgz"; url = "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz"; sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; }; } { - name = "uuid-3.3.2.tgz"; + name = "uuid___uuid_3.3.2.tgz"; path = fetchurl { - name = "uuid-3.3.2.tgz"; + name = "uuid___uuid_3.3.2.tgz"; url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz"; sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; }; } { - name = "verror-1.10.0.tgz"; + name = "verror___verror_1.10.0.tgz"; path = fetchurl { - name = "verror-1.10.0.tgz"; + name = "verror___verror_1.10.0.tgz"; url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; } { - name = "winreg-1.2.4.tgz"; + name = "winreg___winreg_1.2.4.tgz"; path = fetchurl { - name = "winreg-1.2.4.tgz"; + name = "winreg___winreg_1.2.4.tgz"; url = "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz"; sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; }; } { - name = "write-file-atomic-2.4.2.tgz"; + name = "write_file_atomic___write_file_atomic_2.4.2.tgz"; path = fetchurl { - name = "write-file-atomic-2.4.2.tgz"; + name = "write_file_atomic___write_file_atomic_2.4.2.tgz"; url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz"; sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9"; }; } { - name = "xhr-2.5.0.tgz"; + name = "xhr___xhr_2.5.0.tgz"; path = fetchurl { - name = "xhr-2.5.0.tgz"; + name = "xhr___xhr_2.5.0.tgz"; url = "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz"; sha1 = "bed8d1676d5ca36108667692b74b316c496e49dd"; }; } { - name = "xml-parse-from-string-1.0.1.tgz"; + name = "xml_parse_from_string___xml_parse_from_string_1.0.1.tgz"; path = fetchurl { - name = "xml-parse-from-string-1.0.1.tgz"; + name = "xml_parse_from_string___xml_parse_from_string_1.0.1.tgz"; url = "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz"; sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28"; }; } { - name = "xml2js-0.4.19.tgz"; + name = "xml2js___xml2js_0.4.19.tgz"; path = fetchurl { - name = "xml2js-0.4.19.tgz"; + name = "xml2js___xml2js_0.4.19.tgz"; url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz"; sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; }; } { - name = "xmlbuilder-9.0.7.tgz"; + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; path = fetchurl { - name = "xmlbuilder-9.0.7.tgz"; + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; } { - name = "xtend-4.0.1.tgz"; + name = "xtend___xtend_4.0.1.tgz"; path = fetchurl { - name = "xtend-4.0.1.tgz"; + name = "xtend___xtend_4.0.1.tgz"; url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz"; sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 03f1cc2471e9..3db537938da4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub, yarn2nix, makeWrapper, makeDesktopItem, electron, riot-web }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: + +with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.0.4"; + version = "1.0.7"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "152mi81miams5a7l9rd12bnf6wkd1r0lyicgr35r5fq0p6z7a4dk"; + sha256 = "1sq6vnyas2ab3phaiyby4fkpp0nwvl67xwxnr2pzfm0dkjxl9r58"; }; -in yarn2nix.mkYarnPackage rec { +in mkYarnPackage rec { name = "riot-desktop-${version}"; inherit version; @@ -48,6 +50,12 @@ in yarn2nix.mkYarnPackage rec { --add-flags "$out/share/riot/electron" ''; + # Do not attempt generating a tarball for riot-web again. + # note: `doDist = false;` does not work. + distPhase = '' + true + ''; + # The desktop item properties should be kept in sync with data from upstream: # * productName and description from # https://github.com/vector-im/riot-web/blob/develop/electron_app/package.json diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 7ce41d9e27e4..9f8818efd985 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "09sm1k3iypqn93iazfx10y4bqz06d2h8f0902sgrj5qbnaq4jcxr"; + sha256 = "1zg9hwvbanmv2yymjcxjzk2bwvv8707i30vrs0gr213iz6i4abg5"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix new file mode 100644 index 000000000000..d243d9356bd4 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix @@ -0,0 +1,321 @@ +{ pkgs ? import <nixpkgs> {} +, nodejs ? pkgs.nodejs +, yarn ? pkgs.yarn +}: + +let + inherit (pkgs) stdenv lib fetchurl linkFarm; +in rec { + # Export yarn again to make it easier to find out which yarn was used. + inherit yarn; + + # Re-export pkgs + inherit pkgs; + + unlessNull = item: alt: + if item == null then alt else item; + + reformatPackageName = pname: + let + # regex adapted from `validate-npm-package-name` + # will produce 3 parts e.g. + # "@someorg/somepackage" -> [ "@someorg/" "someorg" "somepackage" ] + # "somepackage" -> [ null null "somepackage" ] + parts = builtins.tail (builtins.match "^(@([^/]+)/)?([^/]+)$" pname); + # if there is no organisation we need to filter out null values. + non-null = builtins.filter (x: x != null) parts; + in builtins.concatStringsSep "-" non-null; + + # https://docs.npmjs.com/files/package.json#license + # TODO: support expression syntax (OR, AND, etc) + spdxLicense = licstr: + if licstr == "UNLICENSED" then + lib.licenses.unfree + else + lib.findFirst + (l: l ? spdxId && l.spdxId == licstr) + { shortName = licstr; } + (builtins.attrValues lib.licenses); + + # Generates the yarn.nix from the yarn.lock file + mkYarnNix = yarnLock: + pkgs.runCommand "yarn.nix" {} + "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out"; + + # Loads the generated offline cache. This will be used by yarn as + # the package source. + importOfflineCache = yarnNix: + let + pkg = import yarnNix { inherit fetchurl linkFarm; }; + in + pkg.offline_cache; + + defaultYarnFlags = [ + "--offline" + "--frozen-lockfile" + "--ignore-engines" + "--ignore-scripts" + ]; + + mkYarnModules = { + name, + pname, + version, + packageJSON, + yarnLock, + yarnNix ? mkYarnNix yarnLock, + yarnFlags ? defaultYarnFlags, + pkgConfig ? {}, + preBuild ? "", + workspaceDependencies ? [], + }: + let + offlineCache = importOfflineCache yarnNix; + extraBuildInputs = (lib.flatten (builtins.map (key: + pkgConfig.${key} . buildInputs or [] + ) (builtins.attrNames pkgConfig))); + postInstall = (builtins.map (key: + if (pkgConfig.${key} ? postInstall) then + '' + for f in $(find -L -path '*/node_modules/${key}' -type d); do + (cd "$f" && (${pkgConfig.${key}.postInstall})) + done + '' + else + "" + ) (builtins.attrNames pkgConfig)); + workspaceJSON = pkgs.writeText + "${name}-workspace-package.json" + (builtins.toJSON { private = true; workspaces = ["deps/**"]; }); # scoped packages need second splat + workspaceDependencyLinks = lib.concatMapStringsSep "\n" + (dep: '' + mkdir -p "deps/${dep.pname}" + ln -sf ${dep.packageJSON} "deps/${dep.pname}/package.json" + '') + workspaceDependencies; + in stdenv.mkDerivation { + inherit preBuild name; + phases = ["configurePhase" "buildPhase"]; + buildInputs = [ yarn nodejs ] ++ extraBuildInputs; + + configurePhase = '' + # Yarn writes cache directories etc to $HOME. + export HOME=$PWD/yarn_home + ''; + + buildPhase = '' + runHook preBuild + + mkdir -p "deps/${pname}" + cp ${packageJSON} "deps/${pname}/package.json" + cp ${workspaceJSON} ./package.json + cp ${yarnLock} ./yarn.lock + chmod +w ./yarn.lock + + yarn config --offline set yarn-offline-mirror ${offlineCache} + + # Do not look up in the registry, but in the offline cache. + # TODO: Ask upstream to fix this mess. + sed -i -E '/resolved /{s|https://registry.yarnpkg.com/||;s|[@/:-]|_|g}' yarn.lock + + ${workspaceDependencyLinks} + yarn install ${lib.escapeShellArgs yarnFlags} + + ${lib.concatStringsSep "\n" postInstall} + + mkdir $out + mv node_modules $out/ + mv deps $out/ + patchShebangs $out + ''; + }; + + # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into + # the shell-hook environment. + linkNodeModulesHook = '' + if [[ -d node_modules || -L node_modules ]]; then + echo "./node_modules is present. Replacing." + rm -rf node_modules + fi + + ln -s "$node_modules" node_modules + ''; + + mkYarnWorkspace = { + src, + packageJSON ? src+"/package.json", + yarnLock ? src+"/yarn.lock", + packageOverrides ? {}, + ... + }@attrs: + let + package = lib.importJSON packageJSON; + packageGlobs = package.workspaces; + globElemToRegex = lib.replaceStrings ["*"] [".*"]; + # PathGlob -> [PathGlobElem] + splitGlob = lib.splitString "/"; + # Path -> [PathGlobElem] -> [Path] + # Note: Only directories are included, everything else is filtered out + expandGlobList = base: globElems: + let + elemRegex = globElemToRegex (lib.head globElems); + rest = lib.tail globElems; + children = lib.attrNames (lib.filterAttrs (name: type: type == "directory") (builtins.readDir base)); + matchingChildren = lib.filter (child: builtins.match elemRegex child != null) children; + in if globElems == [] + then [ base ] + else lib.concatMap (child: expandGlobList (base+("/"+child)) rest) matchingChildren; + # Path -> PathGlob -> [Path] + expandGlob = base: glob: expandGlobList base (splitGlob glob); + packagePaths = lib.concatMap (expandGlob src) packageGlobs; + packages = lib.listToAttrs (map (src: + let + packageJSON = src+"/package.json"; + package = lib.importJSON packageJSON; + allDependencies = lib.foldl (a: b: a // b) {} (map (field: lib.attrByPath [field] {} package) ["dependencies" "devDependencies"]); + in rec { + name = reformatPackageName package.name; + value = mkYarnPackage (builtins.removeAttrs attrs ["packageOverrides"] // { + inherit src packageJSON yarnLock; + workspaceDependencies = lib.mapAttrsToList (name: version: packages.${name}) + (lib.filterAttrs (name: version: packages ? ${name}) allDependencies); + } // lib.attrByPath [name] {} packageOverrides); + }) packagePaths); + in packages; + + mkYarnPackage = { + name ? null, + src, + packageJSON ? src + "/package.json", + yarnLock ? src + "/yarn.lock", + yarnNix ? mkYarnNix yarnLock, + yarnFlags ? defaultYarnFlags, + yarnPreBuild ? "", + pkgConfig ? {}, + extraBuildInputs ? [], + publishBinsFor ? null, + workspaceDependencies ? [], + ... + }@attrs: + let + package = lib.importJSON packageJSON; + pname = package.name; + safeName = reformatPackageName pname; + version = package.version; + baseName = unlessNull name "${safeName}-${version}"; + deps = mkYarnModules { + name = "${safeName}-modules-${version}"; + preBuild = yarnPreBuild; + workspaceDependencies = workspaceDependenciesTransitive; + inherit packageJSON pname version yarnLock yarnNix yarnFlags pkgConfig; + }; + publishBinsFor_ = unlessNull publishBinsFor [pname]; + linkDirFunction = '' + linkDirToDirLinks() { + target=$1 + if [ ! -f "$target" ]; then + mkdir -p "$target" + elif [ -L "$target" ]; then + local new=$(mktemp -d) + trueSource=$(realpath "$target") + if [ "$(ls $trueSource | wc -l)" -gt 0 ]; then + ln -s $trueSource/* $new/ + fi + rm -r "$target" + mv "$new" "$target" + fi + } + ''; + workspaceDependenciesTransitive = lib.unique ((lib.flatten (builtins.map (dep: dep.workspaceDependencies) workspaceDependencies)) ++ workspaceDependencies); + workspaceDependencyCopy = lib.concatMapStringsSep "\n" + (dep: '' + # ensure any existing scope directory is not a symlink + linkDirToDirLinks "$(dirname node_modules/${dep.pname})" + mkdir -p "deps/${dep.pname}" + tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.pname}" --strip-components=1 + if [ ! -e "deps/${dep.pname}/node_modules" ]; then + ln -s "${deps}/deps/${dep.pname}/node_modules" "deps/${dep.pname}/node_modules" + fi + '') + workspaceDependenciesTransitive; + in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // { + inherit src; + + name = baseName; + + buildInputs = [ yarn nodejs ] ++ extraBuildInputs; + + node_modules = deps + "/node_modules"; + + configurePhase = attrs.configurePhase or '' + runHook preConfigure + + for localDir in npm-packages-offline-cache node_modules; do + if [[ -d $localDir || -L $localDir ]]; then + echo "$localDir dir present. Removing." + rm -rf $localDir + fi + done + + mkdir -p "deps/${pname}" + shopt -s extglob + cp -r !(deps) "deps/${pname}" + shopt -u extglob + ln -s ${deps}/deps/${pname}/node_modules "deps/${pname}/node_modules" + + cp -r $node_modules node_modules + chmod -R +w node_modules + + ${linkDirFunction} + linkDirToDirLinks "$(dirname node_modules/${pname})" + ln -s "deps/${pname}" "node_modules/${pname}" + ${workspaceDependencyCopy} + + # Help yarn commands run in other phases find the package + echo "--cwd deps/${pname}" > .yarnrc + runHook postConfigure + ''; + + # Replace this phase on frontend packages where only the generated + # files are an interesting output. + installPhase = attrs.installPhase or '' + runHook preInstall + + mkdir -p $out/{bin,libexec/${pname}} + mv node_modules $out/libexec/${pname}/node_modules + mv deps $out/libexec/${pname}/deps + node ${./nix/fixup_bin.js} $out/bin $out/libexec/${pname}/node_modules ${lib.concatStringsSep " " publishBinsFor_} + + runHook postInstall + ''; + + doDist = true; + distPhase = attrs.distPhase or '' + # pack command ignores cwd option + rm -f .yarnrc + cd $out/libexec/${pname}/deps/${pname} + mkdir -p $out/tarballs/ + yarn pack --ignore-scripts --filename $out/tarballs/${baseName}.tgz + ''; + + passthru = { + inherit pname package packageJSON deps; + workspaceDependencies = workspaceDependenciesTransitive; + } // (attrs.passthru or {}); + + meta = { + inherit (nodejs.meta) platforms; + description = packageJSON.description or ""; + homepage = packageJSON.homepage or ""; + version = packageJSON.version or ""; + license = if packageJSON ? license then spdxLicense packageJSON.license else ""; + } // (attrs.meta or {}); + }); + + yarn2nix = mkYarnPackage { + src = ./.; + # yarn2nix is the only package that requires the yarnNix option. + # All the other projects can auto-generate that file. + yarnNix = ./yarn.nix; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index f79622b39cfd..d7c8db81d63a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.6.1"; + version = "3.7.1"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "0wgnb7fdy393anridymm1frlgr86j0awxnzvd498ar5fch06ij87" - else "0x6p1z4qvgy464n6gnkaqrm7dns1ysyadm68sr260d39a7028q1c"; + then "1w60241zsvr8d1qlkca6a1sfxa1jz4w1z9kjd0wd2wkgzp4x91v7" + else "0s835dnaw662sb2v5ahqiwry0qjcpl7ff9krnhbw2iblsbqis3fj"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index a37377835f5f..350ac7e13cdb 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.6.3"; - sha256Hash = "1bm0m1y3cf0zmaasz1wfkbz5fy9wm7ivyjn9bzs87yrvlj9x7wqz"; + version = "1.6.7"; + sha256Hash = "1537div6pky7wz3lansz67vsx2h6b653cx91xg9sswnxfsf8nrql"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "429149"; archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 3b75533e0e5c..f2ae27e2c7da 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { pname = "wire-desktop"; - version = "3.7.2891"; + version = "3.9.2895"; src = fetchurl { url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb"; - sha256 = "0x4nx1rpr9wai0h3n14h1r0f0lj5m29a3pkx1w6mfz5la74iczqc"; + sha256 = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5"; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index fb60b772e29d..45d0dadbe902 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.7.162522.0121"; + version = "2.8.183302.0415"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "01i4g4kmawk3mclifh4bwcqpdnbvrz0sz49b6l33n0k5ysky20r1"; + sha256 = "07afq614fy09mjymmv3cf8vwa8ps78s2s4909g1a2rwvgkj8bw2x"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index 21039d53da4f..e06320424938 100755 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -3,5 +3,15 @@ set -eu -o pipefail +oldVersion=$(nix-instantiate --eval -E "with import ./. {}; zoom-us.version or (builtins.parseDrvName zoom-us.name).version" | tr -d '"') version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')" -update-source-version zoom-us "$version" + +if [ ! "${oldVersion}" = "${version}" ]; then + update-source-version zoom-us "$version" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix" + git add "${default_nix}" + git commit -m "zoom-us: ${oldVersion} -> ${version}" +else + echo "zoom-us is already up-to-date" +fi diff --git a/nixpkgs/pkgs/applications/networking/jmeter/default.nix b/nixpkgs/pkgs/applications/networking/jmeter/default.nix index 2019d9930ef0..54cdf8fa4e15 100644 --- a/nixpkgs/pkgs/applications/networking/jmeter/default.nix +++ b/nixpkgs/pkgs/applications/networking/jmeter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "jmeter-${version}"; - version = "4.0"; + version = "5.1"; src = fetchurl { url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; + sha256 = "04n7srrg47iyrzhskm2w5g8pd8269kjsly5ixsgifl6aqcbvxpcz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix index 8a16aeb55182..32455e1132fd 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -10,11 +10,11 @@ let inherit (pythonPackages) python; in pythonPackages.buildPythonApplication rec { name = "mailnag-${version}"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz"; - sha256 = "ec7ac027d93bc7d88fc270858f5a181453a6ff07f43cab20563d185818801fee"; + sha256 = "0cp5pad6jzd5c14pddbi9ap5bi78wjhk1x2p0gbblmvmcasw309s"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix index 6356fcfc2094..f00ec6e6566f 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, libiconv }: +{ stdenv, fetchFromGitHub, fetchpatch, libiconv }: stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.5"; + version = "0.5.1"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,9 +10,16 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "0fyvydafpz7vmwgn7hc4drm9sb7367smrd07wfyizpas0gmxw2j8"; + sha256 = "11x548dl2jy9cmgsakqrzfdq166whhk4ja7zkiaxrapkjmkf6pbh"; }; + patches = [ + (fetchpatch { + url = "https://github.com/leahneukirchen/mblaze/commit/53151f4f890f302291eb8d3375dec4f8ecb66ed7.patch"; + sha256 = "1mcyrh053iiyzdhgm09g5h3a77np496whnc7jr4agpk1nkbcpfxc"; + }) + ]; + makeFlags = "PREFIX=$(out)"; postInstall = '' diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index dde0d480391b..4e7be2be4732 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,16 +27,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.11.3"; + version = "1.11.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5"; + sha256 = "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn"; }; patches = optional smimeSupport (fetchpatch { - url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.11.2-2/debian/patches/misc/smime.rc.patch"; - sha256 = "1rl27qqwl4nw321ll5jcvfmkmz4fkvcsh5vihjcrhzzyf6vz8wmj"; + url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch"; + sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi"; }); buildInputs = diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e419b68ad81b..2531e414cc13 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -50,6 +50,14 @@ in stdenv.mkDerivation rec { patches = [ # Remove buildconfig.html to prevent a dependency on clang etc. ./no-buildconfig.patch + + # Needed on older branches since rustc: 1.32.0 -> 1.33.0 + (fetchurl { + name = "missing-documentation.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch" + + "?h=firefox-esr&id=03bdd01f9cf"; + sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb"; + }) ]; configureFlags = @@ -66,7 +74,7 @@ in stdenv.mkDerivation rec { "--with-system-libevent" "--with-system-png" # needs APNG support "--with-system-icu" - "--enable-rust-simd" + #"--enable-rust-simd" # not supported since rustc 1.32.0 -> 1.33.0; TODO: probably OK since 68.0.0 "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" diff --git a/nixpkgs/pkgs/applications/networking/netperf/default.nix b/nixpkgs/pkgs/applications/networking/netperf/default.nix index 421a3cfbe3b7..b89173820ee8 100644 --- a/nixpkgs/pkgs/applications/networking/netperf/default.nix +++ b/nixpkgs/pkgs/applications/networking/netperf/default.nix @@ -1,16 +1,17 @@ { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netperf-20180504"; + name = "netperf-${version}"; + version = "20180613"; src = fetchFromGitHub { owner = "HewlettPackard"; repo = "netperf"; - rev = "c0a0d9f31f9940abf375a41b43a343cdbf87caab"; - sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2"; + rev = "bcb868bde7f0203bbab69609f65d4088ba7398db"; + sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8"; }; - buildInputs = [ libsmbios ]; + buildInputs = stdenv.lib.optional (stdenv.hostPlatform.isx86) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' autoreconf -i -I src/missing/m4 diff --git a/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index a131355963ce..0bf2cfce6e4b 100644 --- a/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,35 +1,22 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite , inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret, fetchpatch +, libcloudproviders }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchgit { url = "git://github.com/nextcloud/desktop.git"; rev = "refs/tags/v${version}"; - sha256 = "0r6jj3vbmwh7ipv83c8w1b25pbfq3mzrjgcijdw2gwfxwx9pfq7d"; + sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr"; fetchSubmodules = true; }; - # Patches contained in next (>2.5.1) release - patches = [ - (fetchpatch { - name = "fix-qt-5.12-build"; - url = "https://github.com/nextcloud/desktop/commit/071709ab5e3366e867dd0b0ea931aa7d6f80f528.patch"; - sha256 = "14k635jwm8hz6i22lz88jj2db8v5czwa3zg0667i4hwhkqqmy61n"; - }) - (fetchpatch { - name = "fix-qtwebengine-crash"; - url = "https://patch-diff.githubusercontent.com/raw/nextcloud/desktop/pull/959.patch"; - sha256 = "00qx976az2rb1gwl1rxapm8gqj42yzqp8k2fasn3h7b30lnxdyr0"; - }) - ]; - nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; - buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ]; + buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix index 6b85dbfa3ccd..8ced53c972b5 100644 --- a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.5.3.11470"; + version = "2.5.4.11654"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n"; + sha256 = "0gsnry0786crbnpgg3f1vcqw6mwbz6svhm6mw3767qi4lb33jm31"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix b/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix index c56e39826a66..a3d55d7dff72 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/ncdc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdc-${version}"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; - sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca"; + sha256 = "10hrk7pcvfl9cj6d0kr4qf3l068ikqhccbg7lf25pr2kln9lz412"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix index 8622b374100a..554fe9f8ea0e 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sc8c0w2dbvcdv16idw02y35x0jx5ff6ddzij09pmqjx55zgsjf7"; - buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; cargoBuildFlags = [ "--all" ]; diff --git a/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index d9dd2fc9127a..a9b358fc7937 100644 --- a/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit description; - homepage = http://www.anydesk.com; + homepage = https://www.anydesk.com; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index 425a064fa96b..2110b76934d6 100644 --- a/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -9,7 +9,6 @@ , pcsclite ? null , systemd ? null , buildServer ? true -, optimize ? true }: stdenv.mkDerivation rec { @@ -58,7 +57,7 @@ stdenv.mkDerivation rec { ++ optional (cups != null) "-DWITH_CUPS=ON" ++ optional (pcsclite != null) "-DWITH_PCSC=ON" ++ optional buildServer "-DWITH_SERVER=ON" - ++ optional (optimize && stdenv.isx86_64) "-DWITH_SSE2=ON"; + ++ optional (stdenv.isx86_64) "-DWITH_SSE2=ON"; meta = with lib; { description = "A Remote Desktop Protocol Client"; diff --git a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index 9bfaad8a5bc4..8a8ee2407809 100644 --- a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "14.1.3399"; + version = "14.2.2558"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "166ndijis2i3afz3l6nsnrdhs56v33w5cnjd0m7giqj0fbq43ws5"; + sha256 = "1wfdvs0jfhm1ri1mni4bf9qszzca17p07w6ih7k4k0x4j8ga18cs"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix index c855277e2259..1844711066b0 100644 --- a/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix +++ b/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2"; - "i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h"; + "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; + "i686-linux" = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; }.${stdenv.hostPlatform.system}; }; diff --git a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index db093310ca1a..46869ecb24f2 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares -, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib +, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper -, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: -assert withGtk -> !withQt && gtk3 != null; -assert withQt -> !withGtk && qt5 != null; +assert withQt -> qt5 != null; with stdenv.lib; let - version = "2.6.6"; - variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; + version = "3.0.1"; + variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; @@ -21,11 +19,10 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0qz8a1ays63712pq1v7nnw7c57zlqkcifq7himfv5nsv0zm36ya8"; + sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6"; }; cmakeFlags = [ - "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}" "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" "-DENABLE_QT5=${if withQt then "ON" else "OFF"}" "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" @@ -33,13 +30,12 @@ in stdenv.mkDerivation { nativeBuildInputs = [ bison cmake extra-cmake-modules flex pkgconfig - ] ++ optional withGtk wrapGAppsHook; + ]; buildInputs = [ gettext pcre perl libpcap lua5 libssh openssl libgcrypt - libgpgerror gnutls geoip c-ares python glib zlib makeWrapper + libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ] ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); @@ -60,32 +56,29 @@ in stdenv.mkDerivation { export LD_LIBRARY_PATH="$PWD/run" ''; - postInstall = if stdenv.isDarwin then '' - ${optionalString withQt '' - mkdir -p $out/Applications - mv $out/bin/Wireshark.app $out/Applications/Wireshark.app - - for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do - install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib - install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib - install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib - done - - wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \ + postInstall = '' + # to remove "cycle detected in the references" + mkdir -p $dev/lib/wireshark + mv $out/lib/wireshark/cmake $dev/lib/wireshark + '' + (if stdenv.isDarwin && withQt then '' + mkdir -p $out/Applications + mv $out/bin/Wireshark.app $out/Applications/Wireshark.app + + for f in $(find $out/Applications/Wireshark.app/Contents/PlugIns -name "*.so"); do + for dylib in $(otool -L $f | awk '/^\t*lib/ {print $1}'); do + install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" + done + done + + wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \ --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} - ''} - '' else optionalString (withQt || withGtk) '' - ${optionalString withGtk '' - install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop - ''} - ${optionalString withQt '' - install -Dm644 -t $out/share/applications ../wireshark.desktop - wrapProgram $out/bin/wireshark \ + '' else optionalString withQt '' + install -Dm644 -t $out/share/applications ../wireshark.desktop + wrapProgram $out/bin/wireshark \ --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} - ''} substituteInPlace $out/share/applications/*.desktop \ - --replace "Exec=wireshark" "Exec=$out/bin/wireshark" + --replace "Exec=wireshark" "Exec=$out/bin/wireshark" install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv @@ -98,7 +91,7 @@ in stdenv.mkDerivation { cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ cp ../wsutil/*.h $dev/include/wsutil/ cp ../wiretap/*.h $dev/include/wiretap - ''; + ''); enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index c4b434dcaa49..fcfa1a552239 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -1,28 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "rclone"; - version = "1.46"; - - goPackagePath = "github.com/ncw/rclone"; - subPackages = [ "." ]; + version = "1.47.0"; src = fetchFromGitHub { owner = "ncw"; - repo = "rclone"; + repo = pname; rev = "v${version}"; - sha256 = "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia"; + sha256 = "1nxwjr9jly6wh1ixr6a7zhlg4b3298v940040fsm0n3lcljd37zx"; }; - outputs = [ "bin" "out" "man" ]; + modSha256 = "02p5dd450bbfyq80nd0w8f9kpv25k1855mf0gcv0cy9zq3f3r7q7"; + + subPackages = [ "." ]; - # https://github.com/ncw/rclone/issues/2964 - patches = [ - (fetchpatch { - url = "https://github.com/ncw/rclone/commit/1c1a8ef24bea9332c6c450379ed3c5d953e07508.patch"; - sha256 = "0mq74z78lc3dhama303k712xkzz9q6p7zqlbwbl04bndqlkny03k"; - }) - ]; + outputs = [ "out" "man" ]; postInstall = '' install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 diff --git a/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 39144935e9cd..7cdc73419538 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -3,14 +3,14 @@ let common = { stname, target, postInstall ? "" }: buildGoPackage rec { - version = "1.1.0"; + version = "1.1.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1qmrh3c4p5vxzjqd0zdmvcqffq75gl4qfg0s8qpkgvdc7qrzzi7i"; + sha256 = "1nkc4ivc8mg9c1njqlkhb9i5f4c1via1rdqfbhwgkj86s6cnxrg7"; }; goPackagePath = "github.com/syncthing/syncthing"; diff --git a/nixpkgs/pkgs/applications/networking/syncthing/deps.nix b/nixpkgs/pkgs/applications/networking/syncthing/deps.nix index 351b4e30d568..4a58a490cc5a 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing/deps.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing/deps.nix @@ -392,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "0fcca4842a8d"; - sha256 = "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; }; } { @@ -419,8 +419,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "4d1cda033e06"; - sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; }; } { diff --git a/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix b/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix index b5b8445df45d..74a1b5714069 100644 --- a/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix +++ b/nixpkgs/pkgs/applications/networking/weather/meteo/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 , json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib -, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook, hicolor-icon-theme }: +, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook +, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "meteo"; @@ -25,8 +26,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter - clutter-gtk geocode-glib gtk3 hicolor-icon-theme diff --git a/nixpkgs/pkgs/applications/office/homebank/default.nix b/nixpkgs/pkgs/applications/office/homebank/default.nix index 32c4aafe28fd..95f8ebea0787 100644 --- a/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.3"; + name = "homebank-5.2.4"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1wdg86gwd0rc9m3mni9qlh746kxmjn4mk5q7fplxrcp2ajdcqr3a"; + sha256 = "1lhj4pnszw4a1r8ls8lwqyakg5bmldziaxgydbx76nbah6w9ma3r"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/office/ledger/2.6.3.nix b/nixpkgs/pkgs/applications/office/ledger/2.6.3.nix index 49b258c43fdb..60fff1d0131b 100644 --- a/nixpkgs/pkgs/applications/office/ledger/2.6.3.nix +++ b/nixpkgs/pkgs/applications/office/ledger/2.6.3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = { - homepage = http://ledger-cli.org/; + homepage = https://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; license = "BSD"; diff --git a/nixpkgs/pkgs/applications/office/ledger/default.nix b/nixpkgs/pkgs/applications/office/ledger/default.nix index 643d9ed894fd..276134efd73d 100644 --- a/nixpkgs/pkgs/applications/office/ledger/default.nix +++ b/nixpkgs/pkgs/applications/office/ledger/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ledger-${version}"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; - rev = version; - sha256 = "0hwnipj2m9p95hhyv6kyq54m27g14r58gnsy2my883kxhpcyb2vc"; + rev = "v${version}"; + sha256 = "0bfnrqrd6wqgsngfpqi30xh6yy86pwl25iwzrqy44q31r0zl4mm3"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/mendeley/default.nix b/nixpkgs/pkgs/applications/office/mendeley/default.nix index 892ebcee99f9..c992724b815e 100644 --- a/nixpkgs/pkgs/applications/office/mendeley/default.nix +++ b/nixpkgs/pkgs/applications/office/mendeley/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation { updateScript = import ./update.nix { inherit stdenv writeScript runtimeShell; }; meta = with stdenv.lib; { - homepage = http://www.mendeley.com; + homepage = https://www.mendeley.com; description = "A reference manager and academic social network"; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 7c72c03edca1..c65315ad5bd8 100644 --- a/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.3.4"; + version = "19.4.1"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "4e2d25acf596ed3a759b298e39f6f8bea001c0625e143616bf97560913d7f86f"; + sha256 = "c0232dda44591033c2ed29ce0a52ba3539b2f2180d1862a18dd4f677063896cb"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/applications/office/scribus/default.nix b/nixpkgs/pkgs/applications/office/scribus/default.nix index 434b4e64ee67..d6b73b07f0e5 100644 --- a/nixpkgs/pkgs/applications/office/scribus/default.nix +++ b/nixpkgs/pkgs/applications/office/scribus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 , libart_lgpl, qt4, python2, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake, imagemagick }: +, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: let icon = fetchurl { @@ -8,27 +8,35 @@ let sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; }; - pythonEnv = python2.withPackages(ps: [ps.tkinter]); + pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); in stdenv.mkDerivation rec { - name = "scribus-1.4.7"; + pname = "scribus"; + version = "1.4.8"; src = fetchurl { - url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "1v2ziq3k0yjz35nk5plcbc1jpi53p9v1cq1z3spch9lwlns3bls2"; + url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; }; enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = with xorg; - [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4 + [ freetype lcms libtiff libxml2 libart_lgpl qt4 pythonEnv cups fontconfig - libjpeg zlib libpng podofo aspell cairo + libjpeg zlib libpng podofo hunspell cairo boost # for internal 2geom library libXaw libXext libX11 libXtst libXi libXinerama libpthreadstubs libXau libXdmcp imagemagick # To build the icon ]; + postPatch = '' + substituteInPlace scribus/util_ghostscript.cpp \ + --replace 'QString gsName("gs");' \ + 'QString gsName("${ghostscript}/bin/gs");' + ''; + postInstall = '' for i in 16 24 48 64 96 128 256 512; do mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps diff --git a/nixpkgs/pkgs/applications/office/wordgrinder/default.nix b/nixpkgs/pkgs/applications/office/wordgrinder/default.nix index be5ac7a2f2be..9518aaca878e 100644 --- a/nixpkgs/pkgs/applications/office/wordgrinder/default.nix +++ b/nixpkgs/pkgs/applications/office/wordgrinder/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "wordgrinder-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; rev = "${version}"; - sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k"; + sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal"; }; makeFlags = [ diff --git a/nixpkgs/pkgs/applications/office/zim/default.nix b/nixpkgs/pkgs/applications/office/zim/default.nix index 48027c194da6..81c254763d3a 100644 --- a/nixpkgs/pkgs/applications/office/zim/default.nix +++ b/nixpkgs/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook }: # # TODO: Declare configuration options for the following optional dependencies: @@ -7,22 +7,17 @@ # - pyxdg: Need to make it work first (see setupPyInstallFlags). # -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.69.1"; + version = "0.70"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "1yzb8x4mjp96zshcw7xbd4mvqn8zmbcm7cndskpxyk5yccyn5awq"; + sha256 = "1g1xj86iph1a2k4n9yykq0gipbd5jdd7fsh9qpv4v2h5lggadjdd"; }; - propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; - - preBuild = '' - export HOME=$TMP - - sed -i '/zim_install_class,/d' setup.py - ''; + buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ]; + propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; preFixup = '' diff --git a/nixpkgs/pkgs/applications/office/zotero/default.nix b/nixpkgs/pkgs/applications/office/zotero/default.nix index 61e84e2be430..9ca46e6e7cdb 100644 --- a/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -1,67 +1,140 @@ -{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }: - -let -version = "5.0.60"; -meta = with stdenv.lib; { - homepage = https://www.zotero.org; - description = "Collect, organize, cite, and share your research sources"; - license = licenses.agpl3; - platforms = platforms.linux; -}; - -zoteroSrc = stdenv.mkDerivation rec { - inherit version; - name = "zotero-${version}-pkg"; +{ stdenv, fetchurl, wrapGAppsHook, makeDesktopItem +, atk +, cairo +, curl +, cups +, dbus-glib +, dbus +, fontconfig +, freetype +, gdk_pixbuf +, glib +, glibc +, gtk3 +, libX11 +, libXScrnSaver +, libxcb +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXinerama +, libXrender +, libXt +, libnotify +, gnome3 +, libGLU_combined +, nspr +, nss +, pango +, coreutils +, gnused +, gsettings-desktop-schemas +}: +stdenv.mkDerivation rec { + name = "zotero-${version}"; + version = "5.0.60"; + src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; sha256 = "0753xk95shhxma4dvdxrj2q6y81z8lianxg7jnab9m17fb67jy2d"; }; - + buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase"]; - installPhase = '' - mkdir -p $out/data - cp -r * $out/data - mkdir $out/bin - ln -s $out/data/zotero $out/bin/zotero + phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; + + dontStrip = true; + dontPatchELF = true; + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.cc.cc + atk + cairo + curl + cups + dbus-glib + dbus + fontconfig + freetype + gdk_pixbuf + glib + glibc + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libxcb + libXdamage + libXext + libXfixes + libXi + libXinerama + libXrender + libXt + libnotify + libGLU_combined + nspr + nss + pango + ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + stdenv.cc.cc + ]; + + patchPhase = '' + sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js ''; -}; -fhsEnv = buildFHSUserEnv { - name = "zotero-fhs-env"; - targetPkgs = pkgs: with pkgs; with xorg; [ - gtk3 dbus-glib glib - libXt nss - libX11 - ]; -}; + desktopItem = makeDesktopItem rec { + name = "zotero-${version}"; + exec = "zotero -url %U"; + icon = "zotero"; + type = "Application"; + comment = meta.description; + desktopName = "Zotero"; + genericName = "Reference Management"; + categories = "Office;Database;"; + startupNotify = "true"; + mimeType = "text/plain"; + }; -desktopItem = makeDesktopItem rec { - name = "zotero-${version}"; - exec = "zotero -url %U"; - icon = "zotero"; - type = "Application"; - comment = meta.description; - desktopName = "Zotero"; - genericName = "Reference Management"; - categories = "Office;Database;"; - startupNotify = "true"; -}; + installPhase = + '' + mkdir -p "$prefix/usr/lib/zotero-bin-${version}" + cp -r * "$prefix/usr/lib/zotero-bin-${version}" + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" -in runCommand "zotero-${version}" { inherit meta; } '' - mkdir -p $out/bin $out/share/applications - cat >$out/bin/zotero <<EOF -#!${bash}/bin/bash -${fhsEnv}/bin/zotero-fhs-env ${zoteroSrc}/bin/zotero -EOF - chmod +x $out/bin/zotero + # install desktop file and icons. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications/ + for size in 16 32 48 256; do + install -Dm444 chrome/icons/default/default$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png + done - cp ${desktopItem}/share/applications/* $out/share/applications/ + for executable in \ + zotero-bin plugin-container \ + updater minidump-analyzer + do + if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/usr/lib/zotero-bin-${version}/$executable" + fi + done + find . -executable -type f -exec \ + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/zotero-bin-${version}/{}" \; + ''; - for size in 16 32 48 256; do - install -Dm444 ${zoteroSrc}/data/chrome/icons/default/default$size.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png - done -'' + meta = with stdenv.lib; { + homepage = https://www.zotero.org; + description = "Collect, organize, cite, and share your research sources"; + license = licenses.agpl3; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/radio/urh/default.nix b/nixpkgs/pkgs/applications/radio/urh/default.nix index 452407d9c49a..ced3bccd7b67 100644 --- a/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "06656lwbsjfs4hmh5xg38a1icgi49f37dkich0fx5yc92dvl8yfd"; + sha256 = "110fwlj2fw8jgrsgqfkha7lx8f06w0ymh51mgpckx8a0wycznhcy"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; diff --git a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index 8c970440de50..3fe48ab26a27 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,16 +7,16 @@ let in stdenv.mkDerivation rec { - srcVersion = "mar19b"; - version = "20190301_b"; + srcVersion = "apr19a"; + version = "20190401_a"; name = "gildas-${version}"; src = fetchurl { # For each new release, the upstream developers of Gildas move the # source code of the previous release to a different directory - urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz" - "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ]; - sha256 = "c3722863e7f3043e2d6e675557421c2eb0978fd21148386440d0139664d19f99"; + urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" + "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; + sha256 = "0yb8dv41qsr5w2yci62phk6mrxbjlfxl4nnj7zndlyym2i5ni89c"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/biology/ants/default.nix b/nixpkgs/pkgs/applications/science/biology/ants/default.nix index f54bd9af0288..d1a990a5eb28 100644 --- a/nixpkgs/pkgs/applications/science/biology/ants/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/ants/default.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ itk vtk ]; - cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" - # as cmake otherwise tries to download test data: - "-DBUILD_TESTING=FALSE" ]; + cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix b/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix new file mode 100644 index 000000000000..a15425ec2137 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }: + +python27Packages.buildPythonApplication rec { + pname = "eggnog-mapper"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eggnogdb"; + repo = "eggnog-mapper"; + rev = "${version}"; + sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv"; + }; + + patches = (fetchpatch { + url = https://github.com/eggnogdb/eggnog-mapper/pull/125/commits/b7828e4c8c1c453e391aef050f06ff3f84ff9faf.patch; + sha256 = "0nz1a7ybm4j5c7vdm3annnxz9036iam2044hia341a0am9wydmzk"; + }); + + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ]; + + # make emapper find diamond & hmmer + makeWrapperArgs = [ + ''--prefix PATH ':' "${diamond}/bin"'' + ''--prefix PATH ':' "${hmmer}/bin"'' + ]; + + # Tests rely on some of the databases being available, which is not bundled + # with this package as (1) in total, they represent >100GB of data, and (2) + # the user can download only those that interest them. + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast genome-wide functional annotation through orthology assignment"; + license = licenses.gpl2; + homepage = https://github.com/eggnogdb/eggnog-mapper/wiki; + maintainers = with maintainers; [ luispedro ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/science/biology/migrate/default.nix b/nixpkgs/pkgs/applications/science/biology/migrate/default.nix new file mode 100644 index 000000000000..d80e6e7b30df --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/migrate/default.nix @@ -0,0 +1,24 @@ +{ gccStdenv, fetchurl, zlib, openmpi }: + +gccStdenv.mkDerivation rec { + version = "3.7.2"; + pname = "migrate"; + + src = fetchurl { + url = "https://peterbeerli.com/migrate-html5/download_version3/${pname}-${version}.src.tar.gz"; + sha256 = "1p2364ffjc56i82snzvjpy6pkf6wvqwvlvlqxliscx2c303fxs8v"; + }; + + buildInputs = [ zlib openmpi ]; + setSourceRoot = ''sourceRoot=$(echo */src)''; + buildFlags = [ "thread" "mpis" ]; + preInstall = "mkdir -p $out/man/man1"; + + meta = with gccStdenv.lib; { + description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; + homepage = https://peterbeerli.com/migrate-html5/index.html; + license = licenses.mit; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix b/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix index 5901b696d642..ab22fb7232ff 100644 --- a/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libminc ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc postFixup = '' @@ -33,4 +33,3 @@ stdenv.mkDerivation rec { license = licenses.free; }; } - diff --git a/nixpkgs/pkgs/applications/science/biology/star/default.nix b/nixpkgs/pkgs/applications/science/biology/star/default.nix index eb62a8c331f8..2f21da02fb00 100644 --- a/nixpkgs/pkgs/applications/science/biology/star/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "star-${version}"; - version = "2.7.0c"; + version = "2.7.0f"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "0r5jcckr45f71jwhz8xazi1w6kfhszq3y6r7f6zl9963ms1q1gfv"; + sha256 = "0ndqlyimf7xf00nghn8awg12pw985ixghiypg98r2gdm7pscgd0i"; }; sourceRoot = "source/source"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index c55766b8d615..94b059fe5966 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.32"; + version = "14.29.36"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0jpl8smljyjpd3x1q6fcamgia1ij7gxk51faw99ys8ydnrzd57di"; + sha256 = "0f4wxlfxg7pd9lkphfsdq60p18ss1z2hkqvv95a1nn8nnivvs9c6"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix index 7d9d7a662f2f..e4c743ccdef5 100644 --- a/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.99"; + version = "3.3.100"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "0lc4y2vizrbxldjk5yw2i4y7pyprjdjqx3iafzjfnin694zp2630"; + sha256 = "1z60i5nh8dz8j9ii63fwaw7k0p3x0scp91478cxmdv4xhp4njlxa"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index bc6e5e33ea24..277574ce2f17 100644 --- a/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free EDA software to develop printed circuit boards"; - homepage = http://librepcb.org/; + homepage = https://librepcb.org/; maintainers = with maintainers; [ luz ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix b/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix new file mode 100644 index 000000000000..cb35b9f27d52 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/logic/petrinizer/default.nix @@ -0,0 +1,25 @@ +{ mkDerivation, async, base, bytestring, containers, fetchFromGitLab, mtl +, parallel-io, parsec, sbv, stdenv, stm, transformers +}: +mkDerivation rec { + pname = "petrinizer"; + version = "0.9.1.1"; + + src = fetchFromGitLab { + domain = "gitlab.lrz.de"; + owner = "i7"; + repo = pname; + rev = version; + sha256 = "1n7fzm96gq5rxm2f8w8sr1yzm1zcxpf0b473c6xnhsgqsis5j4xw"; + }; + + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base bytestring containers mtl parallel-io parsec sbv stm + transformers + ]; + description = "Safety and Liveness Analysis of Petri Nets with SMT solvers"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ raskin ]; +} diff --git a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix index 2047bb3fc9f8..88f888ed04f7 100644 --- a/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2018.12.09"; + version = "2019.03.28"; src = fetchFromGitHub { owner = "yosyshq"; repo = "symbiyosys"; - rev = "0772456a15b5a474c3c90a06b48e46a67d8a6614"; - sha256 = "00p2l1g9z8nnmkc57l1cfn9ignjjmxwnyaxj2xjd1fim4kzd5475"; + rev = "44869656b86993e7ebdc59e7b27191f3ecf119dc"; + sha256 = "1p18yzcadn91xzmqrg5xkwfl3p9mnlps57simz7dkkxzcqzjybvn"; }; buildInputs = [ python3 yosys ]; diff --git a/nixpkgs/pkgs/applications/science/math/R/default.nix b/nixpkgs/pkgs/applications/science/math/R/default.nix index 562874ccc136..7c32641e9c30 100644 --- a/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -69,6 +69,11 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-info" "install-pdf" ]; + # The store path to "which" is baked into src/library/base/R/unix/system.unix.R, + # but Nix cannot detect it as a run-time dependency because the installed file + # is compiled and compressed, which hides the store path. + postFixup = "echo ${which} > $out/nix-support/undetected-runtime-dependencies"; + doCheck = true; preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'"; diff --git a/nixpkgs/pkgs/applications/science/math/clp/default.nix b/nixpkgs/pkgs/applications/science/math/clp/default.nix index 4899ebe42d77..81fa6166680e 100644 --- a/nixpkgs/pkgs/applications/science/math/clp/default.nix +++ b/nixpkgs/pkgs/applications/science/math/clp/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - version = "1.16.11"; + version = "1.17.1"; name = "clp-${version}"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "0fazlqpp845186nmixa9f1xfxqqkdr1xj4va7q29m8594ca4a9dm"; + sha256 = "1wdg820g3iikf9344ijwsc8sy6c0m6im42bzzizm6rlmkvnmxhk9"; }; propagatedBuildInputs = [ zlib ]; doCheck = true; - meta = { - license = stdenv.lib.licenses.epl10; + meta = with stdenv.lib; { + license = licenses.epl10; homepage = https://projects.coin-or.org/Clp; description = "An open-source linear programming solver written in C++"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + platforms = platforms.darwin ++ [ "x86_64-linux" ]; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/nixpkgs/pkgs/applications/science/math/mxnet/default.nix b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix index 061f48bb3d93..9c1a2e202823 100644 --- a/nixpkgs/pkgs/applications/science/math/mxnet/default.nix +++ b/nixpkgs/pkgs/applications/science/math/mxnet/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = (if cudaSupport then [ + "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] else [ "-DUSE_CUDA=OFF" ]) diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index 75cd308da400..619d24ce9ac3 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -144,6 +144,20 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch/?id=f570e3a7fc2965764b84c04ce301a88ded2c42df"; sha256 = "0l5c4giixkn15v2a06sfzq5mkxila6l67zkjbacirwprrlpcnmmp"; }) + + # https://trac.sagemath.org/ticket/27420 + (fetchpatch { + name = "cypari-2.1.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=e351bf2f2914e683d5e2028597c45ae8d1b7f855"; + sha256 = "00faa7fl0vaqcqbw0bidkhl78qa8l34d3a07zirbcl0vm74bdn1p"; + }) + + # https://trac.sagemath.org/ticket/27653 + (fetchpatch { + name = "sympy-1.4.patch"; + url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d"; + sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/nixpkgs/pkgs/applications/science/misc/boinc/default.nix b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix index 3571d705e311..d1da5a74e858 100644 --- a/nixpkgs/pkgs/applications/science/misc/boinc/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/boinc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Free software for distributed and grid computing"; - homepage = http://boinc.berkeley.edu/; + homepage = https://boinc.berkeley.edu/; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix b/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix index b665d5f4f687..f44d07d36db8 100644 --- a/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix @@ -58,5 +58,7 @@ stdenv.mkDerivation rec { license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ mdaiter ]; + # 20190414-174115: CMake cannot find CGAL which is passed as build input + broken = true; }; } diff --git a/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index 6f04d436877f..751f3c3aebe3 100644 --- a/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -5,13 +5,14 @@ python.buildPythonPackage rec { pname = "snakemake"; - version = "5.2.2"; + version = "5.4.4"; propagatedBuildInputs = with python; [ appdirs ConfigArgParse datrie docutils + GitPython jsonschema pyyaml ratelimiter @@ -21,7 +22,7 @@ python.buildPythonPackage rec { src = python.fetchPypi { inherit pname version; - sha256 = "adffe7e24b4a613a9e8bf0a2a320b3cea236d86afb9132bb0bbbc08b8e35a3a3"; + sha256 = "157323e0e1be34302edbbf399b2acbe25a4291bceffd47a0469963a970c9375f"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 46e88b1e0fc4..c76b82ffe6d4 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.19.2"; + version = "2.21.0"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw"; + sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch index ab5bb3c3a6c7..f8f8ab86a9ce 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch @@ -3,9 +3,10 @@ and (2) make sure `gitman.info' isn't produced since it's broken (duplicate node names). diff --git a/Documentation/Makefile b/Documentation/Makefile +index 26a2342bea..ceccd67ebb 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile -@@ -122,7 +122,7 @@ +@@ -132,7 +132,7 @@ HTML_REPO = ../../git-htmldocs MAKEINFO = makeinfo INSTALL_INFO = install-info @@ -14,7 +15,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile DBLATEX = dblatex ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty -@@ -240,7 +240,7 @@ +@@ -250,7 +250,7 @@ man1: $(DOC_MAN1) man5: $(DOC_MAN5) man7: $(DOC_MAN7) @@ -23,7 +24,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile pdf: user-manual.pdf -@@ -256,10 +256,9 @@ +@@ -266,10 +266,9 @@ install-man: man install-info: info $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 6b93d061a3be..9603d8e27c5c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,7 +1,8 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt +index 1afe9fc858..05dd7c3a90 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'. +@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'. specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration @@ -9,14 +10,15 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt - `/usr/sbin`, `/usr/lib` and $PATH if such program is + option; the built-in default is to search in $PATH if such program is available, falling back to `localhost` otherwise. - + --smtp-server-port=<port>:: diff --git a/git-send-email.perl b/git-send-email.perl +index 8eb63b5a2f..74a61d8213 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -944,8 +944,7 @@ if (defined $reply_to) { +@@ -956,8 +956,7 @@ sub expand_one_alias { } - + if (!defined $smtp_server) { - my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); - push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch index 216c0e56b44c..721f2aa099c4 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch @@ -1,94 +1,23 @@ +diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh +index e1d917fd27..e90f8e1414 100644 --- a/git-sh-i18n.sh +++ b/git-sh-i18n.sh -@@ -15,87 +15,11 @@ - fi - export TEXTDOMAINDIR - --# First decide what scheme to use... --GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough --if test -n "$GIT_GETTEXT_POISON" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison --elif test -n "@@USE_GETTEXT_SCHEME@@" --then -- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" --elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" --then -- : no probing necessary +@@ -26,7 +26,7 @@ then + elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" + then + : no probing necessary -elif type gettext.sh >/dev/null 2>&1 --then -- # GNU libintl's gettext.sh -- GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu --elif test "$(gettext -h 2>&1)" = "-h" --then -- # gettext binary exists but no gettext.sh. likely to be a gettext -- # binary on a Solaris or something that is not GNU libintl and -- # lack eval_gettext. -- GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext --fi --export GIT_INTERNAL_GETTEXT_SH_SCHEME -- --# ... and then follow that decision. --case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in --gnu) -- # Use libintl's gettext.sh, or fall back to English if we can't. ++elif type @gettext@/bin/gettext.sh >/dev/null 2>&1 + then + # GNU libintl's gettext.sh + GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu +@@ -43,7 +43,8 @@ export GIT_INTERNAL_GETTEXT_SH_SCHEME + case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in + gnu) + # Use libintl's gettext.sh, or fall back to English if we can't. - . gettext.sh -- ;; --gettext_without_eval_gettext) -- # Solaris has a gettext(1) but no eval_gettext(1) -- eval_gettext () { -- gettext "$1" | ( -- export PATH $(git sh-i18n--envsubst --variables "$1"); -- git sh-i18n--envsubst "$1" -- ) -- } -- -- eval_ngettext () { -- ngettext "$1" "$2" "$3" | ( -- export PATH $(git sh-i18n--envsubst --variables "$2"); -- git sh-i18n--envsubst "$2" -- ) -- } -- ;; --poison) -- # Emit garbage so that tests that incorrectly rely on translatable -- # strings will fail. -- gettext () { -- printf "%s" "# GETTEXT POISON #" -- } -- -- eval_gettext () { -- printf "%s" "# GETTEXT POISON #" -- } -- -- eval_ngettext () { -- printf "%s" "# GETTEXT POISON #" -- } -- ;; --*) -- gettext () { -- printf "%s" "$1" -- } -- -- eval_gettext () { -- printf "%s" "$1" | ( -- export PATH $(git sh-i18n--envsubst --variables "$1"); -- git sh-i18n--envsubst "$1" -- ) -- } -+# GNU gettext -+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu -+export PATH=@gettext@/bin:$PATH - -- eval_ngettext () { -- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | ( -- export PATH $(git sh-i18n--envsubst --variables "$2"); -- git sh-i18n--envsubst "$2" -- ) -- } -- ;; --esac -+. @gettext@/bin/gettext.sh - - # Git-specific wrapper functions - gettextln () { ++ . @gettext@/bin/gettext.sh ++ export PATH=@gettext@/bin:$PATH + ;; + gettext_without_eval_gettext) + # Solaris has a gettext(1) but no eval_gettext(1) diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch index 8c68fb9f186b..4b73d11744ba 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch @@ -1,12 +1,13 @@ diff --git a/t/test-lib.sh b/t/test-lib.sh +index 8665b0a9b6..8bb892b1af 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh -@@ -923,7 +923,7 @@ +@@ -1227,7 +1227,7 @@ elif test -n "$GIT_TEST_INSTALLED" then GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) || error "Cannot run git from $GIT_TEST_INSTALLED." -- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH +- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH + PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} else # normal case, use ../bin-wrappers only unless $with_dashes: - git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" + if test -n "$no_bin_wrappers" diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch index addb1dbc5e06..71cdc694ac31 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch @@ -1,18 +1,18 @@ diff --git a/connect.c b/connect.c -index c3a014c5b..fbca3262b 100644 +index 4813f005ab..b3f12f3268 100644 --- a/connect.c +++ b/connect.c -@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, - +@@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, + ssh = getenv("GIT_SSH"); if (!ssh) - ssh = "ssh"; + ssh = "@ssh@"; variant = determine_ssh_variant(ssh, 0); } - + diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl -index 480a6b30d..781720424 100644 +index 480a6b30d0..7817204241 100644 --- a/git-gui/lib/remote_add.tcl +++ b/git-gui/lib/remote_add.tcl @@ -139,7 +139,7 @@ method _add {} { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh new file mode 100755 index 000000000000..05944014743f --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts jq + +set -eu -o pipefail + +oldVersion="$(nix-instantiate --eval -E "with import ./. {}; git.version or (builtins.parseDrvName git.name).version" | tr -d '"')" +latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" + +if [ ! "${oldVersion}" = "${latestTag}" ]; then + update-source-version git "${latestTag}" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix" + nix-build -A git + git add "${default_nix}" + git commit -m "git: ${oldVersion} -> ${latestTag}" +else + echo "git is already up-to-date" +fi diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index e6e136e290d8..24679085a655 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.11.1"; + version = "2.11.2"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "1gq3m4w4j63n3i43pyq2niwacd8cjypaj27yjabb582x63a431xy"; + sha256 = "11ipc2vpy52r1ql9r4iyam1sjchb7f01ffc39fvz6d5hhjaz3i9b"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 38aa63c1ab07..69d8876510ee 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "063rfb0jwxfq91cw7gp0achqsgi3dpj1pqfi7k5md67bhp2i2si3"; + sha256 = "155lnp98dx80aqds91kw2kf6lss6jzk5nljaqmmzsvn701fh922q"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 1208a42e3325..8b807d11e34a 100644 --- a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "5.0.1"; + version = "5.0.4"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "14n0xqp6y7ij26r5k7h0phf29krbpx54yzfbvrax5sd9cwg2762g"; + sha256 = "1fq0w8djkcx5jr2pw6izlq5rkwbq3r3f15xr3dmmbz6gjvi3nra0"; }; libPath = makeLibraryPath [ diff --git a/nixpkgs/pkgs/applications/version-management/meld/default.nix b/nixpkgs/pkgs/applications/version-management/meld/default.nix index fd70dafe7f08..168827c3548f 100644 --- a/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, itstool, python3, intltool, wrapGAppsHook , libxml2, gobject-introspection, gtk3, gtksourceview, gnome3 -, dbus, xvfb_run +, gsettings-desktop-schemas, dbus, xvfb_run }: python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.20.0"; + version = "3.20.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11khi1sg02k3b9qdag3r939cwi27cql4kjim7jhxf9ckfhpzwh6b"; + sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55"; }; nativeBuildInputs = [ intltool itstool libxml2 gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme + gtk3 gtksourceview gsettings-desktop-schemas gnome3.adwaita-icon-theme gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; diff --git a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index fc4c18f5eb76..7f72e24aa537 100644 --- a/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.9"; + version = "4.9.1"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "01ig0464cvy9d87rn274g39frxr0p5q4lxf1xn5k3m24grf0qq0g"; + sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile index babcfe75ed7a..952dd8bda4d5 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem "bundler", ">= 1.5.0" -gem "rails", "5.2.2" +gem "rails", "5.2.2.1" gem "rouge", "~> 3.3.0" gem "request_store", "1.0.5" gem "mini_mime", "~> 1.0.1" diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock index 26df0e1506a7..215704e5b38e 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.2) - actionpack (= 5.2.2) + actioncable (5.2.2.1) + actionpack (= 5.2.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) + actionmailer (5.2.2.1) + actionpack (= 5.2.2.1) + actionview (= 5.2.2.1) + activejob (= 5.2.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2) - actionview (= 5.2.2) - activesupport (= 5.2.2) + actionpack (5.2.2.1) + actionview (= 5.2.2.1) + activesupport (= 5.2.2.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.2) - activesupport (= 5.2.2) + actionview (5.2.2.1) + activesupport (= 5.2.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2) - activesupport (= 5.2.2) + activejob (5.2.2.1) + activesupport (= 5.2.2.1) globalid (>= 0.3.6) - activemodel (5.2.2) - activesupport (= 5.2.2) - activerecord (5.2.2) - activemodel (= 5.2.2) - activesupport (= 5.2.2) + activemodel (5.2.2.1) + activesupport (= 5.2.2.1) + activerecord (5.2.2.1) + activemodel (= 5.2.2.1) + activesupport (= 5.2.2.1) arel (>= 9.0) - activestorage (5.2.2) - actionpack (= 5.2.2) - activerecord (= 5.2.2) + activestorage (5.2.2.1) + actionpack (= 5.2.2.1) + activerecord (= 5.2.2.1) marcel (~> 0.3.1) - activesupport (5.2.2) + activesupport (5.2.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -58,11 +58,11 @@ GEM xpath (>= 2.0, < 4.0) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) crass (1.0.4) css_parser (1.7.0) addressable - csv (3.0.4) + csv (3.0.6) docile (1.1.5) erubi (1.8.0) ffi (1.10.0) @@ -89,38 +89,38 @@ GEM mysql2 (0.5.2) net-ldap (0.16.1) nio4r (2.3.1) - nokogiri (1.10.1) + nokogiri (1.10.2) mini_portile2 (~> 2.4.0) pg (1.1.4) public_suffix (3.0.3) - puma (3.12.0) - rack (2.0.6) + puma (3.12.1) + rack (2.0.7) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2) - actioncable (= 5.2.2) - actionmailer (= 5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) - activemodel (= 5.2.2) - activerecord (= 5.2.2) - activestorage (= 5.2.2) - activesupport (= 5.2.2) + rails (5.2.2.1) + actioncable (= 5.2.2.1) + actionmailer (= 5.2.2.1) + actionpack (= 5.2.2.1) + actionview (= 5.2.2.1) + activejob (= 5.2.2.1) + activemodel (= 5.2.2.1) + activerecord (= 5.2.2.1) + activestorage (= 5.2.2.1) + activesupport (= 5.2.2.1) bundler (>= 1.3.0) - railties (= 5.2.2) + railties (= 5.2.2.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.2.2) - actionpack (= 5.2.2) - activesupport (= 5.2.2) + railties (5.2.2.1) + actionpack (= 5.2.2.1) + activesupport (= 5.2.2.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -165,7 +165,7 @@ GEM websocket-extensions (0.1.3) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.18) + yard (0.9.19) PLATFORMS ruby @@ -186,7 +186,7 @@ DEPENDENCIES pg (~> 1.1.4) puma (~> 3.7) rack-openid - rails (= 5.2.2) + rails (= 5.2.2.1) rails-dom-testing rbpdf (~> 1.19.6) redcarpet (~> 3.4.0) diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix index 04adc31a886a..82a994478cd2 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "4.0.2"; + version = "4.0.3"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,7 +15,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "0v00f6m7si0ca0bmh6h7mx8yz1pl4zql2c8abavya57j97mi8182"; + sha256 = "1wyfl08sq71n4c2hc0fv1dfblykq5i3mbqyjdswk26md8dcmw8ac"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix b/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix index afda745241ee..53c2d73b6e93 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/4.x/gemset.nix @@ -3,28 +3,28 @@ dependencies = ["actionpack" "nio4r" "websocket-driver"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0826k5ch0l03f9yrkxy69aiv039z4qi00lnahw2rzywd2iz6r68x"; + sha256 = "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfpb8s95cmkpp9ybyp2c88r55r5llscmmnkfwcwgasz9ncjiq5n"; + sha256 = "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iwhbqqn0cm39dq040iwq8cfyclqk3kyzwlp5k3j5cz8k2668wws"; + sha256 = "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -39,55 +39,55 @@ dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lz04drbi1z0xhvb8jnr14pbf505lilr02arahxq7y3mxiz0rs8z"; + sha256 = "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jjkl62x2aprg55x9rpm0h2c82vr2qr989hg3l9r21l01q4822ir"; + sha256 = "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; activemodel = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xmwi3mw8g4shbjvkhk72ra3r5jccbdsd4piphqka2y1h8s7sxvi"; + sha256 = "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19a0sns6a5wz2wym25lb1dv4lbrrl5sd1n15s5ky2636znmhz30y"; + sha256 = "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c72837098sw384vk6dmrb2p7q3wx4swnibk6sw9dp4hn1vc4p31"; + sha256 = "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; + sha256 = "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -135,10 +135,10 @@ concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; crass = { source = { @@ -160,10 +160,10 @@ csv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19m22vlxddva301z2izvg06hldlc37nyzhin3kjjfcnlbb8imj33"; + sha256 = "1zvchwfkdkljnslqakagbnw76vs01xwpjrynrawfanzn376c6bcd"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.6"; }; docile = { source = { @@ -334,10 +334,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2"; type = "gem"; }; - version = "1.10.1"; + version = "1.10.2"; }; pg = { source = { @@ -358,18 +358,18 @@ puma = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; + sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm"; + sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.7"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -393,10 +393,10 @@ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m9cszds68dsiycciiayd3c9g90s2yzn1izkr3gpgqkfw6dmvzyr"; + sha256 = "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -420,10 +420,10 @@ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00pnylmbz4c46mxw5lhxi8h39lndfg6fs1hpd0qd6swnjhkqsr1l"; + sha256 = "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6"; type = "gem"; }; - version = "5.2.2"; + version = "5.2.2.1"; }; rake = { source = { @@ -614,9 +614,9 @@ yard = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f"; + sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v"; type = "gem"; }; - version = "0.9.18"; + version = "0.9.19"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile index 15662f56015c..5a0283e20ed5 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem "bundler", ">= 1.5.0", "< 2.0.0" -gem "rails", "4.2.11" +gem "rails", "4.2.11.1" gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" if RUBY_VERSION < "2.1" gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5") diff --git a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock index eb3e0ee73bb6..888175335a7a 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,38 +1,38 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) + actionmailer (4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11) - actionview (= 4.2.11) - activesupport (= 4.2.11) + actionpack (4.2.11.1) + actionview (= 4.2.11.1) + activesupport (= 4.2.11.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-xml_parser (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.11) - activesupport (= 4.2.11) + actionview (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11) - activesupport (= 4.2.11) + activejob (4.2.11.1) + activesupport (= 4.2.11.1) globalid (>= 0.3.0) - activemodel (4.2.11) - activesupport (= 4.2.11) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.11) - activemodel (= 4.2.11) - activesupport (= 4.2.11) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) - activesupport (4.2.11) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -51,7 +51,7 @@ GEM childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) coderay (1.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) crass (1.0.4) css_parser (1.7.0) addressable @@ -73,7 +73,7 @@ GEM metaclass (0.0.4) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mimemagic (0.3.3) mini_mime (1.0.1) mini_portile2 (2.3.0) @@ -95,16 +95,16 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11) - actionmailer (= 4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) - activemodel (= 4.2.11) - activerecord (= 4.2.11) - activesupport (= 4.2.11) + rails (4.2.11.1) + actionmailer (= 4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) + activemodel (= 4.2.11.1) + activerecord (= 4.2.11.1) + activesupport (= 4.2.11.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11) + railties (= 4.2.11.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -114,9 +114,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (4.2.11) - actionpack (= 4.2.11) - activesupport (= 4.2.11) + railties (4.2.11.1) + actionpack (= 4.2.11.1) + activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) @@ -161,7 +161,7 @@ GEM websocket (1.2.8) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.18) + yard (0.9.19) PLATFORMS ruby @@ -184,7 +184,7 @@ DEPENDENCIES pg (~> 0.18.1) protected_attributes rack-openid - rails (= 4.2.11) + rails (= 4.2.11.1) rails-dom-testing rails-html-sanitizer (>= 1.0.3) rbpdf (~> 1.19.6) diff --git a/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/nixpkgs/pkgs/applications/version-management/redmine/default.nix index ab0b113bf871..12f3d18a32c5 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "3.4.9"; + version = "3.4.10"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,7 +15,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "1f7sgyka21cjkvmdqkkwrx1hn0b38yq4b7283vw858fccp0l2vy2"; + sha256 = "08clfg7wgp4wnajawdn7qgrv7r8lk8d8haqkl7iz77ygdi3mpyrh"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix b/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix index bdf1b55a732d..87b0b0b4f7ad 100644 --- a/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix @@ -3,19 +3,19 @@ dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zkklsh7ymhvdm5p9fr5ycd39d5caassag8yq0dga9cbk7fps74m"; + sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13xkil3y7gjj0m4ky14asi4m08x69wwv63wfn0h95wli4x8h8w7r"; + sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; actionpack-xml_parser = { dependencies = ["actionpack"]; @@ -30,46 +30,46 @@ dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09vwq0xgxxhssxxh8fa7l2pv6a56smw3v6gvb9l1mycmf8vprd4b"; + sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12yqs22f4lz20nw6djsrkhii3p3nfpd51nw0lhvnczx0q8kl0nyk"; + sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; activemodel = { dependencies = ["activesupport" "builder"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11aqvabf5c1pgb404f5bqp1i7mxkyhzmwk6y8zm5w6rf4nq095mq"; + sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sw0m19cnasbr4cabvc302hjddc3s6fja3fr0gbj9h2n8b3633i5"; + sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4"; + sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -125,10 +125,10 @@ concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; crass = { source = { @@ -243,10 +243,10 @@ mime-types-data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mimemagic = { source = { @@ -377,10 +377,10 @@ dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rhp1l5klw8alqnzji2p4w01x7ygsfnzc7mf87ncr2jlizmgy4nx"; + sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; rails-deprecated_sanitizer = { dependencies = ["activesupport"]; @@ -413,10 +413,10 @@ dependencies = ["actionpack" "activesupport" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09x32zkxs0vfi4y0bjrqd61821kx2azwhdxvk2ygqj4yvxfh11i1"; + sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; rake = { source = { @@ -607,9 +607,9 @@ yard = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07fykkfyrwqkfnxx9i5w6adyiadz00h497c516n96rgvs7alc74f"; + sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v"; type = "gem"; }; - version = "0.9.18"; + version = "0.9.19"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix b/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix index 153c6d78a7b7..38c3da220c92 100644 --- a/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { bin_path = "$out/bin"; install_freedesktop_items = substituteAll { inherit (stdenv) shell; + isExecutable = true; src = ./install_freedesktop_items.sh; }; runtime_paths = lib.makeBinPath [ diff --git a/nixpkgs/pkgs/applications/video/avidemux/default.nix b/nixpkgs/pkgs/applications/video/avidemux/default.nix index ae1e0c5dc868..7912fe60bbc8 100644 --- a/nixpkgs/pkgs/applications/video/avidemux/default.nix +++ b/nixpkgs/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { name = "avidemux-${version}"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "07fdz3y4iln7cizikdjj96dqvp2f8zzhs31ncxxwzdkngn5v8138"; + sha256 = "17x2mnnr5h8pp764p55l1xcn2ljnzhbj8cykajlllvk4rc4qwxld"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/video/handbrake/default.nix b/nixpkgs/pkgs/applications/video/handbrake/default.nix index 77ee2bc10f89..aa2407134f38 100644 --- a/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -11,7 +11,7 @@ # Codecs, audio libopus, lame, libvorbis, a52dec, speex, libsamplerate, # Text processing - libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, + libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz, # Optical media libdvdread, libdvdnav, libdvdcss, libbluray, useGtk ? true, wrapGAppsHook ? null, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg-full libogg libtheora x264 x265 libvpx libopus lame libvorbis a52dec speex libsamplerate - libiconv fribidi fontconfig freetype libass jansson libxml2 + libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz libdvdread libdvdnav libdvdcss libbluray ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify diff --git a/nixpkgs/pkgs/applications/video/kodi/default.nix b/nixpkgs/pkgs/applications/video/kodi/default.nix index f7ecbc23a309..e5844eb827df 100644 --- a/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -13,7 +13,7 @@ , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva, libdrm, wayland +, sqlite, mysql, nasm, gnutls, libva, libdrm , curl, bzip2, zip, unzip, glxinfo, xdpyinfo , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd @@ -28,6 +28,8 @@ , udevSupport ? true, udev ? null , usbSupport ? false, libusb ? null , vdpauSupport ? true, libvdpau ? null +, useWayland ? false, wayland ? null, wayland-protocols ? null +, waylandpp ? null, libxkbcommon ? null }: assert dbusSupport -> dbus != null; @@ -38,6 +40,7 @@ assert sambaSupport -> samba != null; assert udevSupport -> udev != null; assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable assert vdpauSupport -> libvdpau != null; +assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; # TODO for Kodi 18.0 # - check if dbus support PR has been merged and add dbus as a buildInput @@ -110,7 +113,7 @@ let }; in stdenv.mkDerivation rec { - name = "kodi-${kodiVersion}"; + name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}"; src = kodi_src; @@ -123,7 +126,7 @@ in stdenv.mkDerivation rec { libX11 xorgproto libXt libXmu libXext libXinerama libXrandr libXtst libXfixes alsaLib libGLU_combined glew fontconfig freetype ftgl - libjpeg jasper libpng libtiff wayland + libjpeg jasper libpng libtiff libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray @@ -144,7 +147,12 @@ in stdenv.mkDerivation rec { ++ lib.optional sambaSupport samba ++ lib.optional udevSupport udev ++ lib.optional usbSupport libusb - ++ lib.optional vdpauSupport libvdpau; + ++ lib.optional vdpauSupport libvdpau + ++ lib.optional useWayland [ + wayland waylandpp + # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise + libxkbcommon.dev + ]; nativeBuildInputs = [ cmake @@ -153,7 +161,7 @@ in stdenv.mkDerivation rec { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 18.0 - ]; + ] ++ lib.optional useWayland [ wayland-protocols ]; cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" @@ -164,6 +172,9 @@ in stdenv.mkDerivation rec { "-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_OPTICAL=ON" "-DLIRC_DEVICE=/run/lirc/lircd" + ] ++ lib.optional useWayland [ + "-DCORE_PLATFORM_NAME=wayland" + "-DWAYLAND_RENDER_SYSTEM=gl" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/video/kodi/wrapper.nix b/nixpkgs/pkgs/applications/video/kodi/wrapper.nix index b4365eed949b..6a0b1cbdf739 100644 --- a/nixpkgs/pkgs/applications/video/kodi/wrapper.nix +++ b/nixpkgs/pkgs/applications/video/kodi/wrapper.nix @@ -1,7 +1,9 @@ { stdenv, lib, makeWrapper, buildEnv, kodi, plugins }: -buildEnv { - name = "kodi-with-plugins-${(builtins.parseDrvName kodi.name).version}"; +let + drvName = builtins.parseDrvName kodi.name; +in buildEnv { + name = "${drvName.name}-with-plugins-${drvName.version}"; paths = [ kodi ] ++ plugins; pathsToLink = [ "/share" ]; diff --git a/nixpkgs/pkgs/applications/video/mpv/default.nix b/nixpkgs/pkgs/applications/video/mpv/default.nix index 66fc1645e9a1..332495adfce2 100644 --- a/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs, mujs -, lua, libuchardet, libiconv ? null, darwin +, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin , waylandSupport ? stdenv.isLinux , wayland ? null @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs - luaEnv libuchardet mujs + luaEnv libuchardet mujs nv-codec-headers ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive ++ optional bluraySupport libbluray diff --git a/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix index 6d02233be321..14f40ad8901f 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "obs-linuxbrowser-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "000ngkiwfjjl25v4hz6lh6mdkf119pnq0qv3jwdmmp6fpd0dxcgh"; + sha256 = "1mi9pchy07ipnx1m2767n29d53v822yajcf6c3705dhz882z21zq"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index 6f113817058c..19a8ff6c822e 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -3,14 +3,14 @@ , wrapGAppsHook, gtk3 }: python3Packages.buildPythonApplication rec { - name = "openshot-qt-${version}"; - version = "2.4.3"; + pname = "openshot-qt"; + version = "2.4.4"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "1qdw1mli4y9qhrnllnkaf6ydgw5vfvdb90chs4i679k0x0jyb9a2"; + sha256 = "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 9e275464f05c..9bf211164553 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib -, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib , libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }: with stdenv.lib; stdenv.mkDerivation rec { - name = "libopenshot-audio-${version}"; - version = "0.1.7"; + pname = "libopenshot-audio"; + version = "0.1.8"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "08a8wbi28kwrdz4h0rs1b9vsr28ldfi8g75q54rj676y1vwg3qys"; + sha256 = "1fvp6nmf30xzkmcznakh8dv5vn9d7nq051pqcqv638hsfppkmcrl"; }; nativeBuildInputs = diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix index aab54e6d2ee2..b7c8e6feeba4 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -7,14 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "libopenshot-${version}"; - version = "0.2.2"; + pname = "libopenshot"; + version = "0.2.3"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "1x4kv05pdq1pglb6y056aa7llc6iyibyhzg93k7zwj0q08cp5ixd"; + sha256 = "0r1qmr8ar5n72603xkj9h065vbpznrqsq88kxxmn9n8djyyvk03k"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/video/streamlink/default.nix b/nixpkgs/pkgs/applications/video/streamlink/default.nix index 4cc0890a8475..79f092a882c7 100644 --- a/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "1.0.0"; + version = "1.1.1"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "12x8gnp6lv3vi1z2wfb0vjim2wm6abpr938yy48kqj7qff385ihd"; + sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; diff --git a/nixpkgs/pkgs/applications/video/vdr/default.nix b/nixpkgs/pkgs/applications/video/vdr/default.nix index 0ad0b04e7e4b..21c2404f4ee7 100644 --- a/nixpkgs/pkgs/applications/video/vdr/default.nix +++ b/nixpkgs/pkgs/applications/video/vdr/default.nix @@ -1,78 +1,55 @@ { stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig -, gettext, ncurses, systemd, perl +, gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true -}: -let - - version = "2.4.0"; +}: stdenv.mkDerivation rec { name = "vdr-${version}"; + version = "2.4.0"; - mkPlugin = name: stdenv.mkDerivation { - name = "vdr-${name}-${version}"; - inherit (vdr) src; - buildInputs = [ vdr ]; - preConfigure = "cd PLUGINS/src/${name}"; - installFlags = [ "DESTDIR=$(out)" ]; + src = fetchurl { + url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2"; + sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk"; }; - vdr = stdenv.mkDerivation { - - inherit name; - - src = fetchurl { - url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2"; - sha256 = "1klcgy9kr7n6z8d2c77j63bl8hvhx5qnqppg73f77004hzz4kbwk"; - }; - - enableParallelBuilding = true; - - postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; + enableParallelBuilding = true; - buildInputs = [ fontconfig libjpeg libcap freetype ] - ++ stdenv.lib.optional enableSystemd systemd - ++ stdenv.lib.optional enableBidi fribidi; + postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; - buildFlags = [ "vdr" "i18n" ] - ++ stdenv.lib.optional enableSystemd "SDNOTIFY=1" - ++ stdenv.lib.optional enableBidi "BIDI=1"; + buildInputs = [ fontconfig libjpeg libcap freetype ] + ++ lib.optional enableSystemd systemd + ++ lib.optional enableBidi fribidi; - nativeBuildInputs = [ perl ]; + buildFlags = [ "vdr" "i18n" ] + ++ lib.optional enableSystemd "SDNOTIFY=1" + ++ lib.optional enableBidi "BIDI=1"; - # plugins uses the same build environment as vdr - propagatedNativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ perl ]; - installFlags = [ - "DESTDIR=$(out)" - "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix - ]; + # plugins uses the same build environment as vdr + propagatedNativeBuildInputs = [ pkgconfig gettext ]; - installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n" - "install-includes" ]; + installFlags = [ + "DESTDIR=$(out)" + "PREFIX=" # needs to be empty, otherwise plugins try to install at same prefix + ]; - postInstall = '' - mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin - mkdir -p $out/share/vdr/conf - cp *.conf $out/share/vdr/conf - ''; + installTargets = [ "install-pc" "install-bin" "install-doc" "install-i18n" + "install-includes" ]; - outputs = [ "out" "dev" "man" ]; + postInstall = '' + mkdir -p $out/lib/vdr # only needed if vdr is started without any plugin + mkdir -p $out/share/vdr/conf + cp *.conf $out/share/vdr/conf + ''; - meta = with stdenv.lib; { - homepage = http://www.tvdr.de/; - description = "Video Disc Recorder"; - maintainers = [ maintainers.ck3d ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - license = licenses.gpl2; - }; + outputs = [ "out" "dev" "man" ]; + meta = with lib; { + homepage = http://www.tvdr.de/; + description = "Video Disc Recorder"; + maintainers = [ maintainers.ck3d ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + license = licenses.gpl2; }; -in vdr // { - plugins = { - skincurses = (mkPlugin "skincurses").overrideAttrs( - oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; }); - } // (stdenv.lib.genAttrs [ - "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" - ] mkPlugin); } diff --git a/nixpkgs/pkgs/applications/video/vdr/plugins.nix b/nixpkgs/pkgs/applications/video/vdr/plugins.nix index 0e543390c4bb..4fc3783ba510 100644 --- a/nixpkgs/pkgs/applications/video/vdr/plugins.nix +++ b/nixpkgs/pkgs/applications/video/vdr/plugins.nix @@ -1,7 +1,24 @@ { stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub , libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg -, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg }: -{ +, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses }: +let + mkPlugin = name: stdenv.mkDerivation { + name = "vdr-${vdr.version}-${name}"; + inherit (vdr) src; + buildInputs = [ vdr ]; + preConfigure = "cd PLUGINS/src/${name}"; + installFlags = [ "DESTDIR=$(out)" ]; + }; +in { + + skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: { + buildInputs = oldAttr.buildInputs ++ [ ncurses ]; + }); + + inherit (stdenv.lib.genAttrs [ + "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" + ] mkPlugin); + femon = stdenv.mkDerivation rec { name = "vdr-femon-2.4.0"; diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index a8561e0523dc..fe23bcac5855 100644 --- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -4,13 +4,13 @@ with lib; buildGoPackage rec { name = "containerd-${version}"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"; + sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index 0668400d28ca..200542f4de84 100644 --- a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "open-vm-tools-${version}"; - version = "10.3.5"; + version = "10.3.10"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "10x24gkqcg9lnfxghq92nr76h40s5v3xrv0ymi9c7aqrqry404z7"; + sha256 = "0x2cyccnb4sycrw7r5mzby2d196f9jiph8vyqi0x8v8r2b4vi4yj"; }; sourceRoot = "${src.name}/open-vm-tools"; diff --git a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 91a6a4e67066..908e888503e7 100644 --- a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -77,6 +77,11 @@ stdenv.mkDerivation rec { ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch + (fetchpatch { + name = "CVE-2019-3812.patch"; + url = "https://git.qemu.org/?p=qemu.git;a=patch;h=b05b267840515730dbf6753495d5b7bd8b04ad1c"; + sha256 = "03a5vc5wvirbyi5r8kb2r4m2w6f1zmh9bqsr2psh4pblwar0nf55"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ diff --git a/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix b/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix index 88bf7762dd87..bd088db8a366 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/blocks.nix @@ -1,54 +1,19 @@ -{ fetchurl, stdenv, perl, makeWrapper -, iproute, acpi, sysstat, xset, playerctl -, cmus, openvpn, lm_sensors, alsaUtils -, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface" - "keyindicator" "load_average" "mediaplayer" "memory" - "openvpn" "temperature" "volume" "wifi" ] -}: +{ fetchFromGitHub, stdenv, autoreconfHook }: with stdenv.lib; -let - perlscripts = [ "battery" "cpu_usage" "keyindicator" - "mediaplayer" "openvpn" "temperature" ]; - contains_any = l1: l2: 0 < length( intersectLists l1 l2 ); - -in stdenv.mkDerivation rec { name = "i3blocks-${version}"; - version = "1.4"; + version = "unstable-2019-02-07"; - src = fetchurl { - url = "https://github.com/vivien/i3blocks/releases/download/${version}/${name}.tar.gz"; - sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536"; + src = fetchFromGitHub { + owner = "vivien"; + repo = "i3blocks"; + rev = "ec050e79ad8489a6f8deb37d4c20ab10729c25c3"; + sha256 = "1fx4230lmqa5rpzph68dwnpcjfaaqv5gfkradcr85hd1z8d1qp1b"; }; - buildFlags = "SYSCONFDIR=/etc all"; - installFlags = "PREFIX=\${out} VERSION=${version}"; - - buildInputs = optional (contains_any scripts perlscripts) perl; - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - wrapProgram $out/libexec/i3blocks/bandwidth \ - --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)} - wrapProgram $out/libexec/i3blocks/battery \ - --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)} - wrapProgram $out/libexec/i3blocks/cpu_usage \ - --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)} - wrapProgram $out/libexec/i3blocks/iface \ - --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)} - wrapProgram $out/libexec/i3blocks/keyindicator \ - --prefix PATH : ${makeBinPath (optional (elem "keyindicator" scripts) xset)} - wrapProgram $out/libexec/i3blocks/mediaplayer \ - --prefix PATH : ${makeBinPath (optionals (elem "mediaplayer" scripts) [playerctl cmus])} - wrapProgram $out/libexec/i3blocks/openvpn \ - --prefix PATH : ${makeBinPath (optional (elem "openvpn" scripts) openvpn)} - wrapProgram $out/libexec/i3blocks/temperature \ - --prefix PATH : ${makeBinPath (optional (elem "temperature" scripts) lm_sensors)} - wrapProgram $out/libexec/i3blocks/volume \ - --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)} - ''; + nativeBuildInputs = [ autoreconfHook ]; meta = { description = "A flexible scheduler for your i3bar blocks"; diff --git a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 72327d2bb671..964ff1175538 100644 --- a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -53,6 +53,7 @@ let /**/ if libc == null then null else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" else if targetPlatform.libc == "bionic" then "/system/bin/linker" + else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". @@ -189,7 +190,7 @@ stdenv.mkDerivation { else if targetPlatform.isMsp430 then "msp430" else if targetPlatform.isAvr then "avr" else if targetPlatform.isAlpha then "alpha" - else throw "unknown emulation for platform: " + targetPlatform.config; + else throw "unknown emulation for platform: ${targetPlatform.config}"; in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); strictDeps = true; @@ -328,6 +329,7 @@ stdenv.mkDerivation { { description = stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; + priority = 10; } // optionalAttrs useMacosReexportHack { platforms = stdenv.lib.platforms.darwin; }; diff --git a/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix b/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix index c0f741b62886..be83c9da2108 100644 --- a/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix +++ b/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix @@ -36,12 +36,14 @@ let # base packages of the chroot # these match the host's architecture, glibc_multi is used for multilib - # builds. + # builds. glibcLocales must be before glibc or glibc_multi as otherwiese + # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available. basePkgs = with pkgs; - [ (if isMultiBuild then glibc_multi else glibc) + [ glibcLocales + (if isMultiBuild then glibc_multi else glibc) (toString gcc.cc.lib) bashInteractive coreutils less shadow su gawk diffutils findutils gnused gnugrep - gnutar gzip bzip2 xz glibcLocales + gnutar gzip bzip2 xz ]; baseMultiPkgs = with pkgsi686Linux; [ (toString gcc.cc.lib) diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index 176df51cbd9a..9569c6e78c8a 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -45,9 +45,9 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) then + default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" - else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) then + else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then "-isystem ${libcxx}/include/c++/v1" else ""; @@ -291,6 +291,10 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector pic" '' + + optionalString targetPlatform.isNetBSD '' + hardening_unsupported_flags+=" stackprotector fortify" + '' + + optionalString (targetPlatform.libc == "newlib") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' diff --git a/nixpkgs/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix index 344f1abc8b26..11945e7b6f72 100644 --- a/nixpkgs/pkgs/build-support/docker/default.nix +++ b/nixpkgs/pkgs/build-support/docker/default.nix @@ -289,7 +289,7 @@ rec { }: let storePathToLayer = substituteAll - { inherit (stdenv) shell; + { shell = runtimeShell; isExecutable = true; src = ./store-path-to-layer.sh; }; diff --git a/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker b/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker new file mode 100755 index 000000000000..839dc87487a0 --- /dev/null +++ b/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker @@ -0,0 +1,173 @@ +#! /usr/bin/env bash + +set -e -o pipefail + +os= +arch= +imageName= +imageTag= +imageDigest= +finalImageName= +finalImageTag= +hashType=$NIX_HASH_ALGO +hashFormat=$hashFormat +format=nix + +usage(){ + echo >&2 "syntax: nix-prefetch-docker [options] [IMAGE_NAME [IMAGE_TAG|IMAGE_DIGEST]] + +Options: + --os os OS to fetch image for + --arch linux Arch to fetch image for + --image-name name Name of the image to fetch + --image-tag tag Image tag + --image-digest digest Image digest + --final-image-name name Desired name of the image + --final-image-tag tag Desired image tag + --json Output result in json format instead of nix + --quiet Only print the final result +" + exit 1 +} + +get_image_digest(){ + local imageName=$1 + local imageTag=$2 + + if test -z "$imageTag"; then + imageTag="latest" + fi + + skopeo inspect "docker://$imageName:$imageTag" | jq '.Digest' -r +} + +get_name() { + local imageName=$1 + local imageTag=$2 + + echo "docker-image-$(echo "$imageName:$imageTag" | tr '/:' '-').tar" +} + +argi=0 +argfun="" +for arg; do + if test -z "$argfun"; then + case $arg in + --os) argfun=set_os;; + --arch) argfun=set_arch;; + --image-name) argfun=set_imageName;; + --image-tag) argfun=set_imageTag;; + --image-digest) argfun=set_imageDigest;; + --final-image-name) argfun=set_finalImageName;; + --final-image-tag) argfun=set_finalImageTag;; + --quiet) QUIET=true;; + --json) format=json;; + --help) usage; exit;; + *) + : $((++argi)) + case $argi in + 1) imageName=$arg;; + 2) [[ $arg == *"sha256"* ]] && imageDigest=$arg || imageTag=$arg;; + *) exit 1;; + esac + ;; + esac + else + case $argfun in + set_*) + var=${argfun#set_} + eval $var=$arg + ;; + esac + argfun="" + fi +done + +if test -z "$imageName"; then + usage +fi + +if test -z "$os"; then + os=linux +fi + +if test -z "$arch"; then + arch=amd64 +fi + +if test -z "$hashType"; then + hashType=sha256 +fi + +if test -z "$hashFormat"; then + hashFormat=base32 +fi + +if test -z "$finalImageName"; then + finalImageName="$imageName" +fi + +if test -z "$finalImageTag"; then + if test -z "$imageTag"; then + finalImageTag="latest" + else + finalImageTag="$imageTag" + fi +fi + +if test -z "$imageDigest"; then + imageDigest=$(get_image_digest $imageName $imageTag) +fi + +sourceUrl="docker://$imageName@$imageDigest" + +tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/skopeo-copy-tmp-XXXXXXXX")" +trap "rm -rf \"$tmpPath\"" EXIT + +tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)" + +if test -z "$QUIET"; then + skopeo --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" +else + skopeo --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null +fi + +# Compute the hash. +imageHash=$(nix-hash --flat --type $hashType --base32 "$tmpFile") + +# Add the downloaded file to Nix store. +finalPath=$(nix-store --add-fixed "$hashType" "$tmpFile") + +if test -z "$QUIET"; then + echo "-> ImageName: $imageName" + echo "-> ImageDigest: $imageDigest" + echo "-> FinalImageName: $finalImageName" + echo "-> FinalImageTag: $finalImageTag" + echo "-> ImagePath: $finalPath" + echo "-> ImageHash: $imageHash" +fi + +if [ "$format" == "nix" ]; then +cat <<EOF +{ + imageName = "$imageName"; + imageDigest = "$imageDigest"; + sha256 = "$imageHash"; + finalImageName = "$finalImageName"; + finalImageTag = "$finalImageTag"; +} +EOF + +else + +cat <<EOF +{ + "imageName": "$imageName", + "imageDigest": "$imageDigest", + "sha256": "$imageHash", + "finalImageName": "$finalImageName", + "finalImageTag": "$finalImageTag" +} +EOF + +fi diff --git a/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix b/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix new file mode 100644 index 000000000000..03a936e08e0c --- /dev/null +++ b/nixpkgs/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -0,0 +1,26 @@ +{ stdenv, makeWrapper, nix, skopeo }: + +with stdenv.lib; + +stdenv.mkDerivation { + name = "nix-prefetch-docker"; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = ":"; + + installPhase = '' + install -vD ${./nix-prefetch-docker} $out/bin/$name; + wrapProgram $out/bin/$name \ + --prefix PATH : ${makeBinPath [ nix skopeo ]} \ + --set HOME /homeless-shelter + ''; + + preferLocalBuild = true; + + meta = { + description = "Script used to obtain source hashes for dockerTools.pullImage"; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh b/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh index 4cf338b9b252..98c5b8cc2129 100755 --- a/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh +++ b/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ set -eu diff --git a/nixpkgs/pkgs/build-support/kernel/make-initrd.nix b/nixpkgs/pkgs/build-support/kernel/make-initrd.nix index 22761af158af..7ad1affb65a3 100644 --- a/nixpkgs/pkgs/build-support/kernel/make-initrd.nix +++ b/nixpkgs/pkgs/build-support/kernel/make-initrd.nix @@ -12,11 +12,14 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools +{ stdenv, perl, cpio, contents, ubootTools +, name ? "initrd" +, compressor ? "gzip -9n" +, prepend ? [] }: stdenv.mkDerivation rec { - name = "initrd"; + inherit name; builder = ./make-initrd.sh; makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage"; diff --git a/nixpkgs/pkgs/build-support/rust/carnix.nix b/nixpkgs/pkgs/build-support/rust/carnix.nix index ef69f90c3669..46bbff92a9cc 100644 --- a/nixpkgs/pkgs/build-support/rust/carnix.nix +++ b/nixpkgs/pkgs/build-support/rust/carnix.nix @@ -1,4 +1,4 @@ -# Generated by carnix 0.9.8: carnix generate-nix +# Generated by carnix 0.9.10: carnix generate-nix { lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: with buildRustCrateHelpers; let inherit (lib.lists) fold; @@ -6,10 +6,10 @@ let inherit (lib.lists) fold; in rec { crates = cratesIO; - carnix = crates.crates.carnix."0.9.8" deps; + carnix = crates.crates.carnix."0.10.0" deps; __all = [ (carnix {}) ]; - deps.aho_corasick."0.6.8" = { - memchr = "2.1.0"; + deps.aho_corasick."0.6.10" = { + memchr = "2.2.0"; }; deps.ansi_term."0.11.0" = { winapi = "0.3.6"; @@ -18,48 +18,51 @@ rec { blake2_rfc = "0.2.18"; scoped_threadpool = "0.1.9"; }; - deps.arrayvec."0.4.7" = { - nodrop = "0.1.12"; + deps.arrayvec."0.4.10" = { + nodrop = "0.1.13"; }; deps.atty."0.2.11" = { termion = "1.5.1"; - libc = "0.2.43"; + libc = "0.2.50"; winapi = "0.3.6"; }; - deps.backtrace."0.3.9" = { - cfg_if = "0.1.6"; - rustc_demangle = "0.1.9"; - backtrace_sys = "0.1.24"; - libc = "0.2.43"; + deps.autocfg."0.1.2" = {}; + deps.backtrace."0.3.14" = { + cfg_if = "0.1.7"; + rustc_demangle = "0.1.13"; + autocfg = "0.1.2"; + backtrace_sys = "0.1.28"; + libc = "0.2.50"; winapi = "0.3.6"; }; - deps.backtrace_sys."0.1.24" = { - libc = "0.2.43"; - cc = "1.0.25"; + deps.backtrace_sys."0.1.28" = { + libc = "0.2.50"; + cc = "1.0.32"; }; deps.bitflags."1.0.4" = {}; deps.blake2_rfc."0.2.18" = { - arrayvec = "0.4.7"; + arrayvec = "0.4.10"; constant_time_eq = "0.1.3"; }; - deps.carnix."0.9.8" = { + deps.carnix."0.10.0" = { clap = "2.32.0"; - dirs = "1.0.4"; - env_logger = "0.5.13"; - error_chain = "0.12.0"; - itertools = "0.7.8"; - log = "0.4.5"; + dirs = "1.0.5"; + env_logger = "0.6.1"; + failure = "0.1.5"; + failure_derive = "0.1.5"; + itertools = "0.8.0"; + log = "0.4.6"; nom = "3.2.1"; - regex = "1.0.5"; - serde = "1.0.80"; - serde_derive = "1.0.80"; - serde_json = "1.0.32"; + regex = "1.1.2"; + serde = "1.0.89"; + serde_derive = "1.0.89"; + serde_json = "1.0.39"; tempdir = "0.3.7"; - toml = "0.4.8"; + toml = "0.5.0"; url = "1.7.2"; }; - deps.cc."1.0.25" = {}; - deps.cfg_if."0.1.6" = {}; + deps.cc."1.0.32" = {}; + deps.cfg_if."0.1.7" = {}; deps.clap."2.32.0" = { atty = "0.2.11"; bitflags = "1.0.4"; @@ -69,158 +72,168 @@ rec { vec_map = "0.8.1"; ansi_term = "0.11.0"; }; + deps.cloudabi."0.0.3" = { + bitflags = "1.0.4"; + }; deps.constant_time_eq."0.1.3" = {}; - deps.dirs."1.0.4" = { - redox_users = "0.2.0"; - libc = "0.2.43"; + deps.dirs."1.0.5" = { + redox_users = "0.3.0"; + libc = "0.2.50"; winapi = "0.3.6"; }; - deps.either."1.5.0" = {}; - deps.env_logger."0.5.13" = { + deps.either."1.5.1" = {}; + deps.env_logger."0.6.1" = { atty = "0.2.11"; - humantime = "1.1.1"; - log = "0.4.5"; - regex = "1.0.5"; + humantime = "1.2.0"; + log = "0.4.6"; + regex = "1.1.2"; termcolor = "1.0.4"; }; - deps.error_chain."0.12.0" = { - backtrace = "0.3.9"; - }; - deps.failure."0.1.3" = { - backtrace = "0.3.9"; - failure_derive = "0.1.3"; + deps.failure."0.1.5" = { + backtrace = "0.3.14"; + failure_derive = "0.1.5"; }; - deps.failure_derive."0.1.3" = { - proc_macro2 = "0.4.20"; - quote = "0.6.8"; - syn = "0.15.13"; - synstructure = "0.10.0"; + deps.failure_derive."0.1.5" = { + proc_macro2 = "0.4.27"; + quote = "0.6.11"; + syn = "0.15.29"; + synstructure = "0.10.1"; }; - deps.fuchsia_zircon."0.3.3" = { - bitflags = "1.0.4"; - fuchsia_zircon_sys = "0.3.3"; - }; - deps.fuchsia_zircon_sys."0.3.3" = {}; - deps.humantime."1.1.1" = { + deps.fuchsia_cprng."0.1.1" = {}; + deps.humantime."1.2.0" = { quick_error = "1.2.2"; }; deps.idna."0.1.5" = { matches = "0.1.8"; unicode_bidi = "0.3.4"; - unicode_normalization = "0.1.7"; + unicode_normalization = "0.1.8"; }; - deps.itertools."0.7.8" = { - either = "1.5.0"; + deps.itertools."0.8.0" = { + either = "1.5.1"; }; deps.itoa."0.4.3" = {}; - deps.lazy_static."1.1.0" = { - version_check = "0.1.5"; - }; - deps.libc."0.2.43" = {}; - deps.log."0.4.5" = { - cfg_if = "0.1.6"; + deps.lazy_static."1.3.0" = {}; + deps.libc."0.2.50" = {}; + deps.log."0.4.6" = { + cfg_if = "0.1.7"; }; deps.matches."0.1.8" = {}; deps.memchr."1.0.2" = { - libc = "0.2.43"; + libc = "0.2.50"; }; - deps.memchr."2.1.0" = { - cfg_if = "0.1.6"; - libc = "0.2.43"; - version_check = "0.1.5"; - }; - deps.nodrop."0.1.12" = {}; + deps.memchr."2.2.0" = {}; + deps.nodrop."0.1.13" = {}; deps.nom."3.2.1" = { memchr = "1.0.2"; }; deps.percent_encoding."1.0.1" = {}; - deps.proc_macro2."0.4.20" = { + deps.proc_macro2."0.4.27" = { unicode_xid = "0.1.0"; }; deps.quick_error."1.2.2" = {}; - deps.quote."0.6.8" = { - proc_macro2 = "0.4.20"; + deps.quote."0.6.11" = { + proc_macro2 = "0.4.27"; + }; + deps.rand."0.4.6" = { + rand_core = "0.3.1"; + rdrand = "0.4.0"; + fuchsia_cprng = "0.1.1"; + libc = "0.2.50"; + winapi = "0.3.6"; + }; + deps.rand_core."0.3.1" = { + rand_core = "0.4.0"; }; - deps.rand."0.4.3" = { - fuchsia_zircon = "0.3.3"; - libc = "0.2.43"; + deps.rand_core."0.4.0" = {}; + deps.rand_os."0.1.3" = { + rand_core = "0.4.0"; + rdrand = "0.4.0"; + cloudabi = "0.0.3"; + fuchsia_cprng = "0.1.1"; + libc = "0.2.50"; winapi = "0.3.6"; }; - deps.redox_syscall."0.1.40" = {}; + deps.rdrand."0.4.0" = { + rand_core = "0.3.1"; + }; + deps.redox_syscall."0.1.51" = {}; deps.redox_termios."0.1.1" = { - redox_syscall = "0.1.40"; + redox_syscall = "0.1.51"; }; - deps.redox_users."0.2.0" = { + deps.redox_users."0.3.0" = { argon2rs = "0.2.5"; - failure = "0.1.3"; - rand = "0.4.3"; - redox_syscall = "0.1.40"; - }; - deps.regex."1.0.5" = { - aho_corasick = "0.6.8"; - memchr = "2.1.0"; - regex_syntax = "0.6.2"; + failure = "0.1.5"; + rand_os = "0.1.3"; + redox_syscall = "0.1.51"; + }; + deps.regex."1.1.2" = { + aho_corasick = "0.6.10"; + memchr = "2.2.0"; + regex_syntax = "0.6.5"; thread_local = "0.3.6"; - utf8_ranges = "1.0.1"; + utf8_ranges = "1.0.2"; }; - deps.regex_syntax."0.6.2" = { - ucd_util = "0.1.1"; + deps.regex_syntax."0.6.5" = { + ucd_util = "0.1.3"; }; deps.remove_dir_all."0.5.1" = { winapi = "0.3.6"; }; - deps.rustc_demangle."0.1.9" = {}; - deps.ryu."0.2.6" = {}; + deps.rustc_demangle."0.1.13" = {}; + deps.ryu."0.2.7" = {}; deps.scoped_threadpool."0.1.9" = {}; - deps.serde."1.0.80" = {}; - deps.serde_derive."1.0.80" = { - proc_macro2 = "0.4.20"; - quote = "0.6.8"; - syn = "0.15.13"; + deps.serde."1.0.89" = {}; + deps.serde_derive."1.0.89" = { + proc_macro2 = "0.4.27"; + quote = "0.6.11"; + syn = "0.15.29"; }; - deps.serde_json."1.0.32" = { + deps.serde_json."1.0.39" = { itoa = "0.4.3"; - ryu = "0.2.6"; - serde = "1.0.80"; + ryu = "0.2.7"; + serde = "1.0.89"; }; + deps.smallvec."0.6.9" = {}; deps.strsim."0.7.0" = {}; - deps.syn."0.15.13" = { - proc_macro2 = "0.4.20"; - quote = "0.6.8"; + deps.syn."0.15.29" = { + proc_macro2 = "0.4.27"; + quote = "0.6.11"; unicode_xid = "0.1.0"; }; - deps.synstructure."0.10.0" = { - proc_macro2 = "0.4.20"; - quote = "0.6.8"; - syn = "0.15.13"; + deps.synstructure."0.10.1" = { + proc_macro2 = "0.4.27"; + quote = "0.6.11"; + syn = "0.15.29"; unicode_xid = "0.1.0"; }; deps.tempdir."0.3.7" = { - rand = "0.4.3"; + rand = "0.4.6"; remove_dir_all = "0.5.1"; }; deps.termcolor."1.0.4" = { wincolor = "1.0.1"; }; deps.termion."1.5.1" = { - libc = "0.2.43"; - redox_syscall = "0.1.40"; + libc = "0.2.50"; + redox_syscall = "0.1.51"; redox_termios = "0.1.1"; }; deps.textwrap."0.10.0" = { unicode_width = "0.1.5"; }; deps.thread_local."0.3.6" = { - lazy_static = "1.1.0"; + lazy_static = "1.3.0"; }; - deps.toml."0.4.8" = { - serde = "1.0.80"; + deps.toml."0.5.0" = { + serde = "1.0.89"; }; - deps.ucd_util."0.1.1" = {}; + deps.ucd_util."0.1.3" = {}; deps.unicode_bidi."0.3.4" = { matches = "0.1.8"; }; - deps.unicode_normalization."0.1.7" = {}; + deps.unicode_normalization."0.1.8" = { + smallvec = "0.6.9"; + }; deps.unicode_width."0.1.5" = {}; deps.unicode_xid."0.1.0" = {}; deps.url."1.7.2" = { @@ -228,20 +241,19 @@ rec { matches = "0.1.8"; percent_encoding = "1.0.1"; }; - deps.utf8_ranges."1.0.1" = {}; + deps.utf8_ranges."1.0.2" = {}; deps.vec_map."0.8.1" = {}; - deps.version_check."0.1.5" = {}; deps.winapi."0.3.6" = { winapi_i686_pc_windows_gnu = "0.4.0"; winapi_x86_64_pc_windows_gnu = "0.4.0"; }; deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; - deps.winapi_util."0.1.1" = { + deps.winapi_util."0.1.2" = { winapi = "0.3.6"; }; deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; deps.wincolor."1.0.1" = { winapi = "0.3.6"; - winapi_util = "0.1.1"; + winapi_util = "0.1.2"; }; } diff --git a/nixpkgs/pkgs/build-support/rust/crates-io.nix b/nixpkgs/pkgs/build-support/rust/crates-io.nix index 3521f0997bd3..2475a62a3cd7 100644 --- a/nixpkgs/pkgs/build-support/rust/crates-io.nix +++ b/nixpkgs/pkgs/build-support/rust/crates-io.nix @@ -4,6 +4,30 @@ let inherit (lib.lists) fold; inherit (lib.attrsets) recursiveUpdate; in rec { +# aho-corasick-0.6.10 + + crates.aho_corasick."0.6.10" = deps: { features?(features_.aho_corasick."0.6.10" deps {}) }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.10"; + description = "Fast multiple substring searching with finite state machines."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "0bhasxfpmfmz1460chwsx59vdld05axvmk1nbp3sd48xav3d108p"; + libName = "aho_corasick"; + crateBin = + [{ name = "aho-corasick-dot"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."aho_corasick"."0.6.10"."memchr"}" deps) + ]); + }; + features_.aho_corasick."0.6.10" = deps: f: updateFeatures f (rec { + aho_corasick."0.6.10".default = (f.aho_corasick."0.6.10".default or true); + memchr."${deps.aho_corasick."0.6.10".memchr}".default = true; + }) [ + (features_.memchr."${deps."aho_corasick"."0.6.10"."memchr"}" deps) + ]; + + +# end # aho-corasick-0.6.8 crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate { @@ -82,6 +106,38 @@ rec { # end +# arrayvec-0.4.10 + + crates.arrayvec."0.4.10" = deps: { features?(features_.arrayvec."0.4.10" deps {}) }: buildRustCrate { + crateName = "arrayvec"; + version = "0.4.10"; + description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."; + authors = [ "bluss" ]; + sha256 = "0qbh825i59w5wfdysqdkiwbwkrsy7lgbd4pwbyb8pxx8wc36iny8"; + dependencies = mapFeatures features ([ + (crates."nodrop"."${deps."arrayvec"."0.4.10"."nodrop"}" deps) + ]); + features = mkFeatures (features."arrayvec"."0.4.10" or {}); + }; + features_.arrayvec."0.4.10" = deps: f: updateFeatures f (rec { + arrayvec = fold recursiveUpdate {} [ + { "0.4.10"."serde" = + (f.arrayvec."0.4.10"."serde" or false) || + (f.arrayvec."0.4.10".serde-1 or false) || + (arrayvec."0.4.10"."serde-1" or false); } + { "0.4.10"."std" = + (f.arrayvec."0.4.10"."std" or false) || + (f.arrayvec."0.4.10".default or false) || + (arrayvec."0.4.10"."default" or false); } + { "0.4.10".default = (f.arrayvec."0.4.10".default or true); } + ]; + nodrop."${deps.arrayvec."0.4.10".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.10".nodrop}".default or false); + }) [ + (features_.nodrop."${deps."arrayvec"."0.4.10"."nodrop"}" deps) + ]; + + +# end # arrayvec-0.4.7 crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate { @@ -150,6 +206,137 @@ rec { # end +# autocfg-0.1.2 + + crates.autocfg."0.1.2" = deps: { features?(features_.autocfg."0.1.2" deps {}) }: buildRustCrate { + crateName = "autocfg"; + version = "0.1.2"; + description = "Automatic cfg for Rust compiler features"; + authors = [ "Josh Stone <cuviper@gmail.com>" ]; + sha256 = "0dv81dwnp1al3j4ffz007yrjv4w1c7hw09gnf0xs3icxiw6qqfs3"; + }; + features_.autocfg."0.1.2" = deps: f: updateFeatures f (rec { + autocfg."0.1.2".default = (f.autocfg."0.1.2".default or true); + }) []; + + +# end +# backtrace-0.3.14 + + crates.backtrace."0.3.14" = deps: { features?(features_.backtrace."0.3.14" deps {}) }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.14"; + description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ]; + sha256 = "0sp0ib8r5w9sv1g2nkm9yclp16j46yjglw0yhkmh0snf355633mz"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."backtrace"."0.3.14"."cfg_if"}" deps) + (crates."rustc_demangle"."${deps."backtrace"."0.3.14"."rustc_demangle"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.14".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.14".backtrace_sys}" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") || abi == "sgx" then mapFeatures features ([ + (crates."libc"."${deps."backtrace"."0.3.14"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."backtrace"."0.3.14"."winapi"}" deps) + ]) else []); + + buildDependencies = mapFeatures features ([ + (crates."autocfg"."${deps."backtrace"."0.3.14"."autocfg"}" deps) + ]); + features = mkFeatures (features."backtrace"."0.3.14" or {}); + }; + features_.backtrace."0.3.14" = deps: f: updateFeatures f (rec { + autocfg."${deps.backtrace."0.3.14".autocfg}".default = true; + backtrace = fold recursiveUpdate {} [ + { "0.3.14"."addr2line" = + (f.backtrace."0.3.14"."addr2line" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."backtrace-sys" = + (f.backtrace."0.3.14"."backtrace-sys" or false) || + (f.backtrace."0.3.14".libbacktrace or false) || + (backtrace."0.3.14"."libbacktrace" or false); } + { "0.3.14"."coresymbolication" = + (f.backtrace."0.3.14"."coresymbolication" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."dbghelp" = + (f.backtrace."0.3.14"."dbghelp" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."dladdr" = + (f.backtrace."0.3.14"."dladdr" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."findshlibs" = + (f.backtrace."0.3.14"."findshlibs" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."gimli" = + (f.backtrace."0.3.14"."gimli" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."libbacktrace" = + (f.backtrace."0.3.14"."libbacktrace" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."libunwind" = + (f.backtrace."0.3.14"."libunwind" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false); } + { "0.3.14"."memmap" = + (f.backtrace."0.3.14"."memmap" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."object" = + (f.backtrace."0.3.14"."object" or false) || + (f.backtrace."0.3.14".gimli-symbolize or false) || + (backtrace."0.3.14"."gimli-symbolize" or false); } + { "0.3.14"."rustc-serialize" = + (f.backtrace."0.3.14"."rustc-serialize" or false) || + (f.backtrace."0.3.14".serialize-rustc or false) || + (backtrace."0.3.14"."serialize-rustc" or false); } + { "0.3.14"."serde" = + (f.backtrace."0.3.14"."serde" or false) || + (f.backtrace."0.3.14".serialize-serde or false) || + (backtrace."0.3.14"."serialize-serde" or false); } + { "0.3.14"."serde_derive" = + (f.backtrace."0.3.14"."serde_derive" or false) || + (f.backtrace."0.3.14".serialize-serde or false) || + (backtrace."0.3.14"."serialize-serde" or false); } + { "0.3.14"."std" = + (f.backtrace."0.3.14"."std" or false) || + (f.backtrace."0.3.14".default or false) || + (backtrace."0.3.14"."default" or false) || + (f.backtrace."0.3.14".libbacktrace or false) || + (backtrace."0.3.14"."libbacktrace" or false); } + { "0.3.14".default = (f.backtrace."0.3.14".default or true); } + ]; + backtrace_sys."${deps.backtrace."0.3.14".backtrace_sys}".default = true; + cfg_if."${deps.backtrace."0.3.14".cfg_if}".default = true; + libc."${deps.backtrace."0.3.14".libc}".default = (f.libc."${deps.backtrace."0.3.14".libc}".default or false); + rustc_demangle."${deps.backtrace."0.3.14".rustc_demangle}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.backtrace."0.3.14".winapi}"."dbghelp" = true; } + { "${deps.backtrace."0.3.14".winapi}"."minwindef" = true; } + { "${deps.backtrace."0.3.14".winapi}"."processthreadsapi" = true; } + { "${deps.backtrace."0.3.14".winapi}"."winnt" = true; } + { "${deps.backtrace."0.3.14".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."backtrace"."0.3.14"."cfg_if"}" deps) + (features_.rustc_demangle."${deps."backtrace"."0.3.14"."rustc_demangle"}" deps) + (features_.autocfg."${deps."backtrace"."0.3.14"."autocfg"}" deps) + (features_.backtrace_sys."${deps."backtrace"."0.3.14"."backtrace_sys"}" deps) + (features_.libc."${deps."backtrace"."0.3.14"."libc"}" deps) + (features_.winapi."${deps."backtrace"."0.3.14"."winapi"}" deps) + ]; + + +# end # backtrace-0.3.9 crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate { @@ -285,6 +472,34 @@ rec { # end +# backtrace-sys-0.1.28 + + crates.backtrace_sys."0.1.28" = deps: { features?(features_.backtrace_sys."0.1.28" deps {}) }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.28"; + description = "Bindings to the libbacktrace gcc library\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1bbw8chs0wskxwzz7f3yy7mjqhyqj8lslq8pcjw1rbd2g23c34xl"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."backtrace_sys"."0.1.28"."libc"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."backtrace_sys"."0.1.28"."cc"}" deps) + ]); + }; + features_.backtrace_sys."0.1.28" = deps: f: updateFeatures f (rec { + backtrace_sys."0.1.28".default = (f.backtrace_sys."0.1.28".default or true); + cc."${deps.backtrace_sys."0.1.28".cc}".default = true; + libc."${deps.backtrace_sys."0.1.28".libc}".default = (f.libc."${deps.backtrace_sys."0.1.28".libc}".default or false); + }) [ + (features_.libc."${deps."backtrace_sys"."0.1.28"."libc"}" deps) + (features_.cc."${deps."backtrace_sys"."0.1.28"."cc"}" deps) + ]; + + +# end # bitflags-1.0.4 crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate { @@ -338,6 +553,72 @@ rec { # end +# carnix-0.10.0 + + crates.carnix."0.10.0" = deps: { features?(features_.carnix."0.10.0" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.10.0"; + description = "Generate Nix expressions from Cargo.lock files (in order to use Nix as a build system for crates)."; + authors = [ "pe@pijul.org <pe@pijul.org>" ]; + sha256 = "0hrp22yvrqnhaanr0ckrwihx9j3irhzd2cmb19sp49ksdi25d8ri"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.10.0"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.10.0"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.10.0"."env_logger"}" deps) + (crates."failure"."${deps."carnix"."0.10.0"."failure"}" deps) + (crates."failure_derive"."${deps."carnix"."0.10.0"."failure_derive"}" deps) + (crates."itertools"."${deps."carnix"."0.10.0"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.10.0"."log"}" deps) + (crates."nom"."${deps."carnix"."0.10.0"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.10.0"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.10.0"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.10.0"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.10.0"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.10.0"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.10.0"."toml"}" deps) + (crates."url"."${deps."carnix"."0.10.0"."url"}" deps) + ]); + }; + features_.carnix."0.10.0" = deps: f: updateFeatures f (rec { + carnix."0.10.0".default = (f.carnix."0.10.0".default or true); + clap."${deps.carnix."0.10.0".clap}".default = true; + dirs."${deps.carnix."0.10.0".dirs}".default = true; + env_logger."${deps.carnix."0.10.0".env_logger}".default = true; + failure."${deps.carnix."0.10.0".failure}".default = true; + failure_derive."${deps.carnix."0.10.0".failure_derive}".default = true; + itertools."${deps.carnix."0.10.0".itertools}".default = true; + log."${deps.carnix."0.10.0".log}".default = true; + nom."${deps.carnix."0.10.0".nom}".default = true; + regex."${deps.carnix."0.10.0".regex}".default = true; + serde."${deps.carnix."0.10.0".serde}".default = true; + serde_derive."${deps.carnix."0.10.0".serde_derive}".default = true; + serde_json."${deps.carnix."0.10.0".serde_json}".default = true; + tempdir."${deps.carnix."0.10.0".tempdir}".default = true; + toml."${deps.carnix."0.10.0".toml}".default = true; + url."${deps.carnix."0.10.0".url}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.10.0"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.10.0"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.10.0"."env_logger"}" deps) + (features_.failure."${deps."carnix"."0.10.0"."failure"}" deps) + (features_.failure_derive."${deps."carnix"."0.10.0"."failure_derive"}" deps) + (features_.itertools."${deps."carnix"."0.10.0"."itertools"}" deps) + (features_.log."${deps."carnix"."0.10.0"."log"}" deps) + (features_.nom."${deps."carnix"."0.10.0"."nom"}" deps) + (features_.regex."${deps."carnix"."0.10.0"."regex"}" deps) + (features_.serde."${deps."carnix"."0.10.0"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.10.0"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.10.0"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.10.0"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.10.0"."toml"}" deps) + (features_.url."${deps."carnix"."0.10.0"."url"}" deps) + ]; + + +# end # carnix-0.9.1 crates.carnix."0.9.1" = deps: { features?(features_.carnix."0.9.1" deps {}) }: buildRustCrate { @@ -541,6 +822,30 @@ rec { # end +# cc-1.0.32 + + crates.cc."1.0.32" = deps: { features?(features_.cc."1.0.32" deps {}) }: buildRustCrate { + crateName = "cc"; + version = "1.0.32"; + description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0mq4ma94yis74dnn98w2wkaad195dr6qwlma4fs590xiv0j15ldx"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."cc"."1.0.32" or {}); + }; + features_.cc."1.0.32" = deps: f: updateFeatures f (rec { + cc = fold recursiveUpdate {} [ + { "1.0.32"."rayon" = + (f.cc."1.0.32"."rayon" or false) || + (f.cc."1.0.32".parallel or false) || + (cc."1.0.32"."parallel" or false); } + { "1.0.32".default = (f.cc."1.0.32".default or true); } + ]; + }) []; + + +# end # cfg-if-0.1.6 crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate { @@ -555,6 +860,21 @@ rec { # end +# cfg-if-0.1.7 + + crates.cfg_if."0.1.7" = deps: { features?(features_.cfg_if."0.1.7" deps {}) }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.7"; + description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "13gvcx1dxjq4mpmpj26hpg3yc97qffkx2zi58ykr1dwr8q2biiig"; + }; + features_.cfg_if."0.1.7" = deps: f: updateFeatures f (rec { + cfg_if."0.1.7".default = (f.cfg_if."0.1.7".default or true); + }) []; + + +# end # clap-2.32.0 crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate { @@ -644,6 +964,35 @@ rec { # end +# cloudabi-0.0.3 + + crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate { + crateName = "cloudabi"; + version = "0.0.3"; + description = "Low level interface to CloudABI. Contains all syscalls and related types."; + authors = [ "Nuxi (https://nuxi.nl/) and contributors" ]; + sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5"; + libPath = "cloudabi.rs"; + dependencies = mapFeatures features ([ + ] + ++ (if features.cloudabi."0.0.3".bitflags or false then [ (crates.bitflags."${deps."cloudabi"."0.0.3".bitflags}" deps) ] else [])); + features = mkFeatures (features."cloudabi"."0.0.3" or {}); + }; + features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true; + cloudabi = fold recursiveUpdate {} [ + { "0.0.3"."bitflags" = + (f.cloudabi."0.0.3"."bitflags" or false) || + (f.cloudabi."0.0.3".default or false) || + (cloudabi."0.0.3"."default" or false); } + { "0.0.3".default = (f.cloudabi."0.0.3".default or true); } + ]; + }) [ + (features_.bitflags."${deps."cloudabi"."0.0.3"."bitflags"}" deps) + ]; + + +# end # constant_time_eq-0.1.3 crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate { @@ -695,6 +1044,44 @@ rec { # end +# dirs-1.0.5 + + crates.dirs."1.0.5" = deps: { features?(features_.dirs."1.0.5" deps {}) }: buildRustCrate { + crateName = "dirs"; + version = "1.0.5"; + description = "A tiny low-level library that provides platform-specific standard locations of directories for config, cache and other data on Linux, Windows, macOS and Redox by leveraging the mechanisms defined by the XDG base/user directory specifications on Linux, the Known Folder API on Windows, and the Standard Directory guidelines on macOS."; + authors = [ "Simon Ochsenreither <simon@ochsenreither.de>" ]; + sha256 = "1py68zwwrhlj5vbz9f9ansjmhc8y4gs5bpamw9ycmqz030pprwf3"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."redox_users"."${deps."dirs"."1.0.5"."redox_users"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."dirs"."1.0.5"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."dirs"."1.0.5"."winapi"}" deps) + ]) else []); + }; + features_.dirs."1.0.5" = deps: f: updateFeatures f (rec { + dirs."1.0.5".default = (f.dirs."1.0.5".default or true); + libc."${deps.dirs."1.0.5".libc}".default = true; + redox_users."${deps.dirs."1.0.5".redox_users}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.dirs."1.0.5".winapi}"."knownfolders" = true; } + { "${deps.dirs."1.0.5".winapi}"."objbase" = true; } + { "${deps.dirs."1.0.5".winapi}"."shlobj" = true; } + { "${deps.dirs."1.0.5".winapi}"."winbase" = true; } + { "${deps.dirs."1.0.5".winapi}"."winerror" = true; } + { "${deps.dirs."1.0.5".winapi}".default = true; } + ]; + }) [ + (features_.redox_users."${deps."dirs"."1.0.5"."redox_users"}" deps) + (features_.libc."${deps."dirs"."1.0.5"."libc"}" deps) + (features_.winapi."${deps."dirs"."1.0.5"."winapi"}" deps) + ]; + + +# end # either-1.5.0 crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate { @@ -718,6 +1105,30 @@ rec { # end +# either-1.5.1 + + crates.either."1.5.1" = deps: { features?(features_.either."1.5.1" deps {}) }: buildRustCrate { + crateName = "either"; + version = "1.5.1"; + description = "The enum `Either` with variants `Left` and `Right` is a general purpose sum type with two cases.\n"; + authors = [ "bluss" ]; + sha256 = "049dmvnyrrhf0fw955jrfazdapdl84x32grwwxllh8in39yv3783"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."either"."1.5.1" or {}); + }; + features_.either."1.5.1" = deps: f: updateFeatures f (rec { + either = fold recursiveUpdate {} [ + { "1.5.1"."use_std" = + (f.either."1.5.1"."use_std" or false) || + (f.either."1.5.1".default or false) || + (either."1.5.1"."default" or false); } + { "1.5.1".default = (f.either."1.5.1".default or true); } + ]; + }) []; + + +# end # env_logger-0.5.13 crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate { @@ -760,6 +1171,61 @@ rec { # end +# env_logger-0.6.1 + + crates.env_logger."0.6.1" = deps: { features?(features_.env_logger."0.6.1" deps {}) }: buildRustCrate { + crateName = "env_logger"; + version = "0.6.1"; + description = "A logging implementation for `log` which is configured via an environment\nvariable.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1d02i2yaqpnmbgw42pf0hd56ddd9jr4zq5yypbmfvc8rs13x0jql"; + dependencies = mapFeatures features ([ + (crates."log"."${deps."env_logger"."0.6.1"."log"}" deps) + ] + ++ (if features.env_logger."0.6.1".atty or false then [ (crates.atty."${deps."env_logger"."0.6.1".atty}" deps) ] else []) + ++ (if features.env_logger."0.6.1".humantime or false then [ (crates.humantime."${deps."env_logger"."0.6.1".humantime}" deps) ] else []) + ++ (if features.env_logger."0.6.1".regex or false then [ (crates.regex."${deps."env_logger"."0.6.1".regex}" deps) ] else []) + ++ (if features.env_logger."0.6.1".termcolor or false then [ (crates.termcolor."${deps."env_logger"."0.6.1".termcolor}" deps) ] else [])); + features = mkFeatures (features."env_logger"."0.6.1" or {}); + }; + features_.env_logger."0.6.1" = deps: f: updateFeatures f (rec { + atty."${deps.env_logger."0.6.1".atty}".default = true; + env_logger = fold recursiveUpdate {} [ + { "0.6.1"."atty" = + (f.env_logger."0.6.1"."atty" or false) || + (f.env_logger."0.6.1".default or false) || + (env_logger."0.6.1"."default" or false); } + { "0.6.1"."humantime" = + (f.env_logger."0.6.1"."humantime" or false) || + (f.env_logger."0.6.1".default or false) || + (env_logger."0.6.1"."default" or false); } + { "0.6.1"."regex" = + (f.env_logger."0.6.1"."regex" or false) || + (f.env_logger."0.6.1".default or false) || + (env_logger."0.6.1"."default" or false); } + { "0.6.1"."termcolor" = + (f.env_logger."0.6.1"."termcolor" or false) || + (f.env_logger."0.6.1".default or false) || + (env_logger."0.6.1"."default" or false); } + { "0.6.1".default = (f.env_logger."0.6.1".default or true); } + ]; + humantime."${deps.env_logger."0.6.1".humantime}".default = true; + log = fold recursiveUpdate {} [ + { "${deps.env_logger."0.6.1".log}"."std" = true; } + { "${deps.env_logger."0.6.1".log}".default = true; } + ]; + regex."${deps.env_logger."0.6.1".regex}".default = true; + termcolor."${deps.env_logger."0.6.1".termcolor}".default = true; + }) [ + (features_.atty."${deps."env_logger"."0.6.1"."atty"}" deps) + (features_.humantime."${deps."env_logger"."0.6.1"."humantime"}" deps) + (features_.log."${deps."env_logger"."0.6.1"."log"}" deps) + (features_.regex."${deps."env_logger"."0.6.1"."regex"}" deps) + (features_.termcolor."${deps."env_logger"."0.6.1"."termcolor"}" deps) + ]; + + +# end # error-chain-0.12.0 crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate { @@ -833,6 +1299,49 @@ rec { # end +# failure-0.1.5 + + crates.failure."0.1.5" = deps: { features?(features_.failure."0.1.5" deps {}) }: buildRustCrate { + crateName = "failure"; + version = "0.1.5"; + description = "Experimental error handling abstraction."; + authors = [ "Without Boats <boats@mozilla.com>" ]; + sha256 = "1msaj1c0fg12dzyf4fhxqlx1gfx41lj2smdjmkc9hkrgajk2g3kx"; + dependencies = mapFeatures features ([ + ] + ++ (if features.failure."0.1.5".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.5".backtrace}" deps) ] else []) + ++ (if features.failure."0.1.5".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.5".failure_derive}" deps) ] else [])); + features = mkFeatures (features."failure"."0.1.5" or {}); + }; + features_.failure."0.1.5" = deps: f: updateFeatures f (rec { + backtrace."${deps.failure."0.1.5".backtrace}".default = true; + failure = fold recursiveUpdate {} [ + { "0.1.5"."backtrace" = + (f.failure."0.1.5"."backtrace" or false) || + (f.failure."0.1.5".std or false) || + (failure."0.1.5"."std" or false); } + { "0.1.5"."derive" = + (f.failure."0.1.5"."derive" or false) || + (f.failure."0.1.5".default or false) || + (failure."0.1.5"."default" or false); } + { "0.1.5"."failure_derive" = + (f.failure."0.1.5"."failure_derive" or false) || + (f.failure."0.1.5".derive or false) || + (failure."0.1.5"."derive" or false); } + { "0.1.5"."std" = + (f.failure."0.1.5"."std" or false) || + (f.failure."0.1.5".default or false) || + (failure."0.1.5"."default" or false); } + { "0.1.5".default = (f.failure."0.1.5".default or true); } + ]; + failure_derive."${deps.failure."0.1.5".failure_derive}".default = true; + }) [ + (features_.backtrace."${deps."failure"."0.1.5"."backtrace"}" deps) + (features_.failure_derive."${deps."failure"."0.1.5"."failure_derive"}" deps) + ]; + + +# end # failure_derive-0.1.3 crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate { @@ -865,6 +1374,55 @@ rec { # end +# failure_derive-0.1.5 + + crates.failure_derive."0.1.5" = deps: { features?(features_.failure_derive."0.1.5" deps {}) }: buildRustCrate { + crateName = "failure_derive"; + version = "0.1.5"; + description = "derives for the failure crate"; + authors = [ "Without Boats <woboats@gmail.com>" ]; + sha256 = "1wzk484b87r4qszcvdl2bkniv5ls4r2f2dshz7hmgiv6z4ln12g0"; + procMacro = true; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."failure_derive"."0.1.5"."proc_macro2"}" deps) + (crates."quote"."${deps."failure_derive"."0.1.5"."quote"}" deps) + (crates."syn"."${deps."failure_derive"."0.1.5"."syn"}" deps) + (crates."synstructure"."${deps."failure_derive"."0.1.5"."synstructure"}" deps) + ]); + features = mkFeatures (features."failure_derive"."0.1.5" or {}); + }; + features_.failure_derive."0.1.5" = deps: f: updateFeatures f (rec { + failure_derive."0.1.5".default = (f.failure_derive."0.1.5".default or true); + proc_macro2."${deps.failure_derive."0.1.5".proc_macro2}".default = true; + quote."${deps.failure_derive."0.1.5".quote}".default = true; + syn."${deps.failure_derive."0.1.5".syn}".default = true; + synstructure."${deps.failure_derive."0.1.5".synstructure}".default = true; + }) [ + (features_.proc_macro2."${deps."failure_derive"."0.1.5"."proc_macro2"}" deps) + (features_.quote."${deps."failure_derive"."0.1.5"."quote"}" deps) + (features_.syn."${deps."failure_derive"."0.1.5"."syn"}" deps) + (features_.synstructure."${deps."failure_derive"."0.1.5"."synstructure"}" deps) + ]; + + +# end +# fuchsia-cprng-0.1.1 + + crates.fuchsia_cprng."0.1.1" = deps: { features?(features_.fuchsia_cprng."0.1.1" deps {}) }: buildRustCrate { + crateName = "fuchsia-cprng"; + version = "0.1.1"; + description = "Rust crate for the Fuchsia cryptographically secure pseudorandom number generator"; + authors = [ "Erick Tryzelaar <etryzelaar@google.com>" ]; + edition = "2018"; + sha256 = "07apwv9dj716yjlcj29p94vkqn5zmfh7hlrqvrjx3wzshphc95h9"; + }; + features_.fuchsia_cprng."0.1.1" = deps: f: updateFeatures f (rec { + fuchsia_cprng."0.1.1".default = (f.fuchsia_cprng."0.1.1".default or true); + }) []; + + +# end # fuchsia-zircon-0.3.3 crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { @@ -923,6 +1481,28 @@ rec { # end +# humantime-1.2.0 + + crates.humantime."1.2.0" = deps: { features?(features_.humantime."1.2.0" deps {}) }: buildRustCrate { + crateName = "humantime"; + version = "1.2.0"; + description = " A parser and formatter for std::time::{Duration, SystemTime}\n"; + authors = [ "Paul Colomiets <paul@colomiets.name>" ]; + sha256 = "0wlcxzz2mhq0brkfbjb12hc6jm17bgm8m6pdgblw4qjwmf26aw28"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."quick_error"."${deps."humantime"."1.2.0"."quick_error"}" deps) + ]); + }; + features_.humantime."1.2.0" = deps: f: updateFeatures f (rec { + humantime."1.2.0".default = (f.humantime."1.2.0".default or true); + quick_error."${deps.humantime."1.2.0".quick_error}".default = true; + }) [ + (features_.quick_error."${deps."humantime"."1.2.0"."quick_error"}" deps) + ]; + + +# end # idna-0.1.5 crates.idna."0.1.5" = deps: { features?(features_.idna."0.1.5" deps {}) }: buildRustCrate { @@ -976,6 +1556,34 @@ rec { # end +# itertools-0.8.0 + + crates.itertools."0.8.0" = deps: { features?(features_.itertools."0.8.0" deps {}) }: buildRustCrate { + crateName = "itertools"; + version = "0.8.0"; + description = "Extra iterator adaptors, iterator methods, free functions, and macros."; + authors = [ "bluss" ]; + sha256 = "0xpz59yf03vyj540i7sqypn2aqfid08c4vzyg0l6rqm08da77n7n"; + dependencies = mapFeatures features ([ + (crates."either"."${deps."itertools"."0.8.0"."either"}" deps) + ]); + features = mkFeatures (features."itertools"."0.8.0" or {}); + }; + features_.itertools."0.8.0" = deps: f: updateFeatures f (rec { + either."${deps.itertools."0.8.0".either}".default = (f.either."${deps.itertools."0.8.0".either}".default or false); + itertools = fold recursiveUpdate {} [ + { "0.8.0"."use_std" = + (f.itertools."0.8.0"."use_std" or false) || + (f.itertools."0.8.0".default or false) || + (itertools."0.8.0"."default" or false); } + { "0.8.0".default = (f.itertools."0.8.0".default or true); } + ]; + }) [ + (features_.either."${deps."itertools"."0.8.0"."either"}" deps) + ]; + + +# end # itoa-0.4.3 crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate { @@ -1032,6 +1640,30 @@ rec { # end +# lazy_static-1.3.0 + + crates.lazy_static."1.3.0" = deps: { features?(features_.lazy_static."1.3.0" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "1.3.0"; + description = "A macro for declaring lazily evaluated statics in Rust."; + authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; + sha256 = "1vv47va18ydk7dx5paz88g3jy1d3lwbx6qpxkbj8gyfv770i4b1y"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazy_static"."1.3.0" or {}); + }; + features_.lazy_static."1.3.0" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "1.3.0"."spin" = + (f.lazy_static."1.3.0"."spin" or false) || + (f.lazy_static."1.3.0".spin_no_std or false) || + (lazy_static."1.3.0"."spin_no_std" or false); } + { "1.3.0".default = (f.lazy_static."1.3.0".default or true); } + ]; + }) []; + + +# end # libc-0.2.43 crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate { @@ -1053,6 +1685,39 @@ rec { # end +# libc-0.2.50 + + crates.libc."0.2.50" = deps: { features?(features_.libc."0.2.50" deps {}) }: buildRustCrate { + crateName = "libc"; + version = "0.2.50"; + description = "Raw FFI bindings to platform libraries like libc.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "14y4zm0xp2xbj3l1kxqf2wpl58xb7hglxdbfx5dcxjlchbvk5dzs"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."libc"."0.2.50" or {}); + }; + features_.libc."0.2.50" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "0.2.50"."align" = + (f.libc."0.2.50"."align" or false) || + (f.libc."0.2.50".rustc-dep-of-std or false) || + (libc."0.2.50"."rustc-dep-of-std" or false); } + { "0.2.50"."rustc-std-workspace-core" = + (f.libc."0.2.50"."rustc-std-workspace-core" or false) || + (f.libc."0.2.50".rustc-dep-of-std or false) || + (libc."0.2.50"."rustc-dep-of-std" or false); } + { "0.2.50"."use_std" = + (f.libc."0.2.50"."use_std" or false) || + (f.libc."0.2.50".default or false) || + (libc."0.2.50"."default" or false); } + { "0.2.50".default = (f.libc."0.2.50".default or true); } + ]; + }) []; + + +# end # log-0.4.5 crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate { @@ -1074,6 +1739,28 @@ rec { # end +# log-0.4.6 + + crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate { + crateName = "log"; + version = "0.4.6"; + description = "A lightweight logging facade for Rust\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."log"."0.4.6"."cfg_if"}" deps) + ]); + features = mkFeatures (features."log"."0.4.6" or {}); + }; + features_.log."0.4.6" = deps: f: updateFeatures f (rec { + cfg_if."${deps.log."0.4.6".cfg_if}".default = true; + log."0.4.6".default = (f.log."0.4.6".default or true); + }) [ + (features_.cfg_if."${deps."log"."0.4.6"."cfg_if"}" deps) + ]; + + +# end # matches-0.1.8 crates.matches."0.1.8" = deps: { features?(features_.matches."0.1.8" deps {}) }: buildRustCrate { @@ -1176,6 +1863,30 @@ rec { # end +# memchr-2.2.0 + + crates.memchr."2.2.0" = deps: { features?(features_.memchr."2.2.0" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "2.2.0"; + description = "Safe interface to memchr."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; + sha256 = "11vwg8iig9jyjxq3n1cq15g29ikzw5l7ar87md54k1aisjs0997p"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."memchr"."2.2.0" or {}); + }; + features_.memchr."2.2.0" = deps: f: updateFeatures f (rec { + memchr = fold recursiveUpdate {} [ + { "2.2.0"."use_std" = + (f.memchr."2.2.0"."use_std" or false) || + (f.memchr."2.2.0".default or false) || + (memchr."2.2.0"."default" or false); } + { "2.2.0".default = (f.memchr."2.2.0".default or true); } + ]; + }) []; + + +# end # nodrop-0.1.12 crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate { @@ -1203,6 +1914,34 @@ rec { # end +# nodrop-0.1.13 + + crates.nodrop."0.1.13" = deps: { features?(features_.nodrop."0.1.13" deps {}) }: buildRustCrate { + crateName = "nodrop"; + version = "0.1.13"; + description = "A wrapper type to inhibit drop (destructor). Use std::mem::ManuallyDrop instead!"; + authors = [ "bluss" ]; + sha256 = "0gkfx6wihr9z0m8nbdhma5pyvbipznjpkzny2d4zkc05b0vnhinb"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."nodrop"."0.1.13" or {}); + }; + features_.nodrop."0.1.13" = deps: f: updateFeatures f (rec { + nodrop = fold recursiveUpdate {} [ + { "0.1.13"."nodrop-union" = + (f.nodrop."0.1.13"."nodrop-union" or false) || + (f.nodrop."0.1.13".use_union or false) || + (nodrop."0.1.13"."use_union" or false); } + { "0.1.13"."std" = + (f.nodrop."0.1.13"."std" or false) || + (f.nodrop."0.1.13".default or false) || + (nodrop."0.1.13"."default" or false); } + { "0.1.13".default = (f.nodrop."0.1.13".default or true); } + ]; + }) []; + + +# end # nom-3.2.1 crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate { @@ -1301,6 +2040,35 @@ rec { # end +# proc-macro2-0.4.27 + + crates.proc_macro2."0.4.27" = deps: { features?(features_.proc_macro2."0.4.27" deps {}) }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.4.27"; + description = "A stable implementation of the upcoming new `proc_macro` API. Comes with an\noption, off by default, to also reimplement itself in terms of the upstream\nunstable API.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "1cp4c40p3hwn2sz72ssqa62gp5n8w4gbamdqvvadzp5l7gxnq95i"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."unicode_xid"."${deps."proc_macro2"."0.4.27"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."proc_macro2"."0.4.27" or {}); + }; + features_.proc_macro2."0.4.27" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "0.4.27"."proc-macro" = + (f.proc_macro2."0.4.27"."proc-macro" or false) || + (f.proc_macro2."0.4.27".default or false) || + (proc_macro2."0.4.27"."default" or false); } + { "0.4.27".default = (f.proc_macro2."0.4.27".default or true); } + ]; + unicode_xid."${deps.proc_macro2."0.4.27".unicode_xid}".default = true; + }) [ + (features_.unicode_xid."${deps."proc_macro2"."0.4.27"."unicode_xid"}" deps) + ]; + + +# end # quick-error-1.2.2 crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate { @@ -1315,6 +2083,40 @@ rec { # end +# quote-0.6.11 + + crates.quote."0.6.11" = deps: { features?(features_.quote."0.6.11" deps {}) }: buildRustCrate { + crateName = "quote"; + version = "0.6.11"; + description = "Quasi-quoting macro quote!(...)"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0agska77z58cypcq4knayzwx7r7n6m756z1cz9cp2z4sv0b846ga"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."quote"."0.6.11"."proc_macro2"}" deps) + ]); + features = mkFeatures (features."quote"."0.6.11" or {}); + }; + features_.quote."0.6.11" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.quote."0.6.11".proc_macro2}"."proc-macro" = + (f.proc_macro2."${deps.quote."0.6.11".proc_macro2}"."proc-macro" or false) || + (quote."0.6.11"."proc-macro" or false) || + (f."quote"."0.6.11"."proc-macro" or false); } + { "${deps.quote."0.6.11".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.11".proc_macro2}".default or false); } + ]; + quote = fold recursiveUpdate {} [ + { "0.6.11"."proc-macro" = + (f.quote."0.6.11"."proc-macro" or false) || + (f.quote."0.6.11".default or false) || + (quote."0.6.11"."default" or false); } + { "0.6.11".default = (f.quote."0.6.11".default or true); } + ]; + }) [ + (features_.proc_macro2."${deps."quote"."0.6.11"."proc_macro2"}" deps) + ]; + + +# end # quote-0.6.8 crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate { @@ -1399,6 +2201,222 @@ rec { # end +# rand-0.4.6 + + crates.rand."0.4.6" = deps: { features?(features_.rand."0.4.6" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.4.6"; + description = "Random number generators and other randomness functionality.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0c3rmg5q7d6qdi7cbmg5py9alm70wd3xsg0mmcawrnl35qv37zfs"; + dependencies = (if abi == "sgx" then mapFeatures features ([ + (crates."rand_core"."${deps."rand"."0.4.6"."rand_core"}" deps) + (crates."rdrand"."${deps."rand"."0.4.6"."rdrand"}" deps) + ]) else []) + ++ (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_cprng"."${deps."rand"."0.4.6"."fuchsia_cprng"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.4.6".libc or false then [ (crates.libc."${deps."rand"."0.4.6".libc}" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand"."0.4.6"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."rand"."0.4.6" or {}); + }; + features_.rand."0.4.6" = deps: f: updateFeatures f (rec { + fuchsia_cprng."${deps.rand."0.4.6".fuchsia_cprng}".default = true; + libc."${deps.rand."0.4.6".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.4.6"."i128_support" = + (f.rand."0.4.6"."i128_support" or false) || + (f.rand."0.4.6".nightly or false) || + (rand."0.4.6"."nightly" or false); } + { "0.4.6"."libc" = + (f.rand."0.4.6"."libc" or false) || + (f.rand."0.4.6".std or false) || + (rand."0.4.6"."std" or false); } + { "0.4.6"."std" = + (f.rand."0.4.6"."std" or false) || + (f.rand."0.4.6".default or false) || + (rand."0.4.6"."default" or false); } + { "0.4.6".default = (f.rand."0.4.6".default or true); } + ]; + rand_core."${deps.rand."0.4.6".rand_core}".default = (f.rand_core."${deps.rand."0.4.6".rand_core}".default or false); + rdrand."${deps.rand."0.4.6".rdrand}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.4.6".winapi}"."minwindef" = true; } + { "${deps.rand."0.4.6".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.4.6".winapi}"."profileapi" = true; } + { "${deps.rand."0.4.6".winapi}"."winnt" = true; } + { "${deps.rand."0.4.6".winapi}".default = true; } + ]; + }) [ + (features_.rand_core."${deps."rand"."0.4.6"."rand_core"}" deps) + (features_.rdrand."${deps."rand"."0.4.6"."rdrand"}" deps) + (features_.fuchsia_cprng."${deps."rand"."0.4.6"."fuchsia_cprng"}" deps) + (features_.libc."${deps."rand"."0.4.6"."libc"}" deps) + (features_.winapi."${deps."rand"."0.4.6"."winapi"}" deps) + ]; + + +# end +# rand_core-0.3.1 + + crates.rand_core."0.3.1" = deps: { features?(features_.rand_core."0.3.1" deps {}) }: buildRustCrate { + crateName = "rand_core"; + version = "0.3.1"; + description = "Core random number generator traits and tools for implementation.\n"; + authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; + sha256 = "0q0ssgpj9x5a6fda83nhmfydy7a6c0wvxm0jhncsmjx8qp8gw91m"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_core"."0.3.1"."rand_core"}" deps) + ]); + features = mkFeatures (features."rand_core"."0.3.1" or {}); + }; + features_.rand_core."0.3.1" = deps: f: updateFeatures f (rec { + rand_core = fold recursiveUpdate {} [ + { "${deps.rand_core."0.3.1".rand_core}"."alloc" = + (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."alloc" or false) || + (rand_core."0.3.1"."alloc" or false) || + (f."rand_core"."0.3.1"."alloc" or false); } + { "${deps.rand_core."0.3.1".rand_core}"."serde1" = + (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."serde1" or false) || + (rand_core."0.3.1"."serde1" or false) || + (f."rand_core"."0.3.1"."serde1" or false); } + { "${deps.rand_core."0.3.1".rand_core}"."std" = + (f.rand_core."${deps.rand_core."0.3.1".rand_core}"."std" or false) || + (rand_core."0.3.1"."std" or false) || + (f."rand_core"."0.3.1"."std" or false); } + { "${deps.rand_core."0.3.1".rand_core}".default = true; } + { "0.3.1"."std" = + (f.rand_core."0.3.1"."std" or false) || + (f.rand_core."0.3.1".default or false) || + (rand_core."0.3.1"."default" or false); } + { "0.3.1".default = (f.rand_core."0.3.1".default or true); } + ]; + }) [ + (features_.rand_core."${deps."rand_core"."0.3.1"."rand_core"}" deps) + ]; + + +# end +# rand_core-0.4.0 + + crates.rand_core."0.4.0" = deps: { features?(features_.rand_core."0.4.0" deps {}) }: buildRustCrate { + crateName = "rand_core"; + version = "0.4.0"; + description = "Core random number generator traits and tools for implementation.\n"; + authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; + sha256 = "0wb5iwhffibj0pnpznhv1g3i7h1fnhz64s3nz74fz6vsm3q6q3br"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."rand_core"."0.4.0" or {}); + }; + features_.rand_core."0.4.0" = deps: f: updateFeatures f (rec { + rand_core = fold recursiveUpdate {} [ + { "0.4.0"."alloc" = + (f.rand_core."0.4.0"."alloc" or false) || + (f.rand_core."0.4.0".std or false) || + (rand_core."0.4.0"."std" or false); } + { "0.4.0"."serde" = + (f.rand_core."0.4.0"."serde" or false) || + (f.rand_core."0.4.0".serde1 or false) || + (rand_core."0.4.0"."serde1" or false); } + { "0.4.0"."serde_derive" = + (f.rand_core."0.4.0"."serde_derive" or false) || + (f.rand_core."0.4.0".serde1 or false) || + (rand_core."0.4.0"."serde1" or false); } + { "0.4.0".default = (f.rand_core."0.4.0".default or true); } + ]; + }) []; + + +# end +# rand_os-0.1.3 + + crates.rand_os."0.1.3" = deps: { features?(features_.rand_os."0.1.3" deps {}) }: buildRustCrate { + crateName = "rand_os"; + version = "0.1.3"; + description = "OS backed Random Number Generator"; + authors = [ "The Rand Project Developers" ]; + sha256 = "0ywwspizgs9g8vzn6m5ix9yg36n15119d6n792h7mk4r5vs0ww4j"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rand_os"."0.1.3"."rand_core"}" deps) + ]) + ++ (if abi == "sgx" then mapFeatures features ([ + (crates."rdrand"."${deps."rand_os"."0.1.3"."rdrand"}" deps) + ]) else []) + ++ (if kernel == "cloudabi" then mapFeatures features ([ + (crates."cloudabi"."${deps."rand_os"."0.1.3"."cloudabi"}" deps) + ]) else []) + ++ (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_cprng"."${deps."rand_os"."0.1.3"."fuchsia_cprng"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."rand_os"."0.1.3"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand_os"."0.1.3"."winapi"}" deps) + ]) else []) + ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ +]) else []); + }; + features_.rand_os."0.1.3" = deps: f: updateFeatures f (rec { + cloudabi."${deps.rand_os."0.1.3".cloudabi}".default = true; + fuchsia_cprng."${deps.rand_os."0.1.3".fuchsia_cprng}".default = true; + libc."${deps.rand_os."0.1.3".libc}".default = true; + rand_core = fold recursiveUpdate {} [ + { "${deps.rand_os."0.1.3".rand_core}"."std" = true; } + { "${deps.rand_os."0.1.3".rand_core}".default = true; } + ]; + rand_os."0.1.3".default = (f.rand_os."0.1.3".default or true); + rdrand."${deps.rand_os."0.1.3".rdrand}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.rand_os."0.1.3".winapi}"."minwindef" = true; } + { "${deps.rand_os."0.1.3".winapi}"."ntsecapi" = true; } + { "${deps.rand_os."0.1.3".winapi}"."winnt" = true; } + { "${deps.rand_os."0.1.3".winapi}".default = true; } + ]; + }) [ + (features_.rand_core."${deps."rand_os"."0.1.3"."rand_core"}" deps) + (features_.rdrand."${deps."rand_os"."0.1.3"."rdrand"}" deps) + (features_.cloudabi."${deps."rand_os"."0.1.3"."cloudabi"}" deps) + (features_.fuchsia_cprng."${deps."rand_os"."0.1.3"."fuchsia_cprng"}" deps) + (features_.libc."${deps."rand_os"."0.1.3"."libc"}" deps) + (features_.winapi."${deps."rand_os"."0.1.3"."winapi"}" deps) + ]; + + +# end +# rdrand-0.4.0 + + crates.rdrand."0.4.0" = deps: { features?(features_.rdrand."0.4.0" deps {}) }: buildRustCrate { + crateName = "rdrand"; + version = "0.4.0"; + description = "An implementation of random number generator based on rdrand and rdseed instructions"; + authors = [ "Simonas Kazlauskas <rdrand@kazlauskas.me>" ]; + sha256 = "15hrcasn0v876wpkwab1dwbk9kvqwrb3iv4y4dibb6yxnfvzwajk"; + dependencies = mapFeatures features ([ + (crates."rand_core"."${deps."rdrand"."0.4.0"."rand_core"}" deps) + ]); + features = mkFeatures (features."rdrand"."0.4.0" or {}); + }; + features_.rdrand."0.4.0" = deps: f: updateFeatures f (rec { + rand_core."${deps.rdrand."0.4.0".rand_core}".default = (f.rand_core."${deps.rdrand."0.4.0".rand_core}".default or false); + rdrand = fold recursiveUpdate {} [ + { "0.4.0"."std" = + (f.rdrand."0.4.0"."std" or false) || + (f.rdrand."0.4.0".default or false) || + (rdrand."0.4.0"."default" or false); } + { "0.4.0".default = (f.rdrand."0.4.0".default or true); } + ]; + }) [ + (features_.rand_core."${deps."rdrand"."0.4.0"."rand_core"}" deps) + ]; + + +# end # redox_syscall-0.1.40 crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate { @@ -1414,6 +2432,22 @@ rec { # end +# redox_syscall-0.1.51 + + crates.redox_syscall."0.1.51" = deps: { features?(features_.redox_syscall."0.1.51" deps {}) }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.51"; + description = "A Rust library to access raw Redox system calls"; + authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; + sha256 = "1a61cv7yydx64vpyvzr0z0hwzdvy4gcvcnfc6k70zpkngj5sz3ip"; + libName = "syscall"; + }; + features_.redox_syscall."0.1.51" = deps: f: updateFeatures f (rec { + redox_syscall."0.1.51".default = (f.redox_syscall."0.1.51".default or true); + }) []; + + +# end # redox_termios-0.1.1 crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate { @@ -1464,6 +2498,36 @@ rec { # end +# redox_users-0.3.0 + + crates.redox_users."0.3.0" = deps: { features?(features_.redox_users."0.3.0" deps {}) }: buildRustCrate { + crateName = "redox_users"; + version = "0.3.0"; + description = "A Rust library to access Redox users and groups functionality"; + authors = [ "Jose Narvaez <goyox86@gmail.com>" "Wesley Hershberger <mggmugginsmc@gmail.com>" ]; + sha256 = "051rzqgk5hn7rf24nwgbb32zfdn8qp2kwqvdp0772ia85p737p4j"; + dependencies = mapFeatures features ([ + (crates."argon2rs"."${deps."redox_users"."0.3.0"."argon2rs"}" deps) + (crates."failure"."${deps."redox_users"."0.3.0"."failure"}" deps) + (crates."rand_os"."${deps."redox_users"."0.3.0"."rand_os"}" deps) + (crates."redox_syscall"."${deps."redox_users"."0.3.0"."redox_syscall"}" deps) + ]); + }; + features_.redox_users."0.3.0" = deps: f: updateFeatures f (rec { + argon2rs."${deps.redox_users."0.3.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.3.0".argon2rs}".default or false); + failure."${deps.redox_users."0.3.0".failure}".default = true; + rand_os."${deps.redox_users."0.3.0".rand_os}".default = true; + redox_syscall."${deps.redox_users."0.3.0".redox_syscall}".default = true; + redox_users."0.3.0".default = (f.redox_users."0.3.0".default or true); + }) [ + (features_.argon2rs."${deps."redox_users"."0.3.0"."argon2rs"}" deps) + (features_.failure."${deps."redox_users"."0.3.0"."failure"}" deps) + (features_.rand_os."${deps."redox_users"."0.3.0"."rand_os"}" deps) + (features_.redox_syscall."${deps."redox_users"."0.3.0"."redox_syscall"}" deps) + ]; + + +# end # regex-1.0.5 crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate { @@ -1507,6 +2571,50 @@ rec { # end +# regex-1.1.2 + + crates.regex."1.1.2" = deps: { features?(features_.regex."1.1.2" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "1.1.2"; + description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c9nb031z1vw5l6lzfkfra2mah9hb2s1wgq9f1lmgcbkiiprj9xd"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."1.1.2"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."1.1.2"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."1.1.2"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."1.1.2"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."1.1.2"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."1.1.2" or {}); + }; + features_.regex."1.1.2" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."1.1.2".aho_corasick}".default = true; + memchr."${deps.regex."1.1.2".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "1.1.2"."pattern" = + (f.regex."1.1.2"."pattern" or false) || + (f.regex."1.1.2".unstable or false) || + (regex."1.1.2"."unstable" or false); } + { "1.1.2"."use_std" = + (f.regex."1.1.2"."use_std" or false) || + (f.regex."1.1.2".default or false) || + (regex."1.1.2"."default" or false); } + { "1.1.2".default = (f.regex."1.1.2".default or true); } + ]; + regex_syntax."${deps.regex."1.1.2".regex_syntax}".default = true; + thread_local."${deps.regex."1.1.2".thread_local}".default = true; + utf8_ranges."${deps.regex."1.1.2".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."1.1.2"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."1.1.2"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."1.1.2"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."1.1.2"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."1.1.2"."utf8_ranges"}" deps) + ]; + + +# end # regex-syntax-0.6.2 crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate { @@ -1527,6 +2635,27 @@ rec { # end +# regex-syntax-0.6.5 + + crates.regex_syntax."0.6.5" = deps: { features?(features_.regex_syntax."0.6.5" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.6.5"; + description = "A regular expression parser."; + authors = [ "The Rust Project Developers" ]; + sha256 = "0aaaba1fan2qfyc31wzdmgmbmyirc27zgcbz41ba5wm1lb2d8kli"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.6.5" = deps: f: updateFeatures f (rec { + regex_syntax."0.6.5".default = (f.regex_syntax."0.6.5".default or true); + ucd_util."${deps.regex_syntax."0.6.5".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.6.5"."ucd_util"}" deps) + ]; + + +# end # remove_dir_all-0.5.1 crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate { @@ -1554,6 +2683,21 @@ rec { # end +# rustc-demangle-0.1.13 + + crates.rustc_demangle."0.1.13" = deps: { features?(features_.rustc_demangle."0.1.13" deps {}) }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.13"; + description = "Rust compiler symbol demangling.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0sr6cr02araqnlqwc5ghvnafjmkw11vzjswqaz757lvyrcl8xcy6"; + }; + features_.rustc_demangle."0.1.13" = deps: f: updateFeatures f (rec { + rustc_demangle."0.1.13".default = (f.rustc_demangle."0.1.13".default or true); + }) []; + + +# end # rustc-demangle-0.1.9 crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate { @@ -1586,6 +2730,25 @@ rec { # end +# ryu-0.2.7 + + crates.ryu."0.2.7" = deps: { features?(features_.ryu."0.2.7" deps {}) }: buildRustCrate { + crateName = "ryu"; + version = "0.2.7"; + description = "Fast floating point to string conversion"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0m8szf1m87wfqkwh1f9zp9bn2mb0m9nav028xxnd0hlig90b44bd"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."ryu"."0.2.7" or {}); + }; + features_.ryu."0.2.7" = deps: f: updateFeatures f (rec { + ryu."0.2.7".default = (f.ryu."0.2.7".default or true); + }) []; + + +# end # scoped_threadpool-0.1.9 crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate { @@ -1665,6 +2828,39 @@ rec { # end +# serde-1.0.89 + + crates.serde."1.0.89" = deps: { features?(features_.serde."1.0.89" deps {}) }: buildRustCrate { + crateName = "serde"; + version = "1.0.89"; + description = "A generic serialization/deserialization framework"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "14pidc6skkm92vhp431wi1aam5vv5g6rmsimik38wzb0qy72c71g"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."serde"."1.0.89" or {}); + }; + features_.serde."1.0.89" = deps: f: updateFeatures f (rec { + serde = fold recursiveUpdate {} [ + { "1.0.89"."serde_derive" = + (f.serde."1.0.89"."serde_derive" or false) || + (f.serde."1.0.89".derive or false) || + (serde."1.0.89"."derive" or false); } + { "1.0.89"."std" = + (f.serde."1.0.89"."std" or false) || + (f.serde."1.0.89".default or false) || + (serde."1.0.89"."default" or false); } + { "1.0.89"."unstable" = + (f.serde."1.0.89"."unstable" or false) || + (f.serde."1.0.89".alloc or false) || + (serde."1.0.89"."alloc" or false); } + { "1.0.89".default = (f.serde."1.0.89".default or true); } + ]; + }) []; + + +# end # serde_derive-1.0.80 crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate { @@ -1696,6 +2892,38 @@ rec { # end +# serde_derive-1.0.89 + + crates.serde_derive."1.0.89" = deps: { features?(features_.serde_derive."1.0.89" deps {}) }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.89"; + description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0wxbxq9sccrd939pfnrgfzykkwl9gag2yf7vxhg2c2p9kx36d3wm"; + procMacro = true; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."serde_derive"."1.0.89"."proc_macro2"}" deps) + (crates."quote"."${deps."serde_derive"."1.0.89"."quote"}" deps) + (crates."syn"."${deps."serde_derive"."1.0.89"."syn"}" deps) + ]); + features = mkFeatures (features."serde_derive"."1.0.89" or {}); + }; + features_.serde_derive."1.0.89" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.serde_derive."1.0.89".proc_macro2}".default = true; + quote."${deps.serde_derive."1.0.89".quote}".default = true; + serde_derive."1.0.89".default = (f.serde_derive."1.0.89".default or true); + syn = fold recursiveUpdate {} [ + { "${deps.serde_derive."1.0.89".syn}"."visit" = true; } + { "${deps.serde_derive."1.0.89".syn}".default = true; } + ]; + }) [ + (features_.proc_macro2."${deps."serde_derive"."1.0.89"."proc_macro2"}" deps) + (features_.quote."${deps."serde_derive"."1.0.89"."quote"}" deps) + (features_.syn."${deps."serde_derive"."1.0.89"."syn"}" deps) + ]; + + +# end # serde_json-1.0.32 crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate { @@ -1729,6 +2957,65 @@ rec { # end +# serde_json-1.0.39 + + crates.serde_json."1.0.39" = deps: { features?(features_.serde_json."1.0.39" deps {}) }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.39"; + description = "A JSON serialization file format"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "07ydv06hn8x0yl0rc94l2wl9r2xz1fqd97n1s6j3bgdc6gw406a8"; + dependencies = mapFeatures features ([ + (crates."itoa"."${deps."serde_json"."1.0.39"."itoa"}" deps) + (crates."ryu"."${deps."serde_json"."1.0.39"."ryu"}" deps) + (crates."serde"."${deps."serde_json"."1.0.39"."serde"}" deps) + ]); + features = mkFeatures (features."serde_json"."1.0.39" or {}); + }; + features_.serde_json."1.0.39" = deps: f: updateFeatures f (rec { + itoa."${deps.serde_json."1.0.39".itoa}".default = true; + ryu."${deps.serde_json."1.0.39".ryu}".default = true; + serde."${deps.serde_json."1.0.39".serde}".default = true; + serde_json = fold recursiveUpdate {} [ + { "1.0.39"."indexmap" = + (f.serde_json."1.0.39"."indexmap" or false) || + (f.serde_json."1.0.39".preserve_order or false) || + (serde_json."1.0.39"."preserve_order" or false); } + { "1.0.39".default = (f.serde_json."1.0.39".default or true); } + ]; + }) [ + (features_.itoa."${deps."serde_json"."1.0.39"."itoa"}" deps) + (features_.ryu."${deps."serde_json"."1.0.39"."ryu"}" deps) + (features_.serde."${deps."serde_json"."1.0.39"."serde"}" deps) + ]; + + +# end +# smallvec-0.6.9 + + crates.smallvec."0.6.9" = deps: { features?(features_.smallvec."0.6.9" deps {}) }: buildRustCrate { + crateName = "smallvec"; + version = "0.6.9"; + description = "'Small vector' optimization: store up to a small number of items on the stack"; + authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; + sha256 = "0p96l51a2pq5y0vn48nhbm6qslbc6k8h28cxm0pmzkqmj7xynz6w"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."smallvec"."0.6.9" or {}); + }; + features_.smallvec."0.6.9" = deps: f: updateFeatures f (rec { + smallvec = fold recursiveUpdate {} [ + { "0.6.9"."std" = + (f.smallvec."0.6.9"."std" or false) || + (f.smallvec."0.6.9".default or false) || + (smallvec."0.6.9"."default" or false); } + { "0.6.9".default = (f.smallvec."0.6.9".default or true); } + ]; + }) []; + + +# end # strsim-0.7.0 crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate { @@ -1808,6 +3095,72 @@ rec { # end +# syn-0.15.29 + + crates.syn."0.15.29" = deps: { features?(features_.syn."0.15.29" deps {}) }: buildRustCrate { + crateName = "syn"; + version = "0.15.29"; + description = "Parser for Rust source code"; + authors = [ "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "0wrd6awgc6f1iwfn2v9fvwyd2yddgxdjv9s106kvwg1ljbw3fajw"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."syn"."0.15.29"."proc_macro2"}" deps) + (crates."unicode_xid"."${deps."syn"."0.15.29"."unicode_xid"}" deps) + ] + ++ (if features.syn."0.15.29".quote or false then [ (crates.quote."${deps."syn"."0.15.29".quote}" deps) ] else [])); + features = mkFeatures (features."syn"."0.15.29" or {}); + }; + features_.syn."0.15.29" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.syn."0.15.29".proc_macro2}"."proc-macro" = + (f.proc_macro2."${deps.syn."0.15.29".proc_macro2}"."proc-macro" or false) || + (syn."0.15.29"."proc-macro" or false) || + (f."syn"."0.15.29"."proc-macro" or false); } + { "${deps.syn."0.15.29".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.29".proc_macro2}".default or false); } + ]; + quote = fold recursiveUpdate {} [ + { "${deps.syn."0.15.29".quote}"."proc-macro" = + (f.quote."${deps.syn."0.15.29".quote}"."proc-macro" or false) || + (syn."0.15.29"."proc-macro" or false) || + (f."syn"."0.15.29"."proc-macro" or false); } + { "${deps.syn."0.15.29".quote}".default = (f.quote."${deps.syn."0.15.29".quote}".default or false); } + ]; + syn = fold recursiveUpdate {} [ + { "0.15.29"."clone-impls" = + (f.syn."0.15.29"."clone-impls" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."derive" = + (f.syn."0.15.29"."derive" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."parsing" = + (f.syn."0.15.29"."parsing" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."printing" = + (f.syn."0.15.29"."printing" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."proc-macro" = + (f.syn."0.15.29"."proc-macro" or false) || + (f.syn."0.15.29".default or false) || + (syn."0.15.29"."default" or false); } + { "0.15.29"."quote" = + (f.syn."0.15.29"."quote" or false) || + (f.syn."0.15.29".printing or false) || + (syn."0.15.29"."printing" or false); } + { "0.15.29".default = (f.syn."0.15.29".default or true); } + ]; + unicode_xid."${deps.syn."0.15.29".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."syn"."0.15.29"."proc_macro2"}" deps) + (features_.quote."${deps."syn"."0.15.29"."quote"}" deps) + (features_.unicode_xid."${deps."syn"."0.15.29"."unicode_xid"}" deps) + ]; + + +# end # synstructure-0.10.0 crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate { @@ -1842,6 +3195,41 @@ rec { # end +# synstructure-0.10.1 + + crates.synstructure."0.10.1" = deps: { features?(features_.synstructure."0.10.1" deps {}) }: buildRustCrate { + crateName = "synstructure"; + version = "0.10.1"; + description = "Helper methods and macros for custom derives"; + authors = [ "Nika Layzell <nika@thelayzells.com>" ]; + sha256 = "0mx2vwd0d0f7hanz15nkp0ikkfjsx9rfkph7pynxyfbj45ank4g3"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."synstructure"."0.10.1"."proc_macro2"}" deps) + (crates."quote"."${deps."synstructure"."0.10.1"."quote"}" deps) + (crates."syn"."${deps."synstructure"."0.10.1"."syn"}" deps) + (crates."unicode_xid"."${deps."synstructure"."0.10.1"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."synstructure"."0.10.1" or {}); + }; + features_.synstructure."0.10.1" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.synstructure."0.10.1".proc_macro2}".default = true; + quote."${deps.synstructure."0.10.1".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "${deps.synstructure."0.10.1".syn}"."extra-traits" = true; } + { "${deps.synstructure."0.10.1".syn}"."visit" = true; } + { "${deps.synstructure."0.10.1".syn}".default = true; } + ]; + synstructure."0.10.1".default = (f.synstructure."0.10.1".default or true); + unicode_xid."${deps.synstructure."0.10.1".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."synstructure"."0.10.1"."proc_macro2"}" deps) + (features_.quote."${deps."synstructure"."0.10.1"."quote"}" deps) + (features_.syn."${deps."synstructure"."0.10.1"."syn"}" deps) + (features_.unicode_xid."${deps."synstructure"."0.10.1"."unicode_xid"}" deps) + ]; + + +# end # tempdir-0.3.7 crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate { @@ -1993,6 +3381,34 @@ rec { # end +# toml-0.5.0 + + crates.toml."0.5.0" = deps: { features?(features_.toml."0.5.0" deps {}) }: buildRustCrate { + crateName = "toml"; + version = "0.5.0"; + description = "A native Rust encoder and decoder of TOML-formatted files and streams. Provides\nimplementations of the standard Serialize/Deserialize traits for TOML data to\nfacilitate deserializing and serializing Rust structures.\n"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0l2lqzbn5g9l376k01isq1nhb14inkr4c50qbjbdzh5qysz7dyk5"; + dependencies = mapFeatures features ([ + (crates."serde"."${deps."toml"."0.5.0"."serde"}" deps) + ]); + features = mkFeatures (features."toml"."0.5.0" or {}); + }; + features_.toml."0.5.0" = deps: f: updateFeatures f (rec { + serde."${deps.toml."0.5.0".serde}".default = true; + toml = fold recursiveUpdate {} [ + { "0.5.0"."linked-hash-map" = + (f.toml."0.5.0"."linked-hash-map" or false) || + (f.toml."0.5.0".preserve_order or false) || + (toml."0.5.0"."preserve_order" or false); } + { "0.5.0".default = (f.toml."0.5.0".default or true); } + ]; + }) [ + (features_.serde."${deps."toml"."0.5.0"."serde"}" deps) + ]; + + +# end # toml2nix-0.1.1 crates.toml2nix."0.1.1" = deps: { features?(features_.toml2nix."0.1.1" deps {}) }: buildRustCrate { @@ -2027,6 +3443,21 @@ rec { # end +# ucd-util-0.1.3 + + crates.ucd_util."0.1.3" = deps: { features?(features_.ucd_util."0.1.3" deps {}) }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.3"; + description = "A small utility library for working with the Unicode character database.\n"; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "1n1qi3jywq5syq90z9qd8qzbn58pcjgv1sx4sdmipm4jf9zanz15"; + }; + features_.ucd_util."0.1.3" = deps: f: updateFeatures f (rec { + ucd_util."0.1.3".default = (f.ucd_util."0.1.3".default or true); + }) []; + + +# end # unicode-bidi-0.3.4 crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate { @@ -2077,6 +3508,27 @@ rec { # end +# unicode-normalization-0.1.8 + + crates.unicode_normalization."0.1.8" = deps: { features?(features_.unicode_normalization."0.1.8" deps {}) }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.8"; + description = "This crate provides functions for normalization of\nUnicode strings, including Canonical and Compatible\nDecomposition and Recomposition, as described in\nUnicode Standard Annex #15.\n"; + authors = [ "kwantam <kwantam@gmail.com>" ]; + sha256 = "1pb26i2xd5zz0icabyqahikpca0iwj2jd4145pczc4bb7p641dsz"; + dependencies = mapFeatures features ([ + (crates."smallvec"."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps) + ]); + }; + features_.unicode_normalization."0.1.8" = deps: f: updateFeatures f (rec { + smallvec."${deps.unicode_normalization."0.1.8".smallvec}".default = true; + unicode_normalization."0.1.8".default = (f.unicode_normalization."0.1.8".default or true); + }) [ + (features_.smallvec."${deps."unicode_normalization"."0.1.8"."smallvec"}" deps) + ]; + + +# end # unicode-width-0.1.5 crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate { @@ -2158,6 +3610,21 @@ rec { # end +# utf8-ranges-1.0.2 + + crates.utf8_ranges."1.0.2" = deps: { features?(features_.utf8_ranges."1.0.2" deps {}) }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.2"; + description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "1my02laqsgnd8ib4dvjgd4rilprqjad6pb9jj9vi67csi5qs2281"; + }; + features_.utf8_ranges."1.0.2" = deps: f: updateFeatures f (rec { + utf8_ranges."1.0.2".default = (f.utf8_ranges."1.0.2".default or true); + }) []; + + +# end # vec_map-0.8.1 crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate { @@ -2268,6 +3735,39 @@ rec { # end +# winapi-util-0.1.2 + + crates.winapi_util."0.1.2" = deps: { features?(features_.winapi_util."0.1.2" deps {}) }: buildRustCrate { + crateName = "winapi-util"; + version = "0.1.2"; + description = "A dumping ground for high level safe wrappers over winapi."; + authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; + sha256 = "07jj7rg7nndd7bqhjin1xphbv8kb5clvhzpqpxkvm3wl84r3mj1h"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."winapi_util"."0.1.2"."winapi"}" deps) + ]) else []); + }; + features_.winapi_util."0.1.2" = deps: f: updateFeatures f (rec { + winapi = fold recursiveUpdate {} [ + { "${deps.winapi_util."0.1.2".winapi}"."consoleapi" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."errhandlingapi" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."fileapi" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."minwindef" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."processenv" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."std" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."winbase" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."wincon" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."winerror" = true; } + { "${deps.winapi_util."0.1.2".winapi}"."winnt" = true; } + { "${deps.winapi_util."0.1.2".winapi}".default = true; } + ]; + winapi_util."0.1.2".default = (f.winapi_util."0.1.2".default or true); + }) [ + (features_.winapi."${deps."winapi_util"."0.1.2"."winapi"}" deps) + ]; + + +# end # winapi-x86_64-pc-windows-gnu-0.4.0 crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { diff --git a/nixpkgs/pkgs/build-support/rust/default.nix b/nixpkgs/pkgs/build-support/rust/default.nix index 92e312a6aed2..0140b9f9e656 100644 --- a/nixpkgs/pkgs/build-support/rust/default.nix +++ b/nixpkgs/pkgs/build-support/rust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }: +{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3, buildPackages }: let buildRustPackage = @@ -11,14 +11,17 @@ let , sourceRoot ? null , logLevel ? "" , buildInputs ? [] + , nativeBuildInputs ? [] , cargoUpdateHook ? "" , cargoDepsHook ? "" , cargoBuildFlags ? [] + , buildType ? "release" , cargoVendorDir ? null , ... } @ args: assert cargoVendorDir == null -> cargoSha256 != "unset"; + assert buildType == "release" || buildType == "debug"; let cargoDeps = if cargoVendorDir == null @@ -39,20 +42,24 @@ let cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; + ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; + cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; + releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}"; + in stdenv.mkDerivation (args // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; - buildInputs = [ cacert git cargo rustc ] ++ buildInputs; + nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs; + inherit buildInputs; patches = cargoPatches ++ patches; - configurePhase = args.configurePhase or '' - runHook preConfigure - # noop - runHook postConfigure - ''; + PKG_CONFIG_ALLOW_CROSS = + if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0; postUnpack = '' eval "$cargoDepsHook" @@ -65,17 +72,51 @@ let config=${./fetchcargo-default-config.toml}; fi; substitute $config .cargo/config \ - --subst-var-by vendor "$(pwd)/$cargoDepsCopy" + --subst-var-by vendor "$(pwd)/$cargoDepsCopy" unset cargoDepsCopy export RUST_LOG=${logLevel} '' + (args.postUnpack or ""); + configurePhase = args.configurePhase or '' + runHook preConfigure + mkdir -p .cargo + cat >> .cargo/config <<'EOF' + [target."${stdenv.buildPlatform.config}"] + "linker" = "${ccForBuild}" + ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' + [target."${stdenv.hostPlatform.config}"] + "linker" = "${ccForHost}" + ''} + EOF + cat .cargo/config + runHook postConfigure + ''; + buildPhase = with builtins; args.buildPhase or '' runHook preBuild - echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}" - cargo build --release --frozen ${concatStringsSep " " cargoBuildFlags} + + ( + set -x + env \ + "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \ + "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \ + "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \ + "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ + cargo build \ + --${buildType} \ + --target ${stdenv.hostPlatform.config} \ + --frozen ${concatStringsSep " " cargoBuildFlags} + ) + + # rename the output dir to a architecture independent one + mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$') + for target in "''${targets[@]}"; do + rm -rf "$target/../../${buildType}" + ln -srf "$target" "$target/../../" + done + runHook postBuild ''; @@ -88,11 +129,21 @@ let doCheck = args.doCheck or true; + inherit releaseDir; + installPhase = args.installPhase or '' runHook preInstall mkdir -p $out/bin $out/lib - find target/release -maxdepth 1 -type f -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin - find target/release -maxdepth 1 -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib + + find $releaseDir \ + -maxdepth 1 \ + -type f \ + -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) \ + -print0 | xargs -r -0 cp -t $out/bin + find $releaseDir \ + -maxdepth 1 \ + -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \ + -print0 | xargs -r -0 cp -t $out/lib rmdir --ignore-fail-on-non-empty $out/lib $out/bin runHook postInstall ''; diff --git a/nixpkgs/pkgs/build-support/rust/make-rust-platform.nix b/nixpkgs/pkgs/build-support/rust/make-rust-platform.nix deleted file mode 100644 index afbc56865ff7..000000000000 --- a/nixpkgs/pkgs/build-support/rust/make-rust-platform.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ callPackage }: -{ rustc, cargo, ... }: { - rust = { - inherit rustc cargo; - }; - - buildRustPackage = callPackage ./default.nix { - inherit rustc cargo; - - fetchcargo = callPackage ./fetchcargo.nix { - inherit cargo; - }; - }; - - rustcSrc = callPackage ../../development/compilers/rust/rust-src.nix { - inherit rustc; - }; -} diff --git a/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index b5ceb4a13d85..906b1db9d10e 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -30,6 +30,10 @@ wrapGAppsHook() { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share") fi + if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then + gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules") + fi + for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do eval local dummy="\$$v" gappsWrapperArgs+=(--prefix $v : "$dummy") diff --git a/nixpkgs/pkgs/build-support/trivial-builders.nix b/nixpkgs/pkgs/build-support/trivial-builders.nix index ab83b73c5455..592af3fe4f20 100644 --- a/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -32,19 +32,23 @@ rec { * * Examples: * # Writes my-file to /nix/store/<store path> - * writeTextFile "my-file" - * '' - * Contents of File + * writeTextFile { + * name = "my-file"; + * text = '' + * Contents of File * ''; + * } + * # See also the `writeText` helper function below. * * # Writes executable my-file to /nix/store/<store path>/bin/my-file - * writeTextFile "my-file" - * '' - * Contents of File - * '' - * true - * "/bin/my-file"; - * true + * writeTextFile { + * name = "my-file"; + * text = '' + * Contents of File + * ''; + * executable = true; + * destination = "/bin/my-file"; + * } */ writeTextFile = { name # the name of the derivation diff --git a/nixpkgs/pkgs/build-support/writers/default.nix b/nixpkgs/pkgs/build-support/writers/default.nix index 3454450c1f3a..281d2b19bc65 100644 --- a/nixpkgs/pkgs/build-support/writers/default.nix +++ b/nixpkgs/pkgs/build-support/writers/default.nix @@ -178,13 +178,20 @@ rec { writeJSBin = name: writeJS "/bin/${name}"; + awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" '' + awk -f + {sub(/^[ \t]+/,"");idx=0} + /\{/{ctx++;idx=1} + /\}/{ctx--} + {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0} + ''; + writeNginxConfig = name: text: pkgs.runCommand name { inherit text; passAsFile = [ "text" ]; } /* sh */ '' - cp "$textPath" $out - ${pkgs.nginx-config-formatter}/bin/nginxfmt $out - ${pkgs.gnused}/bin/sed -i '/^$/d' $out + # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16 + ${pkgs.gawk}/bin/awk -f ${awkFormatNginx} "$textPath" | ${pkgs.gnused}/bin/sed '/^\s*$/d' > $out ${pkgs.gixy}/bin/gixy $out ''; diff --git a/nixpkgs/pkgs/common-updater/scripts/update-source-version b/nixpkgs/pkgs/common-updater/scripts/update-source-version index a66ffb750f6e..75433fe4c596 100755 --- a/nixpkgs/pkgs/common-updater/scripts/update-source-version +++ b/nixpkgs/pkgs/common-updater/scripts/update-source-version @@ -29,6 +29,9 @@ for arg in "$@"; do die "Could not find provided file $nixFile" fi ;; + --ignore-same-hash) + ignoreSameHash="true" + ;; --help) usage exit 0 @@ -86,11 +89,15 @@ fi oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt $attr.src.drvAttrs.urls 0" | tr -d '"') if [ -z "$oldUrl" ]; then - die "Couldn't evaluate source url from '$attr.name'!" + oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.url" | tr -d '"') + + if [ -z "$oldUrl" ]; then + die "Couldn't evaluate source url from '$attr.src'!" + fi fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).${versionKey}" | tr -d '"') if [ -z "$drvName" -o -z "$oldVersion" ]; then die "Couldn't evaluate name and version from '$attr.name'!" @@ -154,7 +161,7 @@ if [ -z "$newHash" ]; then die "Couldn't figure out new hash of '$attr.src'!" fi -if [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then +if [ -z "${ignoreSameHash}"] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then mv "$nixFile.bak" "$nixFile" die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi diff --git a/nixpkgs/pkgs/data/fonts/ankacoder/default.nix b/nixpkgs/pkgs/data/fonts/ankacoder/default.nix index 32270607028c..170c8cde5140 100644 --- a/nixpkgs/pkgs/data/fonts/ankacoder/default.nix +++ b/nixpkgs/pkgs/data/fonts/ankacoder/default.nix @@ -21,4 +21,3 @@ fetchzip rec { platforms = platforms.all; }; } - diff --git a/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix b/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix index 29dd5adbf5c3..b767c6706508 100644 --- a/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix +++ b/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.3.0"; + version = "1.4.1"; in fetchzip rec { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; @@ -9,7 +9,7 @@ in fetchzip rec { mkdir -p $out/share/fonts unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "1xjvxyp7h1f7m82800m3q71hksddh25c9a9vnr3r070ppi19s5fc"; + sha256 = "1y2p0gf8znryfcidg26dn9xi81wl9vq5m56ylvg5jp0sn971r4xq"; meta = with lib; { description = "IBM Plex Typeface"; diff --git a/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix b/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix new file mode 100644 index 000000000000..af1392e9d5e2 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ir-standard-fonts"; + version= "unstable-2017-01-21"; + + src = fetchFromGitHub { + owner = "morealaz"; + repo = pname; + rev = "d36727d6c38c23c01b3074565667a2fe231fe18f"; + sha256 = "1ks9q1r1gk2517yfr1fbgrdbgw0w97i4am6jqn5ywpgm2xd03yg1"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ir-standard-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/ir-standard-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/morealaz/ir-standard-fonts; + description = "Iran Supreme Council of Information and Communication Technology (SCICT) standard Persian fonts series"; + # License information is unavailable. + license = licenses.unfree; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix b/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix new file mode 100644 index 000000000000..cf4bd3722299 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "shabnam-fonts"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "shabnam-font"; + rev = "v${version}"; + sha256 = "1y4w16if2y12028b9vyc5l5c5bvcglhxacv380ixb8fcc4hfakmb"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/shabnam-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/shabnam-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rastikerdar/shabnam-font; + description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index 2dbd062d4fb2..3cadb477ae81 100644 --- a/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = http://github.com/ddccontrol/ddccontrol-db; + homepage = https://github.com/ddccontrol/ddccontrol-db; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 9f135c423bc8..a2df56c0898f 100644 --- a/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, gnome3 }: -let - version = "20190116"; - pname = "mobile-broadband-provider-info"; - name = "${pname}-${version}"; -in stdenv.mkDerivation rec { - inherit name; + pname = "mobile-broadband-provider-info"; + version = "20190116"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"; }; - meta = { + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { description = "Mobile broadband service provider database"; - homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.publicDomain; + homepage = https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders; + license = licenses.publicDomain; maintainers = [ ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix index f82ae5f1f9f2..6d29d8760734 100644 --- a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix +++ b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool , libxml2, glib}: -let version = "1.10"; in +let version = "1.12"; in stdenv.mkDerivation rec { name = "shared-mime-info-${version}"; src = fetchurl { - url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6"; + url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz"; + sha256 = "0gj0pp36qpsr9w6v4nywnjpcisadwkndapqsjn0ny3gd0zzg1chq"; }; nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/nixpkgs/pkgs/data/misc/tzdata/default.nix b/nixpkgs/pkgs/data/misc/tzdata/default.nix index 59079b28efc2..0d19d8c9dcab 100644 --- a/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2018g"; + version = "2019a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2"; + sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"; + sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7"; }) ]; diff --git a/nixpkgs/pkgs/data/themes/qogir/default.nix b/nixpkgs/pkgs/data/themes/qogir/default.nix index ffd0cb4db3f7..0c48f8929920 100644 --- a/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2019-03-10"; + version = "2019-04-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1sap0hywkzvnbnyqqc610bh5hw5x1k7whwgrshpsjxgsvfkxs8in"; + sha256 = "0knv35xb4rg4pddxc78hd8frnlm8n0za1yj51ydwskn9b0qqcyhs"; }; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix new file mode 100644 index 000000000000..f183d0e15f82 --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, + dde-qt-dbus-factory, proxychains, which, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-network-utils"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1m6njld06yphppyyhygz8mv4gvq2zw0676pbls9m3fs7b3dl56sv"; + }; + + nativeBuildInputs = [ + qmake + pkgconfig + qttools + deepin.setupHook + ]; + + buildInputs = [ + dde-qt-dbus-factory + proxychains + which + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit which proxychains; + }) + ]; + + postPatch = '' + searchHardCodedPaths # for debugging + patchShebangs translate_generation.sh + ''; + + postFixup = '' + searchHardCodedPaths $out # for debugging + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "Deepin network utils"; + homepage = https://github.com/linuxdeepin/dde-network-utils; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch new file mode 100644 index 000000000000..9f7ecd423c56 --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch @@ -0,0 +1,23 @@ +diff -ur dde-network-utils-master.orig/dde-network-utils.pro dde-network-utils-master/dde-network-utils.pro +--- dde-network-utils-master.orig/dde-network-utils.pro 2019-04-04 03:37:46.000000000 -0300 ++++ dde-network-utils-master/dde-network-utils.pro 2019-04-07 05:56:28.283195087 -0300 +@@ -52,6 +52,7 @@ + + QMAKE_PKGCONFIG_NAME = libddenetworkutils + QMAKE_PKGCONFIG_DESCRIPTION = libddenetworkutils ++QMAKE_PKGCONFIG_PREFIX = $$PREFIX + QMAKE_PKGCONFIG_INCDIR = $$includes.path + QMAKE_PKGCONFIG_LIBDIR = $$target.path + QMAKE_PKGCONFIG_DESTDIR = pkgconfig +diff -ur dde-network-utils-master.orig/networkworker.cpp dde-network-utils-master/networkworker.cpp +--- dde-network-utils-master.orig/networkworker.cpp 2019-04-04 03:37:46.000000000 -0300 ++++ dde-network-utils-master/networkworker.cpp 2019-04-07 05:54:28.656479216 -0300 +@@ -80,7 +80,7 @@ + } + } + +- const bool isAppProxyVaild = QProcess::execute("which", QStringList() << "/usr/bin/proxychains4") == 0; ++ const bool isAppProxyVaild = QProcess::execute("@which@/bin/which", QStringList() << "@proxychains@/bin/proxychains4") == 0; + m_networkModel->onAppProxyExistChanged(isAppProxyVaild); + } + diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix new file mode 100644 index 000000000000..6585bc78c588 --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras, + dtkcore, dtkwidget, dtkwm, deepin-turbo, deepin-shortcut-viewer, + deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-screenshot"; + version = "4.1.8"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1zhjchflgws2q74b9fgdjy2wzifjhimnrrq1sxlv395793xv8lrr"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + qttools + deepin.setupHook + ]; + + buildInputs = [ + deepin-shortcut-viewer + deepin-turbo + dtkcore + dtkwidget + dtkwm + qtx11extras + ]; + + patches = [ + (fetchpatch { + url = https://github.com/linuxdeepin/deepin-screenshot/pull/52/commits/e14508b223fd9965854ed41c944cea2ea19e6e0c.patch; + sha256 = "18zvz98z3hr8pcdyb706za6h2nwx23zsjb1hgyp21ycinhzr9j9h"; + }) + ]; + + postPatch = '' + searchHardCodedPaths + patchShebangs generate_translations.sh + fixPath ${deepin-turbo} /usr/bin/deepin-turbo-invoker src/dbusservice/com.deepin.Screenshot.service + fixPath $out /usr/bin/deepin-screenshot src/dbusservice/com.deepin.Screenshot.service + substituteInPlace src/mainwindow.cpp --replace '"xdg-open,%1"' '"${xdg_utils}/bin/xdg-open,%1"' + ''; + + postFixup = '' + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/deepin-screenshot; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo flokli ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix new file mode 100644 index 000000000000..6a343f816b94 --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-turbo"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "13vbj18pclv7c25pb1y5x6dd7wmcgisa40mb13qyixnzpq2ssjg5"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + deepin.setupHook + ]; + + buildInputs = [ + qtbase + ]; + + postPatch = '' + searchHardCodedPaths # for debugging + fixPath $out /usr/lib/systemd src/booster-dtkwidget/CMakeLists.txt + fixPath $out /usr/lib/deepin-turbo src/booster-dtkwidget/deepin-turbo-booster-dtkwidget.service + ''; + + postFixup = '' + searchHardCodedPaths $out # for debugging + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "A daemon that helps to launch applications faster"; + homepage = https://github.com/linuxdeepin/deepin-turbo; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/deepin/default.nix b/nixpkgs/pkgs/desktops/deepin/default.nix index d864fd77389e..10e25cedc4b3 100644 --- a/nixpkgs/pkgs/desktops/deepin/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/default.nix @@ -1,4 +1,4 @@ -{ pkgs, makeScope, libsForQt5, go_1_11 }: +{ pkgs, makeScope, libsForQt5 }: let packages = self: with self; { @@ -7,16 +7,11 @@ let updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; - dde-api = callPackage ./dde-api { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; - dde-daemon = callPackage ./dde-daemon { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + dde-daemon = callPackage ./dde-daemon { }; dde-polkit-agent = callPackage ./dde-polkit-agent { }; + dde-network-utils = callPackage ./dde-network-utils { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; @@ -29,23 +24,27 @@ let deepin-metacity = callPackage ./deepin-metacity { }; deepin-movie-reborn = callPackage ./deepin-movie-reborn { }; deepin-mutter = callPackage ./deepin-mutter { }; + deepin-screenshot = callPackage ./deepin-screenshot { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-terminal = callPackage ./deepin-terminal { wnck = pkgs.libwnck3; }; + deepin-turbo = callPackage ./deepin-turbo { }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wm = callPackage ./deepin-wm { }; dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; - dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; + dtkwm = callPackage ./dtkwm { }; go-dbus-factory = callPackage ./go-dbus-factory { }; go-dbus-generator = callPackage ./go-dbus-generator { }; go-gir-generator = callPackage ./go-gir-generator { }; go-lib = callPackage ./go-lib { }; + qcef = callPackage ./qcef { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; + udisks2-qt5 = callPackage ./udisks2-qt5 { }; }; diff --git a/nixpkgs/pkgs/desktops/deepin/qcef/default.nix b/nixpkgs/pkgs/desktops/deepin/qcef/default.nix new file mode 100644 index 000000000000..18d64c5645ca --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/qcef/default.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, + qtwebchannel, qtx11extras, dtkcore, dtkwidget, qt5integration, + libXScrnSaver, gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus, + expat, fontconfig, gdk_pixbuf, glib, gtk2, libX11, libXcomposite, + libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, + libXrender, libXtst, libxcb, pango, pulseaudio, xorg, deepin }: + +let + rpahtLibraries = [ + stdenv.cc.cc.lib # libstdc++.so.6 + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + gdk_pixbuf + glib + gnome2.GConf + gtk2 + libxcb + nspr + nss + pango + pulseaudio + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + ]; + libPath = stdenv.lib.makeLibraryPath rpahtLibraries; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "qcef"; + version = "1.1.4.6"; + + srcs = [ + (fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "06909sd0gf7n4hw6p4j96apjym219zabflgpwjafm7v00bgnwxxs"; + name = pname; + }) + (fetchFromGitHub { + owner = "linuxdeepin"; + repo = "cef-binary"; + rev = "059a0c9cef4e289a50dc7a2f4c91fe69db95035e"; + sha256 = "1h7cq63n94y2a6fprq4g63admh49rcci7avl5z9kdimkhqb2jb84"; + name = "cef-binary"; + }) + ]; + + sourceRoot = pname; + + nativeBuildInputs = [ + pkgconfig + cmake + qttools + deepin.setupHook + ]; + + buildInputs = [ + qtbase + qtwebchannel + qtx11extras + ] ++ rpahtLibraries; + + postUnpack = '' + rmdir ${pname}/cef + ln -s ../cef-binary ${pname}/cef + ''; + + postPatch = '' + searchHardCodedPaths + fixPath $out /usr src/core/qcef_global_settings.{h,cpp} + sed '/COMMAND rm -rf Release Resources/a COMMAND ldd qcef/libcef.so' -i src/CMakeLists.txt + sed '/COMMAND rm -rf Release Resources/a COMMAND patchelf --set-rpath ${libPath} qcef/libcef.so' -i src/CMakeLists.txt + ''; + + postFixup = '' + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "Qt5 binding of Chromium Embedded Framework"; + homepage = https://github.com/linuxdeepin/qcef; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/deepin/setup-hook.sh b/nixpkgs/pkgs/desktops/deepin/setup-hook.sh index 15fe5be1538d..63a43bb58407 100755 --- a/nixpkgs/pkgs/desktops/deepin/setup-hook.sh +++ b/nixpkgs/pkgs/desktops/deepin/setup-hook.sh @@ -11,7 +11,7 @@ searchHardCodedPaths() { grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true echo ----------- looking for hard coded paths - grep --color=always -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true + grep --color=always -a -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true echo ----------- done } diff --git a/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix b/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix new file mode 100644 index 000000000000..f4dae7790618 --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "udisks2-qt5"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1gk4jmq7mrzk181r6man2rz1iyzkfasz7053a30h4nn24mq8ikig"; + }; + + nativeBuildInputs = [ + deepin.setupHook + qmake + ]; + + buildInputs = [ + qtbase + ]; + + postPatch = '' + searchHardCodedPaths + ''; + + postFixup = '' + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "UDisks2 D-Bus interfaces binding for Qt5"; + homepage = https://github.com/linuxdeepin/udisks2-qt5; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 4815103893f0..efff8f846b94 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection , itstool, libxml2, python3Packages, at-spi2-core -, dbus, intltool, libwnck3 }: +, dbus, gettext, libwnck3 }: stdenv.mkDerivation rec { name = "accerciser-${version}"; - version = "3.22.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; + sha256 = "0afzhbig5yw87zyfmid61368jj8l6i7k8gs29x0hv65fz4yiv4h4"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook itstool intltool + pkgconfig wrapGAppsHook itstool gettext gobject-introspection # For setup hook ]; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix index ea2091524c9c..4e5595385b48 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "cheese-${version}"; - version = "3.30.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr"; + sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix index fa406e6f4dbb..a423dd85887c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -7,13 +7,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.30.5"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h"; + sha256 = "0ns76w6vwv5k1nxpaqrizp1pnm89xzfgs60i6cwwfs35zqlmb7iq"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 5ee26eba6b7d..733b8ecca920 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "file-roller-${version}"; - version = "3.30.1"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1"; + sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw"; }; LANG = "en_US.UTF-8"; # postinstall.py diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix index 8310f426be6c..f767e309a65a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,28 +1,43 @@ -{ stdenv, intltool, fetchurl +{ stdenv, meson, fetchurl, python3 , pkgconfig, gtk3, glib, adwaita-icon-theme -, libpeas, gtksourceview, gsettings-desktop-schemas -, wrapGAppsHook, itstool, libsoup, libxml2 -, gnome3, gspell }: +, libpeas, gtksourceview4, gsettings-desktop-schemas +, wrapGAppsHook, ninja, libsoup, libxml2 +, gnome3, gspell, perl, itstool, desktop-file-utils }: stdenv.mkDerivation rec { name = "gedit-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza"; + sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook meson ninja libxml2 + python3 perl itstool desktop-file-utils + ]; buildInputs = [ gtk3 glib adwaita-icon-theme libsoup - libpeas gtksourceview + libpeas gtksourceview4 gsettings-desktop-schemas gspell ]; - enableParallelBuilding = true; + postPatch = '' + chmod +x build-aux/meson/post_install.py + chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl + patchShebangs build-aux/meson/post_install.py + patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl + ''; + + mesonFlags = [ + "--buildtype=plain" # don't require git + ]; + + # Reliably fails to generate gedit-file-browser-enum-types.h in time + enableParallelBuilding = false; passthru = { updateScript = gnome3.updateScript { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix new file mode 100644 index 000000000000..b9fb2dc05a06 --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -0,0 +1,52 @@ +{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs +, pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt +, webkitgtk, gnome-desktop, libgepub, gnome3, gdk_pixbuf +, gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl +, docbook_xml_dtd_42, desktop-file-utils, python3 +, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "gnome-books"; + version = "3.32.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4"; + }; + + mesonFlags = [ + "--buildtype=plain" + ]; + + nativeBuildInputs = [ + meson ninja pkgconfig gettext libxslt desktop-file-utils + docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 + ]; + + buildInputs = [ + gtk3 glib gsettings-desktop-schemas + gdk_pixbuf adwaita-icon-theme evince + webkitgtk gjs gobject-introspection tracker + tracker-miners gnome-desktop libgepub + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-books"; + attrPath = "gnome3.gnome-books"; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Books; + description = "An e-book manager application for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 216902872457..a983c59d192e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -3,19 +3,19 @@ , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret -, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk +, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte }: # TODO: ovirt (optional) let - version = "3.30.3"; + version = "3.32.0.2"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0a9ljwhkanszzyzl0bhad8vmzk7v4wafl9b1zn09pf57znyymf3s"; + sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk"; }; doCheck = true; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive gnome3.adwaita-icon-theme librsvg acl libgudev libsecret - libcap_ng numactl xen libapparmor + libcap_ng numactl xen libapparmor vte ]; preFixup = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 9b48e3231911..a22f2166f1ea 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.30.1"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s"; + sha256 = "0fyy1slcvc32nz37clps7lz3w40i30fj93fc5m0rqk664w682ys4"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 101b9f4a62ec..c95d135e9e73 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-characters-${version}"; - version = "3.30.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "08cwz39iwgsyyb2wqhb8vfbmh1cwfkgfiy7adp08w7rwqi99x3dp"; + sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js"; }; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index c614dc6486c8..f29f324f2ee8 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "gnome-clocks-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc"; + sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 186f3a14d271..a2cba36b88d9 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -8,16 +8,19 @@ stdenv.mkDerivation rec { name = "gnome-documents-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zchkjpc9algmxrpj0f9i2lc4h1yp8z0h76vn32xa9jr46x4lsh6"; + sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c"; }; doCheck = true; - mesonFlags = [ "-Dgetting-started=true" ]; + mesonFlags = [ + "-Dgetting-started=true" + "--buildtype=plain" + ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3 @@ -31,14 +34,6 @@ stdenv.mkDerivation rec { gnome-desktop libzapojit libgepub ]; - patches = [ - # fix RPATH to libgd - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/d18a92e0a940073ac766f609937539e4fc6cdbb7.patch"; - sha256 = "0s3mk8vrl1gzk93yvgqbnz44i27qw1d9yvvmnck3fv23phrxkzk9"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index e7a1954c8924..37f2a859488c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-getting-started-docs-${version}"; - version = "3.30.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "10vihv6n8703rapf915waz1vzr7axk43bjlhmm3hb7kwm32rc61k"; + sha256 = "0g4zaafj442gpir0hxv5hya37ax1ai40slls7sa2a02fdarilrjf"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 89f4cc01e50c..7d9fa2d528c0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.30.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rsk2whps7rwl01mmjmhwwww4iv09fsszils9zmgqd79y7l3fmyh"; + sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068"; }; mesonFlags = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index d7df923339a9..be5008a51fee 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.30.3"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0s1k6v1yzchbv6big09fdhmm0rzyjdh2y7qg6fsp7d0x4qnch9nq"; + sha256 = "1q15qsp0ca67y4l0x31518cfakrj85x9g0cbcm0wysnbddi1aik0"; }; doCheck = true; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 98d3cfb55398..66680c0af58e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.30.2"; + version = "3.32.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d9gd9rqy71hibfrz4zglimvgv6yn1pw22cnrn7pbdz6k4yq209d"; + sha256 = "11fdij1jznjsph1q5rkkvdhikzdh2lls921lv2m2di9x7i2xn3h4"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 78c39651ad6b..4a3c59eb3e53 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2 }: let - version = "3.30.3"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "gnome-notes-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "1mkpi2i9nqpip5l15ihjcscyiri113s0705sjgh6b89164ahyn5k"; + sha256 = "02b7afg3ps0hxp5dkb4kv6315ydc2r6bxgk1kamwp581lc7ghd67"; }; doCheck = true; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 8c0c216965d1..99b1cd3adf94 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -4,22 +4,25 @@ , grilo, gnome-online-accounts , desktop-file-utils, wrapGAppsHook , gnome3, gdk_pixbuf, gexiv2, geocode-glib -, dleyna-renderer }: +, dleyna-renderer, dbus, meson, ninja, python3 }: let pname = "gnome-photos"; - version = "3.30.1"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1mf1887x0pk46h6l51rfkpn29fwp3yvmqkk99kr1iwpz0lakyx6f"; + sha256 = "160vqmcqvyzby27wd2lzwzgbfl6jxxk7phhnqh9498r3clr73haj"; }; # doCheck = true; - nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig gettext itstool meson ninja libxml2 + desktop-file-utils wrapGAppsHook python3 + ]; buildInputs = [ gtk3 glib gegl babl libgdata libdazzle gnome3.gsettings-desktop-schemas @@ -28,8 +31,17 @@ in stdenv.mkDerivation rec { gnome-online-accounts tracker gexiv2 geocode-glib dleyna-renderer tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema + dbus + ]; + + mesonFlags = [ + "--buildtype=plain" # don't do any git commands ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; passthru = { updateScript = gnome3.updateScript { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 2d9c313e641d..fd47f54eb899 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -14,13 +14,13 @@ let pname = "gnome-power-manager"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0m15x6i279wrfimz9ma2gfjv7jlkca2qbl2wcnxgx1pb3hzrwggm"; + sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 1f902dc9c80a..c9e6356aac6c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 +, meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }: stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.28.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1k63xr3d16qbzi88md913ndaf2mzwmhmi6hipj0123sm7nsz1p94"; + sha256 = "0rchzap5mg9ach3jcf4sci5v2h5pgpdjafjfllfd09w9yg3brspp"; }; - patches = [ - # Fix crash when trying to play recordings - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-sound-recorder/commit/2b311ef67909bc20d0e87f334fe37bf5c4e9f29f.patch; - sha256 = "0hqmk846bxma0p66cqp94zd02zc1if836ywjq3sv5dsfwnz7jv3f"; - }) + nativeBuildInputs = [ + pkgconfig gettext meson ninja gobject-introspection + wrapGAppsHook python3 hicolor-icon-theme desktop-file-utils ]; - - nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + # TODO: fix this in gstreamer # TODO: make stdenv.lib.getBin respect outputBin PKG_CONFIG_GSTREAMER_1_0_TOOLSDIR = "${gst_all_1.gstreamer.dev}/bin"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index 23b671ebfc09..4ae3b629af9c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -1,28 +1,67 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook -, gettext, gnome3, glib, gtk3, libpeas -, gnome-online-accounts, gsettings-desktop-schemas -, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, python3 +, wrapGAppsHook +, gettext +, gnome3 +, glib +, gtk3 +, libpeas +, gnome-online-accounts +, gsettings-desktop-schemas +, adwaita-icon-theme +, evolution-data-server +, libxml2 +, libsoup +, libical +, librest +, json-glib +}: -let +stdenv.mkDerivation rec { pname = "gnome-todo"; version = "3.28.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; }; + patches = [ + # fix build with e-d-s 3.32 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch; + sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy"; + }) + ]; + nativeBuildInputs = [ - meson ninja pkgconfig gettext python3 wrapGAppsHook + meson + ninja + pkgconfig + gettext + python3 + wrapGAppsHook ]; + buildInputs = [ - glib gtk3 libpeas gnome-online-accounts - gsettings-desktop-schemas gnome3.adwaita-icon-theme + glib + gtk3 + libpeas + gnome-online-accounts + gsettings-desktop-schemas + gnome3.adwaita-icon-theme # Plug-ins - evolution-data-server libxml2 libsoup libical - librest json-glib + evolution-data-server + libxml2 + libsoup + libical + librest + json-glib ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 5ae279f57f04..fcce09e6c4f0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,29 +1,32 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection -, libgweather, intltool, itstool, geoclue2, gnome-desktop }: +, libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }: stdenv.mkDerivation rec { name = "gnome-weather-${version}"; - version = "3.26.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; + sha256 = "0xhfnm358hnbjiw084b732aalzdwyvyaqpabkplw81li9k4bmw54"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas ]; - # The .service file isn't wrapped with the correct environment - # so misses GIR files when started. By re-pointing from the gjs - # entry point to the wrapped binary we get back to a wrapped - # binary. - preConfigure = '' - substituteInPlace "data/org.gnome.Weather.Application.service.in" \ - --replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \ + postPatch = '' + # The .service file is not wrapped with the correct environment + # so misses GIR files when started. By re-pointing from the gjs + # entry point to the wrapped binary we get back to a wrapped + # binary. + substituteInPlace "data/org.gnome.Weather.service.in" \ + --replace "Exec=@DATA_DIR@/@APP_ID@" \ "Exec=$out/bin/gnome-weather" + + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix index 080fa664b0db..d48c59b093dc 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.30.2"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02wxkdq5s5ami9wj9vpqhs6n8qxr299bpmvpvd89mn49x73lq2w2"; + sha256 = "1jq1xvk9a05x37g9w349f5q069cvg5lfbhxj88gpbnf4fyndnr70"; }; propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 84f7b519d1e2..4b286a9a7c66 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala, meson, ninja +{ stdenv, fetchurl, vala, meson, ninja, libpwquality , pkgconfig, gtk3, glib, gobject-introspection , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, gpgme, python3, openldap, gcr @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.30.1.1"; + version = "3.32"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy"; + sha256 = "1wxcxq6ahlwab8dr83gqml67y95mnk56hsgw19d4h0xjvyz2ym52"; }; doCheck = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gnome3.gsettings-desktop-schemas gnupg gnome3.adwaita-icon-theme gpgme libsecret avahi libsoup p11-kit - openssh openldap + openssh openldap libpwquality ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index b091395ab37b..0f88372d9cfb 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd"; + sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9"; }; # For convenience, we can specify adwaita-icon-theme only in packages diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix index cf73524a0ca2..4734a0e96b8c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,13 +4,13 @@ let pname = "baobab"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay"; + sha256 = "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 0d583dccf766..8a6ecc5d5e19 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,18 +1,22 @@ { stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3 -, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: +, libxml2, gettext, docbook_xsl, hicolor-icon-theme, wrapGAppsHook, gobject-introspection }: let pname = "dconf-editor"; - version = "3.30.2"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia"; + sha256 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi"; }; - nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ]; + nativeBuildInputs = [ + meson ninja vala libxslt pkgconfig wrapGAppsHook + gettext docbook_xsl libxml2 gobject-introspection python3 + hicolor-icon-theme # for setup-hook + ]; buildInputs = [ glib gtk3 gnome3.dconf ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/dconf/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/dconf/default.nix index 1f55071c83d7..e20804d9e621 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "0.30.1"; + version = "0.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl"; + sha256 = "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38"; }; patches = [ @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - chmod +x meson_post_install.py + chmod +x meson_post_install.py tests/test-dconf.py patchShebangs meson_post_install.py + patchShebangs tests/test-dconf.py ''; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - doCheck = true; + doCheck = !stdenv.isAarch64; passthru = { updateScript = gnome3.updateScript { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix index 5b6281869cc5..7fd092c1efa4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.28.4"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55"; + sha256 = "165axw63c2l5qk5k2xs7g9d97xnxf5a4br0hdb8s3bpv7lf5nw8q"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix index 37cdce40f340..9abfd31b37d5 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -2,19 +2,19 @@ , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit , sqlite, gcr, isocodes, desktop-file-utils, python3 -, gdk_pixbuf, gst_all_1, json-glib, libdazzle }: +, gdk_pixbuf, gst_all_1, json-glib, libdazzle, libhandy }: stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.30.3"; + version = "3.32.1.2"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "05qdzx18ld1m3xiajpz6y6snfj56bgyjsgm7f4rqrnpjdbdvikbn"; + sha256 = "1gi6g519i0dldwa8bmp047j9mdf8k0asr3ja2m593dy8pfwlya58"; }; # Tests need an X display - mesonFlags = [ "-Dunit_tests=false" ]; + mesonFlags = [ "-Dunit_tests=disabled" ]; nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify - sqlite isocodes p11-kit icu + sqlite isocodes p11-kit icu libhandy gdk_pixbuf gnome3.adwaita-icon-theme gcr glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix index c27e380470a3..4b0ae91d78f5 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,56 +1,116 @@ -{ fetchurl, stdenv, pkgconfig, intltool, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook -, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas +{ fetchFromGitLab +, stdenv +, meson +, ninja +, pkgconfig +, gettext +, libxml2 +, appstream +, glib +, gtk3 +, pango +, atk +, gdk_pixbuf +, shared-mime-info +, itstool +, gnome3 +, poppler +, ghostscriptX +, djvulibre +, libspectre +, libarchive +, libsecret +, wrapGAppsHook +, librsvg +, gobject-introspection +, yelp-tools +, gspell +, adwaita-icon-theme +, gsettings-desktop-schemas +, gnome-desktop +, dbus +, python3 +, texlive +, t1lib +, gst_all_1 +, supportMultimedia ? true # PDF multimedia , libgxps -, recentListSize ? null # 5 is not enough, allow passing a different number -, supportXPS ? false # Open XML Paper Specification via libgxps -, autoreconfHook, pruneLibtoolFiles +, supportXPS ? true # Open XML Paper Specification via libgxps }: stdenv.mkDerivation rec { - name = "evince-${version}"; - version = "3.30.2"; + pname = "evince"; + version = "3.32.0"; - src = fetchurl { - url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = version; + sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "evince"; }; - }; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; nativeBuildInputs = [ - pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook pruneLibtoolFiles + meson + ninja + pkgconfig + gobject-introspection + gettext + itstool + yelp-tools + appstream + wrapGAppsHook + python3 ]; buildInputs = [ - glib gtk3 pango atk gdk_pixbuf libxml2 + glib + gtk3 + pango + atk + gdk_pixbuf + libxml2 gsettings-desktop-schemas - poppler ghostscriptX djvulibre libspectre libarchive - libsecret librsvg adwaita-icon-theme gspell - ] ++ stdenv.lib.optional supportXPS libgxps; + poppler + ghostscriptX + djvulibre + libspectre + libarchive + libsecret + librsvg + adwaita-icon-theme + gspell + gnome-desktop + dbus # only needed to find the service directory + texlive.bin.core # kpathsea for DVI support + t1lib + ] ++ stdenv.lib.optional supportXPS libgxps + ++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); - configureFlags = [ - "--disable-nautilus" # Do not build nautilus plugin - "--enable-ps" - "--enable-introspection" - (if supportXPS then "--enable-xps" else "--disable-xps") + mesonFlags = [ + "-Dauto_features=enabled" + "-Dnautilus=false" + "-Dps=enabled" + "-Dgtk_doc=false" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preConfigure = stdenv.lib.optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Evince; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 62ed7aaa3d84..da99fb68b858 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.30.5"; + version = "3.32.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli"; + sha256 = "0jb8d2a4kzz7an7d3db8mfpvhb6r1wrp8dk11vpa3jby60cxbbyd"; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix index c985d01a5e66..831343811737 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gdm-${version}"; - version = "3.30.3"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak"; + sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4"; }; # Only needed to make it build diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix index ac3a25b7dc74..25c3cef3f6a4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.54.3"; + version = "1.56.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cd65d4nq5xxlyjz1b83hm5zklyry6lillzf782nr0z97k60vcvn"; + sha256 = "0wylq6r0c0gf558hridlyly84vb03qzdrfph21z8dbqy8l7g2937"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index a938a59f7a01..1e332502db5d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-backgrounds-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc"; + sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index e09d0b4e6f93..ebea09224060 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -6,14 +6,14 @@ let pname = "gnome-bluetooth"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.28.2"; + version = "3.32.1"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z"; + sha256 = "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 037509b9c548..38613bae2e9a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,14 +1,14 @@ { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 -, gtk3, glib, gtksourceview3, wrapGAppsHook, gobject-introspection, python3 +, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 , gnome3, mpfr, gmp, libsoup, libmpc }: stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; - version = "3.30.1"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc"; + sha256 = "121fyhrzdf7zf3iis0rlpag7hfg8jsan2zy83x5l00rq7abdpn8d"; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 glib libxml2 gtksourceview3 mpfr gmp + gtk3 glib libxml2 gtksourceview4 mpfr gmp gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libsoup libmpc ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 782a77499f9e..b79651ea4bc7 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -2,13 +2,13 @@ let pname = "gnome-color-manager"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "105bqqq3yvdn5lx94mkl0d450f0l8lmwfjjcwyls1pycmj0vifwh"; + sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 253bbc4e1967..b287cf35194c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -2,16 +2,16 @@ , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts , wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib -, vala, meson, ninja }: +, vala, meson, ninja, libhandy }: let - version = "3.30.2"; + version = "3.32"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h"; + sha256 = "12vr75d5akhs0fzmjg6j21jrrlr8njdrf9dwhw94k8p73y1gjjgw"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; @@ -22,14 +22,18 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas - folks gnome-desktop telepathy-glib + folks gnome-desktop telepathy-glib libhandy libxml2 gnome-online-accounts cheese gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib ]; + mesonFlags = [ + "-Dtelepathy=true" + ]; + postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py ''; # In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0: diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 5e90998b5396..57924dce5b0d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,28 +1,27 @@ { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, librsvg, libnotify, libgudev, libsecret, gnome-color-manager +, gdk_pixbuf, librsvg, libgudev, libsecret, gnome-color-manager , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc -, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd +, libkrb5, networkmanagerapplet, networkmanager, glibc +, libwacom, samba, shared-mime-info, tzdata, libgnomekbd , docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session , fontconfig, sound-theme-freedesktop, grilo, python3 , gtk3, glib, glib-networking, gsettings-desktop-schemas , gnome-desktop, gnome-settings-daemon, gnome-online-accounts -, vino, gnome-bluetooth, tracker, adwaita-icon-theme }: +, vino, gnome-bluetooth, tracker, adwaita-icon-theme +, udisks2, gsound, libhandy, cups }: -let +stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.30.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l"; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl + meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xsl shared-mime-info python3 ]; @@ -30,10 +29,11 @@ in stdenv.mkDerivation rec { ibus gtk3 glib glib-networking upower gsettings-desktop-schemas libxml2 gnome-desktop gnome-settings-daemon polkit libgtop gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk - accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify - grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret + accountsservice libkrb5 networkmanagerapplet libwacom samba + grilo libpwquality vino libcanberra-gtk3 libgudev libsecret gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese networkmanager modemmanager gnome-bluetooth tracker + udisks2 gsound libhandy ]; patches = [ @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { src = ./paths.patch; gcm = gnome-color-manager; inherit glibc libgnomekbd tzdata; + inherit cups networkmanagerapplet; }) ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch index 0c11a7626e40..589461d80405 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch @@ -1,6 +1,8 @@ +diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c +index 49ca35220..adefb87b9 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c -@@ -599,7 +599,7 @@ +@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs) /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); @@ -9,7 +11,7 @@ g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1038,7 +1038,7 @@ +@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); @@ -18,7 +20,7 @@ g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1288,15 +1288,12 @@ +@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) { @@ -35,6 +37,8 @@ gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE); else gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); +diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +index 96b25140c..1ad704d4a 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ @@ -50,24 +54,96 @@ typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; +diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c +index 9390a3308..d30b4a68e 100644 +--- a/panels/network/connection-editor/net-connection-editor.c ++++ b/panels/network/connection-editor/net-connection-editor.c +@@ -247,9 +247,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *editor, const gchar *typ + GError *error = NULL; + + if (editor->is_new_connection) { +- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); + } else { +- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", + nm_connection_get_uuid (editor->connection)); + } + +diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c +index 360fbfc72..870157a11 100644 +--- a/panels/network/net-device-wifi.c ++++ b/panels/network/net-device-wifi.c +@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object) + return; + } + uuid = nm_connection_get_uuid (NM_CONNECTION (connection)); +- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); + g_debug ("Launching '%s'\n", cmdline); + if (!g_spawn_command_line_async (cmdline, &error)) { + g_warning ("Failed to launch nm-connection-editor: %s", error->message); +diff --git a/panels/network/net-device.c b/panels/network/net-device.c +index d73b537b9..e2ee54294 100644 +--- a/panels/network/net-device.c ++++ b/panels/network/net-device.c +@@ -197,7 +197,7 @@ net_device_edit (NetObject *object) + + connection = net_device_get_find_connection (device); + uuid = nm_connection_get_uuid (connection); +- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); ++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); + g_debug ("Launching '%s'\n", cmdline); + if (!g_spawn_command_line_async (cmdline, &error)) { + g_warning ("Failed to launch nm-connection-editor: %s", error->message); +diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c +index f53ba217e..d24bcaeb9 100644 +--- a/panels/printers/pp-host.c ++++ b/panels/printers/pp-host.c +@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, + devices = g_new0 (PpDevicesList, 1); + + argv = g_new0 (gchar *, 3); +- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); ++ argv[0] = g_strdup ("@cups@/lib/cups/backend/snmp"); + argv[1] = g_strdup (priv->hostname); + + /* Use SNMP to get printer's informations */ +diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c +index 35859526d..21486c917 100644 --- a/panels/region/cc-region-panel.c +++ b/panels/region/cc-region-panel.c -@@ -1265,10 +1265,10 @@ - } +@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self, + layout_variant = cc_input_source_get_layout_variant (source); - if (variant && variant[0]) + if (layout_variant && layout_variant[0]) - commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", + commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", - layout, variant); + layout, layout_variant); else - commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", + commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout); g_spawn_command_line_async (commandline, NULL); +diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +index 00239ce0f..617c98870 100644 +--- a/panels/user-accounts/run-passwd.c ++++ b/panels/user-accounts/run-passwd.c +@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) + gchar **envp; + gint my_stdin, my_stdout, my_stderr; + +- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ ++ argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[1] = NULL; + + envp = g_get_environ (); +diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c +index 9cb92007a..84d2f0fa3 100644 --- a/tests/datetime/test-endianess.c +++ b/tests/datetime/test-endianess.c -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ test_endianess (void) g_autoptr(GDir) dir = NULL; const char *name; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index bac8504eeec9..21c152670754 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch +{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib +, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch , libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.30.2.1"; + version = "3.32.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v"; + sha256 = "040s8ia26xyq25zcd9xji9f5jhsddqd7a23jassy429bir34sxkg"; }; enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig which itstool gettext libxslt libxml2 gobject-introspection + pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection gtk-doc docbook_xsl ]; buildInputs = [ @@ -32,15 +32,11 @@ stdenv.mkDerivation rec { bubblewrap_bin = "${bubblewrap}/bin/bwrap"; inherit (builtins) storeDir; }) - (fetchpatch { - name = "fix-missing-font-cache"; - url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch; - sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb"; - }) ]; - configureFlags = [ - "--enable-gtk-doc" + mesonFlags = [ + "-Dgtk_doc=true" + "-Ddesktop_docs=false" ]; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 629dfe0421be..ed3a8e2e9d5e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gnome-disk-utility-${version}"; - version = "3.30.2"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi"; + sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 3e8f7d3617fb..317c7e915841 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,20 +1,20 @@ { stdenv, meson, ninja, gettext, fetchurl , pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme -, wrapGAppsHook, gnome3 }: +, wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { name = "gnome-font-viewer-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5"; + sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3"; }; doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index a72efc61e2fe..9702087ca0d0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-keyring-${version}"; - version = "3.28.2"; + version = "3.31.91"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1"; + sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index d12e558c276f..9ae4a572d93b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook , webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection -, gettext, icu, glib-networking +, gettext, icu, glib-networking, hicolor-icon-theme , libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos }: let pname = "gnome-online-accounts"; - version = "3.30.2"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5"; + sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w"; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -31,6 +31,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gobject-introspection vala gettext wrapGAppsHook libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc + hicolor-icon-theme # for setup-hook ]; buildInputs = [ glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 3ce2a4433acd..f5cc430472d3 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-screenshot"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06dx3svxq6sar4913mrz5lzb7hmc66wck138vmyxj8x8iv1iw0w8"; + sha256 = "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b"; }; doCheck = true; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 34921d46b4cd..38adf7137f76 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-session-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa"; + sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v"; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 7a2271e128de..f51270bcbd20 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,15 +1,48 @@ -{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: +{ stdenv +, substituteAll +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, perl +, gettext +, gtk3 +, glib +, libnotify +, libgnomekbd +, lcms2 +, libpulseaudio +, alsaLib +, libcanberra-gtk3 +, upower +, colord +, libgweather +, polkit +, gsettings-desktop-schemas +, geoclue2 +, systemd +, libgudev +, libwacom +, libxslt +, libxml2 +, networkmanager +, gnome-desktop +, geocode-glib +, docbook_xsl +, wrapGAppsHook +, python3 +, tzdata +, nss +}: stdenv.mkDerivation rec { - name = "gnome-settings-daemon-${version}"; - version = "3.30.2"; + pname = "gnome-settings-daemon"; + version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; + url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63"; }; patches = [ @@ -19,13 +52,41 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook + python3 + ]; buildInputs = [ - ibus gtk3 glib gsettings-desktop-schemas networkmanager - libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib - libcanberra-gtk3 upower colord libgweather xkeyboard_config nss - polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom + gtk3 + glib + gsettings-desktop-schemas + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + lcms2 + libpulseaudio + alsaLib + libcanberra-gtk3 + upower + colord + libgweather + nss + polkit + geocode-glib + geoclue2 + systemd + libgudev + libwacom ]; mesonFlags = [ @@ -41,8 +102,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-settings-daemon"; - attrPath = "gnome3.gnome-settings-daemon"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index ec6d1af015a5..5e4182afb107 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1grxn4f5x754r172wmnf0h0xpy69afmj359zsj1rwgqlzw4i4c5p"; + sha256 = "0wzrivhp6vs4754yldza38gkhkhah35rdncb3c3hxhhyv9fr3pl5"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch index c384826de617..555664e8ae25 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch @@ -1,24 +1,11 @@ -From f72924a59d4a30daefccf84526bd854ebbe65ac8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com> -Date: Tue, 3 Apr 2018 14:13:12 +0200 -Subject: [PATCH] Fix gmenu typelib path - ---- - extensions/apps-menu/extension.js | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js -index 5b38213..d706f64 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js -@@ -1,5 +1,7 @@ +@@ -1,6 +1,8 @@ /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */ + /* exported init enable disable */ +imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); + - const Atk = imports.gi.Atk; - const DND = imports.ui.dnd; - const GMenu = imports.gi.GMenu; --- -2.16.2 - + const { + Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St + } = imports.gi; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 693a3bec4868..fb92d55c7994 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "gnome-shell-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0kacd4w9lc5finsvs170i7827qkxwd1ddj0g2giizwffpjdjqqr2"; + sha256 = "1djkswsv3fhb3lf2w77bbl6z2kvji29cfxbwh5gqvyykwwx87y92"; }; LANG = "en_US.UTF-8"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch index 32a0cc476da0..3207af110885 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch @@ -11,12 +11,12 @@ null); --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js -@@ -1019,7 +1019,7 @@ +@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button { + let description = xkbLayout; if (xkbVariant.length > 0) description = description + '\t' + xkbVariant; - Util.spawn(['gkbd-keyboard-display', '-l', description]); + Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); - }, - - _containerGetPreferredWidth: function(container, for_height, alloc) { + } + }); diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix index cab777f4febe..0cd8267f5210 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,15 +1,15 @@ { 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 +, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts, hicolor-icon-theme , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-software-${version}"; - version = "3.30.6"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00lh1ifgcs888i0774qdz2pzd5vnzcc5kvx20lcmgk37vvf0qqsl"; + sha256 = "19hrvkyavrfrhs19ii4ky5bpzsijiyq2vcxb5s4xk13xv8ys2151"; }; patches = [ @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection + hicolor-icon-theme # for setup-hook ]; buildInputs = [ @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree polkit flatpak fwupd + libxmlb gnome-online-accounts ]; mesonFlags = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 4b02411b4863..7a469239fc51 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-system-monitor-${version}"; - version = "3.30.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0g0y565bjs6bdszrnxsz1f7hcm1x59i3mfvplysirh7nz3hpz888"; + sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8"; }; doCheck = true; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 6bde15ba762e..9b25ae9218d4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-terminal-${version}"; - version = "3.30.2"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb"; + sha256 = "0i613844gf5dmzpvwiy68lg8walhj4zr88scacp2qwpqs870si8x"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 7062dbafce8a..02bcb52b3875 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-user-docs-${version}"; - version = "3.30.2"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1pgsrvd79rqxa183wsmzh422y2zsg7fl5hskgc0s87jsc8b57fkg"; + sha256 = "09g6fi9b1xpk0fnp6wgh350v1x318mrf20j4bfarww25vrj6irrw"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 134ba41d6534..65f9fb0db806 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,25 +1,30 @@ -{ stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme -, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: +{ stdenv +, gettext +, fetchurl +, apacheHttpd +, nautilus +, pkgconfig +, gtk3 +, glib +, libxml2 +, systemd +, wrapGAppsHook +, itstool +, libnotify +, mod_dnssd +, gnome3 +, libcanberra-gtk3 +}: stdenv.mkDerivation rec { - name = "gnome-user-share-${version}"; - version = "3.28.0"; + pname = "gnome-user-share"; + version = "3.32.0.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; }; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ @@ -29,22 +34,35 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" + "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" + "--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0" + ]; + + nativeBuildInputs = [ + pkgconfig + gettext + itstool + libxml2 + wrapGAppsHook ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 glib intltool itstool libxml2 libtool - wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg - nautilus libnotify libcanberra-gtk3 systemd + gtk3 + glib + nautilus + libnotify + libcanberra-gtk3 + systemd ]; - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - glib-compile-schemas "$out/share/gsettings-schemas/$name/glib-2.0/schemas" - ''; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-user-share/3.8; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index dad0c8850b22..c1bdcd6956e7 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -1,23 +1,29 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection +, meson +, ninja +, python3 # just for passthru , gnome3 }: stdenv.mkDerivation rec { name = "gsettings-desktop-schemas-${version}"; - version = "3.28.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq"; + sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; }; + # meson installs the schemas to share/glib-2.0/schemas + # We add the override file there too so it will be compiled and later moved by + # glib's setup hook. preInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas - cat - > $out/share/gsettings-schemas/${name}/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + mkdir -p $out/share/glib-2.0/schemas + cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF [org.gnome.desktop.background] picture-uri=''' @@ -26,9 +32,14 @@ stdenv.mkDerivation rec { EOF ''; + postPatch = '' + chmod +x build-aux/meson/post-install.py + patchShebangs build-aux/meson/post-install.py + ''; + buildInputs = [ glib gobject-introspection ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig python3 meson ninja ]; meta = with stdenv.lib; { maintainers = gnome3.maintainers; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 2b7794a9a8ef..3d32a1c24368 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -7,17 +7,17 @@ let unicode-data = callPackage ./unicode-data.nix {}; in stdenv.mkDerivation rec { - name = "gucharmap-${version}"; - version = "11.0.3"; + pname = "gucharmap"; + version = "12.0.1"; outputs = [ "out" "lib" "dev" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = "gucharmap"; + repo = pname; rev = version; - sha256 = "1a590nxy8jdf6zxh6jdsyvhxyaz94ixx3aa1pj7gicf1aqp26vnh"; + sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw"; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "gucharmap"; + packageName = pname; }; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index 6bf2fd39a2d3..cfdda920e27c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,31 +1,31 @@ { fetchurl, stdenv, gnome3 }: stdenv.mkDerivation rec { name = "unicode-data-${version}"; - version = "11.0.0"; + version = "12.0.0"; srcs = [ (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/Blocks.txt"; - sha256 = "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b"; + sha256 = "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/DerivedAge.txt"; - sha256 = "0rlqqd0b1sqbzvrj29dwdizx8lyvrbfirsnn8za9lb53x5fml4gb"; + sha256 = "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/NamesList.txt"; - sha256 = "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8"; + sha256 = "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/Scripts.txt"; - sha256 = "1mbnvf97nwa3pvyzx9nd2wa94f8s0npg9740kic2p2ag7jmc1wz9"; + sha256 = "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/UnicodeData.txt"; - sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; + sha256 = "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap"; }) (fetchurl { url = "http://www.unicode.org/Public/${version}/ucd/Unihan.zip"; - sha256 = "0cy8gxb17ksi5h4ysypk4c09z61am1svjrvg97hm5m5ccjfrs1vj"; + sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"; }) ]; phases = "installPhase"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix index 518b0ec1c48c..4d3e72e7ff00 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,39 +1,25 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +{ fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 -, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput +, ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , gsettings-desktop-schemas, glib, gtk3, gnome-desktop -, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, geocode-glib, pipewire, libgudev, libwacom, xwayland, meson +, gnome-settings-daemon +, xorgserver +, python3 +, wrapGAppsHook +}: stdenv.mkDerivation rec { name = "mutter-${version}"; - version = "3.30.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z"; + sha256 = "068zir5c1awmzb31gx94zjykv6c3xb1p5pch7860y3xlihha4s3n"; }; - patches = [ - # https://gitlab.gnome.org/GNOME/mutter/issues/270 - # Fixes direction of the desktop switching animation when using workspace - # grid extension with desktops arranged horizontally. - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/mutter/commit/92cccf53dfe9e077f1d61ac4f896fd391f8cb689.patch; - sha256 = "11vmypypjss50xg7hhdbqrxvgqlxx4lnwy59089qsfl3akg4kk2i"; - }) - ]; - - configureFlags = [ - "--with-x" - "--disable-static" - "--enable-remote-desktop" - "--enable-shape" - "--enable-sm" - "--enable-startup-notification" - "--enable-xsync" - "--enable-verbose-mode" - "--with-libcanberra" - "--with-xwayland-path=${xwayland}/bin/Xwayland" + mesonFlags = [ + "-Dxwayland-path=${xwayland}/bin/Xwayland" ]; propagatedBuildInputs = [ @@ -41,19 +27,39 @@ stdenv.mkDerivation rec { libXtst ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; + nativeBuildInputs = [ + meson + pkgconfig + gettext + ninja + python3 + # for cvt command + xorgserver + wrapGAppsHook + ]; buildInputs = [ glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon pipewire + libxkbcommon pipewire xwayland + gnome-settings-daemon ]; - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch new file mode 100644 index 000000000000..6ac0a431f61f --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 57b73747d..f424cc81c 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch index e3ad75b869c8..37358c8432c5 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch @@ -1,20 +1,15 @@ --- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c +++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array, +@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/lib", "/lib", -- "--ro-bind", "/lib64", "/lib64", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", + "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", - "--proc", "/proc", - "--dev", "/dev", -- "--symlink", "usr/bin", "/bin", -- "--symlink", "usr/sbin", "/sbin", - "--chdir", "/", - "--setenv", "GIO_USE_VFS", "local", - "--unshare-all", + NULL); + + /* These directories might be symlinks into /usr/... */ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix index 715686460a38..6dea270f6c0a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -2,18 +2,18 @@ , desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf -, substituteAll, bubblewrap +, substituteAll, bubblewrap, gst_all_1 }: let pname = "nautilus"; - version = "3.30.5"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv"; + sha256 = "1pnh32fal7dkwadga5savg1nv0zqnbakhk0hxr5726087i6y6ii2"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux - tracker tracker-miners gexiv2 libseccomp bubblewrap + tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 742819e0ba17..ad2ac5d6e690 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.30.2"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0dknvdjlnxrp9nxd3yr8wyjc4kv94nwglss8pr6rfvl4hnlly53i"; + sha256 = "12r5hacwpf0gzca3p73xpmx3dksa1kx50nlj6w4nw8jfqzjlkq1k"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix index 77c216e73764..478aac8c1731 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gobject-introspection, glib -, clutter-gtk, clutter-gst, gnome3, aspell, hspell, gtksourceview, gjs +{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib +, clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs , webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1 -, gdk_pixbuf, librsvg, gtk3, harfbuzz }: +, gdk_pixbuf, librsvg, gtk3, harfbuzz, ninja }: stdenv.mkDerivation rec { name = "sushi-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zpaiw5r734fky3zq95a6szwn7srbkpixajqg2xvdivhhx4mbnnj"; + sha256 = "0f1i8qp39gq749h90f7nwgrj4q6y55jnyh62n1v8hxvlk0b2wqnx"; }; - nativeBuildInputs = [ pkgconfig file intltool gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig meson ninja gettext gobject-introspection wrapGAppsHook + ]; buildInputs = [ glib gtk3 gnome3.evince icu harfbuzz clutter-gtk clutter-gst gjs gtksourceview gdk_pixbuf librsvg libmusicbrainz5 webkitgtk gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - # cannot find -laspell, -lhspell - aspell hspell ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix index d4a66b6c4936..d3319c4522e4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1 +{ stdenv, fetchurl, meson, ninja, gettext, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser , wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins , libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas -, gdk_pixbuf, tracker, nautilus }: +, gdk_pixbuf, tracker, nautilus, xvfb_run }: stdenv.mkDerivation rec { name = "totem-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0"; + sha256 = "12iykwslvnpgmrm4bcchx5rzn2g4rl5r9s86n2001djn58yw6m6r"; }; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja vala pkgconfig gettext python3Packages.python itstool gobject-introspection wrapGAppsHook ]; buildInputs = [ gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad @@ -41,6 +39,13 @@ stdenv.mkDerivation rec { "-Denable-vala=no" ]; + checkInputs = [ xvfb_run ]; + + checkPhase = '' + xvfb-run -s '-screen 0 800x600x24' \ + ninja test + ''; + wrapPrefixVariables = [ "PYTHONPATH" ]; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 85bb32972f4b..3f8f5cf8c888 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -8,11 +8,11 @@ let pname = "tracker-miners"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2.1.5"; + version = "2.2.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1kdq7fk9c80ngg65p31pjdk4za0fq7nfhblqsma9alvkam5kvzgm"; + sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr"; }; nativeBuildInputs = [ @@ -64,6 +64,7 @@ in stdenv.mkDerivation rec { # TODO: tests do not like our sandbox "-Dfunctional_tests=false" "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" ]; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch index 47ad114eb0b5..724c51cb56f8 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -1,25 +1,3 @@ ---- a/meson.build -+++ b/meson.build -@@ -25,15 +25,15 @@ - # - # This check acts as a guard to make sure we are being configured with the - # right prefix, among other things. -- tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store')) -+ tracker_store = find_program(join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'libexec', 'tracker-store')) - tracker_store_path = tracker_store.path() - - # If we are building against an installed version of tracker core rather than - # having it as a subproject, these 'uninstalled' locations point to the actual - # installed locations. -- tracker_uninstalled_domain_rule = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'domain-ontologies', 'default.rule') -- tracker_uninstalled_nepomuk_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'ontologies', 'nepomuk') -- tracker_uninstalled_stop_words_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'stop-words', 'default.rule') -+ tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule') -+ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk') -+ tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule') - else - tracker_subproject = subproject('tracker', - default_options: [ --- a/src/libtracker-miners-common/tracker-domain-ontology.c +++ b/src/libtracker-miners-common/tracker-domain-ontology.c @@ -323,7 +323,7 @@ diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/tracker/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/tracker/default.nix index d744fc6c87c7..36199c3818c4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python2 +{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python3 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer -, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: +, gnome3, icu, libuuid, networkmanager, libsoup, json-glib +, substituteAll}: let pname = "tracker"; - version = "2.1.6"; + version = "2.2.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,13 +14,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "143zapq50lggj3mpqg2y4rh1hgnkbn9vgvzpqxr7waiawsmx0awq"; + sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc"; }; nativeBuildInputs = [ meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales - python2 # for data-generators + python3 # for data-generators ]; buildInputs = [ @@ -29,31 +30,23 @@ in stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ - "-Ddbus_services=share/dbus-1/services" - "-Dsystemd_user_services=lib/systemd/user" + "-Ddbus_services=${placeholder ''out''}/share/dbus-1/services" + "-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" + "-Ddocs=true" ]; patches = [ - # Always generate tracker-sparql.h in time - (fetchurl { - url = https://gitlab.gnome.org/GNOME/tracker/commit/3cbfaa5b374e615098e60eb4430f108b642ebe76.diff; - sha256 = "0smavzvsglpghggrcl8sjflki13nh7pr0jl2yv6ymbf5hr1c4dws"; + (substituteAll { + src = ./fix-paths.patch; + gdbus = "${glib.bin}/bin/gdbus"; }) ]; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate - - # make .desktop Exec absolute - patch -p0 <<END_PATCH - +++ src/tracker-store/tracker-store.desktop.in.in - @@ -4 +4 @@ - -Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 - +Exec=${glib.dev}/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 - END_PATCH ''; postInstall = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch new file mode 100644 index 000000000000..f5c13c3fcdaf --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/core/tracker/fix-paths.patch @@ -0,0 +1,12 @@ +--- a/src/tracker-store/tracker-store.desktop.in ++++ b/src/tracker-store/tracker-store.desktop.in +@@ -1,8 +1,8 @@ + [Desktop Entry] + Name=Tracker Store + Comment=Metadata database store and lookup manager +-Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 ++Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 + Terminal=false + Type=Application + Categories=Utility; + X-GNOME-Autostart-enabled=true diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index 6f487eacf972..41120a74b084 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yelp-tools-${version}"; - version = "3.28.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2"; + sha256 = "037fd6xpy3zab7j5p7c0vfc6c3nk6qs0prvz1hbilzc31p8l1pdz"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 7e98012998dc..f1a393117280 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "yelp-xsl-${version}"; - version = "3.30.1"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw"; + sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix index 644c27938318..ecbb7b277ff3 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,18 +1,18 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +{ stdenv, gettext, fetchurl, webkitgtk, pkgconfig, gtk3, glib , gnome3, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { name = "yelp-${version}"; - version = "3.30.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "060a902j15k76fyhk8xfl38ipvrrcc0qd7nm2mcck4ifb45b0zv4"; + sha256 = "159ayfyswn9yh7g5hjs6lphh510n6qkyd1cj47hnc3ynnab9hn4r"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; buildInputs = [ gtk3 glib webkitgtk sqlite libxml2 libxslt gnome3.yelp-xsl diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix index a347c8f2f9db..89d0fd7a3b90 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "zenity-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr"; + sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; }; preBuild = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/default.nix b/nixpkgs/pkgs/desktops/gnome-3/default.nix index 41b0ccf6268c..b120b693d657 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/default.nix @@ -54,7 +54,7 @@ lib.makeScope pkgs.newScope (self: with self; { libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; - vala = pkgs.vala_0_42; + vala = pkgs.vala_0_44; gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; }; # ISO installer @@ -229,6 +229,8 @@ lib.makeScope pkgs.newScope (self: with self; { glade = callPackage ./apps/glade { }; + gnome-books = callPackage ./apps/gnome-books { }; + gnome-boxes = callPackage ./apps/gnome-boxes { }; gnome-calendar = callPackage ./apps/gnome-calendar { }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 4a634de94478..80a3770b7030 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "devhelp-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a"; + sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 534c23da82c9..647e7163d0b9 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnome-devel-docs-${version}"; - version = "3.30.2"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1sssxagf0aaiyld8731247qq74bnrnq4arr7mpjrg0j6gwdfgxia"; + sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index c576112d57b9..d8180096d2f0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { name = "gnome-shell-extension-appindicator-${version}"; - version = "22"; + version = "28"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "1gqw54d55hxjj2hh04p0dx2j40bhi4ck9hgwlz8f7j4v7r37z0qw"; + sha256 = "03sgb2xkb4lzp8pbb7g56q29y1r764qzpc0j4d4m1gi0sb39sxrl"; }; # This package has a Makefile, but it's used for building a zip for @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato ]; + platforms = gnome3.gnome-shell.meta.platforms; homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator; }; } diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix index e1fe15c19d80..afedd5f98e1a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configurable lightweight battery charge indicator and autohider"; license = licenses.gpl2; + broken = true; # not compatable with latest GNOME maintainers = with maintainers; [ jonafato ]; homepage = https://github.com/milliburn/gnome-shell-extension-battery_status; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index 1de85ab36d25..e627bec8b931 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-caffeine-${version}"; - version = "unstable-2018-09-25"; + version = "unstable-2019-04-02"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "gnome-shell-extension-caffeine"; - rev = "71b6392c53e063563602c3d919c0ec6a4c5c9733"; - sha256 = "170zyxa41hvyi463as650nw3ygr297901inr3xslrhvjq1qacxri"; + rev = "a6b37dee108cddf50a0f0a19f0101854a75bf173"; + sha256 = "1j3q12j36v97551sjb0c8qc8zr7a7gmxibygczryfdfmwjzp6icl"; }; uuid = "caffeine@patapon.info"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 3064b62f2a4a..755c8e1b02fb 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: let - version = "10"; + version = "10.1"; inherit (python3.pkgs) python pygobject3 requests; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; - sha256 = "1wp6qvcp758yfj8xlj15sk1d3jsb1p8136y8xxwpi9wfdjpzjs8j"; + sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; }; nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 4e94f07692b7..06e7d27c5444 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-dash-to-dock-${version}"; - version = "65"; + version = "66"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-v" + version; - sha256 = "0ln49l9s0yfl30pi77pz7xlmh63l9vjppi863kry5lay10dsvz47"; + sha256 = "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index de442d912b32..0d48b8359c91 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-dash-to-panel-${version}"; - version = "16"; + version = "19"; src = fetchFromGitHub { - owner = "jderose9"; + owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "1gi2qfinafihax0j0rbs1k5nf6msdv86gzl2vfkc8s6gfkncv9bp"; + sha256 = "0r26ph6zq87kvglydv00rf24mshz7l4r38zf9niyp3mxyzz6rwys"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 9c2f72cce664..75c34b4b99d3 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, substituteAll, python3, openssl +{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, folks, gsound , meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook , glib, gtk3, at-spi2-core, upower, openssh, gnome3 }: stdenv.mkDerivation rec { name = "gnome-shell-gsconnect-${version}"; - version = "20"; + version = "21"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "1x5lrb4hdw482hr5dh4ki0p1651w1s0ijs96vs65vrh15cd60h02"; + sha256 = "0ikkb2rly3h4qglswn15vs8f2kl727gpri5c9x3jiy27ylag7yav"; }; patches = [ @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { glib # libgobject gtk3 at-spi2-core # atspi - gnome3.folks # libfolks + folks # libfolks gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension gnome3.nautilus-python - gnome3.gsound + gsound upower gnome3.caribou gnome3.gjs # for running daemon @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { preFixup = '' # TODO: figure out why folks GIR does not contain shared-library attribute # https://github.com/NixOS/nixpkgs/issues/47226 - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.folks ]}") + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ folks ]}") ''; postFixup = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index bc397dc7122a..f5069b8753b5 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icon Hider is a GNOME Shell extension for managing status area items"; license = licenses.bsd3; + broken = true; # not compatable with latest GNOME maintainers = with maintainers; [ jonafato ]; platforms = platforms.linux; homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix index 6038443944f2..686d7be91a47 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extensions-mediaplayer-${version}"; - version = "3.5"; + version = "unstable-2019-03-21"; src = fetchFromGitHub { owner = "JasonLG1979"; repo = "gnome-shell-extensions-mediaplayer"; - rev = version; - sha256 = "0b8smid9vdybgs0601q9chlbgfm1rzrj3vmd3i6p2a5d1n4fyvsc"; + rev = "b382c98481fa421501684e2ff3eafc53971ef22b"; + sha256 = "01z2dml8dvl5sljw62g7x19mz02dz1g4gkmyp0h5bx49djcw1nnh"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index e1dedd2a88be..8c075a11bdcd 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { description = "Integrates maximized windows with the top panel"; homepage = https://github.com/franglais125/no-title-bar; license = licenses.gpl2; + broken = true; # https://github.com/franglais125/no-title-bar/issues/114 maintainers = with maintainers; [ jonafato svsdep ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix index 07622e07a725..21ff70140be1 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-nohotcorner-${version}"; - version = "18.0"; + version = "19.0"; src = fetchFromGitHub { owner = "HROMANO"; repo = "nohotcorner"; rev = "v${version}"; - sha256 = "0vajiys93gs7fs9v6brgf8fplkmh28j103in3wq04l34cx5sqkks"; + sha256 = "059n4gyz7d686hknaifyjax8gygrda1xab5m15a09p98jdrdfdhi"; }; # Taken from the extension download link at diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index 42cd6d217de7..5faa55652d8a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-remove-dropdown-arrows-${version}"; - version = "9"; + version = "11"; src = fetchFromGitHub { owner = "mpdeimos"; repo = "gnome-shell-remove-dropdown-arrows"; rev = "version/${version}"; - sha256 = "1z9icxr75rd3cas28xjlmsbbd3j3sm1qvj6mp95jhfaqj821q665"; + sha256 = "1g99r9bpjdhab3xj74wkl40gdnaf2w51kswcr8mi6bq72n4wjxwh"; }; # This package has a Makefile, but it's used for publishing and linting, not diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index a1cc96d8b7b1..a3a351e4a65c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "unstable-2018-12-30"; + version = "unstable-2019-03-10"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; - rev = "3ec8aded413034e7943eb36ee509405873ccc575"; - sha256 = "1svc3d3pr2j7fr0660a0zj2n320vld8zkkddf5iphbdwivmkrh3n"; + rev = "26c66da6795104802f3240bd9f5741f64367c8e7"; + sha256 = "153cdd0pip4nbpc2a9y1v3y7qivafv3wk296zqdamcjrd0p94nqz"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 8bafbd003d51..7046e6737269 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; + broken = true; # GNOME 3.32 support WIP: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/510 maintainers = with maintainers; [ aneeshusa tiramiseb ]; homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index fcaa868c06f2..c72d72cce126 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -1,36 +1,35 @@ -{ stdenv, substituteAll, fetchFromGitHub, taskwarrior }: +{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }: stdenv.mkDerivation rec { name = "gnome-shell-extension-taskwhisperer-${version}"; - version = "11"; + version = "12"; src = fetchFromGitHub { owner = "cinatic"; repo = "taskwhisperer"; rev = "v${version}"; - sha256 = "1g1301rwnfg5jci78bjpmgxrn78ra80m1zp2inhfsm8jssr1i426"; + sha256 = "187p6p498dd258avsfqqsm322g58y75pc2wbhb4jpmm9insqm1bj"; }; - buildInputs = [ taskwarrior ]; + nativeBuildInputs = [ + gettext + ]; + + buildInputs = [ + taskwarrior + ]; uuid = "taskwhisperer-extension@infinicode.de"; - installPhase = '' - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp *.js $out/share/gnome-shell/extensions/${uuid} - cp -r extra $out/share/gnome-shell/extensions/${uuid} - cp -r icons $out/share/gnome-shell/extensions/${uuid} - cp -r locale $out/share/gnome-shell/extensions/${uuid} - cp -r schemas $out/share/gnome-shell/extensions/${uuid} - cp metadata.json $out/share/gnome-shell/extensions/${uuid} - cp settings.ui $out/share/gnome-shell/extensions/${uuid} - cp stylesheet.css $out/share/gnome-shell/extensions/${uuid} - ''; + makeFlags = [ + "INSTALLBASE=${placeholder ''out''}/share/gnome-shell/extensions" + ]; patches = [ (substituteAll { src = ./fix-paths.patch; task = "${taskwarrior}/bin/task"; + shell = "${runtimeShell}"; }) ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch index 310d6ea1b305..2ea54f4b0897 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch @@ -1,22 +1,22 @@ -diff --git a/extra/create.sh b/extra/create.sh +diff --git a/taskwhisperer-extension@infinicode.de/extra/create.sh b/taskwhisperer-extension@infinicode.de/extra/create.sh index a69e369..35d5ea1 100755 ---- a/extra/create.sh -+++ b/extra/create.sh +--- a/taskwhisperer-extension@infinicode.de/extra/create.sh ++++ b/taskwhisperer-extension@infinicode.de/extra/create.sh @@ -1 +1 @@ -bash -c "task add $1" +bash -c "@task@ add $1" -diff --git a/extra/modify.sh b/extra/modify.sh +diff --git a/taskwhisperer-extension@infinicode.de/extra/modify.sh b/taskwhisperer-extension@infinicode.de/extra/modify.sh index 7964a26..8edd21b 100755 ---- a/extra/modify.sh -+++ b/extra/modify.sh +--- a/taskwhisperer-extension@infinicode.de/extra/modify.sh ++++ b/taskwhisperer-extension@infinicode.de/extra/modify.sh @@ -1 +1 @@ -bash -c "task $1 modify $2" +bash -c "@task@ $1 modify $2" -diff --git a/taskService.js b/taskService.js -index dea40d8..ff35a80 100644 ---- a/taskService.js -+++ b/taskService.js -@@ -186,7 +186,7 @@ const TaskService = new Lang.Class({ +diff --git a/taskwhisperer-extension@infinicode.de/taskService.js b/taskwhisperer-extension@infinicode.de/taskService.js +index ead7a12..aa36db4 100644 +--- a/taskwhisperer-extension@infinicode.de/taskService.js ++++ b/taskwhisperer-extension@infinicode.de/taskService.js +@@ -182,7 +182,7 @@ const TaskService = class TaskService { let project = projectName ? "project:" + projectName : ""; @@ -25,57 +25,75 @@ index dea40d8..ff35a80 100644 let reader = new SpawnReader.SpawnReader(); let buffer = ""; -@@ -227,7 +227,7 @@ const TaskService = new Lang.Class({ +@@ -220,7 +220,7 @@ const TaskService = class TaskService { break; } - let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; -@@ -274,7 +274,7 @@ const TaskService = new Lang.Class({ +@@ -261,7 +261,7 @@ const TaskService = class TaskService { return; } - let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; -@@ -307,7 +307,7 @@ const TaskService = new Lang.Class({ +@@ -290,7 +290,7 @@ const TaskService = class TaskService { return; } - let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; -@@ -339,7 +339,7 @@ const TaskService = new Lang.Class({ - { +@@ -318,7 +318,7 @@ const TaskService = class TaskService { + if (!taskID) { return; } - let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; shellProc.wait_finish(result); -@@ -369,7 +369,7 @@ const TaskService = new Lang.Class({ - { +@@ -344,7 +344,7 @@ const TaskService = class TaskService { + if (!taskID) { return; } - let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); + let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE); - shellProc.wait_async(null, function(obj, result){ + shellProc.wait_async(null, function (obj, result) { let shellProcExited = true; shellProc.wait_finish(result); -@@ -468,7 +468,7 @@ const TaskService = new Lang.Class({ +@@ -374,7 +374,7 @@ const TaskService = class TaskService { + // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the + // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) + // bypassing problem with own shell script +- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); ++ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); - try - { + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -403,7 +403,7 @@ const TaskService = class TaskService { + // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the + // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de) + // bypassing problem with own shell script +- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); ++ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE); + + shellProc.wait_async(null, function (obj, result) { + let shellProcExited = true; +@@ -432,7 +432,7 @@ const TaskService = class TaskService { + let shellProc; + + try { - shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); + shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE); - } - catch(err) - { + } catch (err) { + onError(err); + return; diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix index dcc018d18837..604b7433ccb4 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gnome-shell-extension-timepp-${version}"; - version = "2018.03.17"; + version = "unstable-2019-03-30"; src = fetchFromGitHub { owner = "zagortenay333"; repo = "timepp__gnome"; - rev = "440cf85dc68d9e6ba876793f13910ee6239622cf"; - sha256 = "0idsqsii5rvynvj78w2j7xiiz9rrl3384m5mj6bf6rg8vprpfi8v"; + rev = "f90fb5573b37ac89fb57bf62e07d6d3bdb6a2c63"; + sha256 = "0p6rsbm6lf61vzly775qkwc2rcjjl38bkqdxnv4sccqmw2wwclnp"; }; uuid = "timepp@zagortenay333"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = " A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; + 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; maintainers = with maintainers; [ svsdep ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix index d77439b30c52..3e274c35cdd9 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -3,12 +3,12 @@ , guile_2_0, libcanberra-gtk3 }: stdenv.mkDerivation rec { - name = "aisleriot-${version}"; - version = "3.22.7"; + pname = "aisleriot"; + version = "3.22.8"; src = fetchurl { - url = "mirror://gnome/sources/aisleriot/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ysljnrlvzssgbhxcgb28n9k3l0rybxi5lkrm8pg6a4nspaw5mc4"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815"; }; configureFlags = [ @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "aisleriot"; - attrPath = "gnome3.aisleriot"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix index 33980f2d0357..00b3a04a1683 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -3,13 +3,13 @@ let pname = "atomix"; - version = "3.30.0.1"; + version = "3.32.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0hvr36m8ixa172zblv29fga1cn9yb84zqbisb21msfkwia2pabw3"; + sha256 = "19wpm7mn6r7x6jz1r0kkqg3xa69iycvgb7g7i8wi0d3cx0rsgjkl"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix index a3bb2df918ae..21f089b324ef 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3 }: +, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { name = "five-or-more-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00d729p251kh96624i7qg2370r5mxwafs016i6hy01vsr71jzb9x"; + sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook + vala + ]; buildInputs = [ gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 8955bcbc4984..94428d6640d0 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,18 +1,27 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, gettext, itstool, libcanberra-gtk3, librsvg, libxml2 }: +, gettext, meson, libcanberra-gtk3, librsvg, itstool, vala +, python3, ninja, desktop-file-utils }: stdenv.mkDerivation rec { name = "four-in-a-row-${version}"; - version = "3.28.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k"; + sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook gettext meson itstool vala + ninja python3 desktop-file-utils + ]; buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ]; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "four-in-a-row"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 5812f16d2960..c6c24be4be8c 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-chess-${version}"; - version = "3.30.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1gzdm6z54kxx06lh616g33klrp4dby2a68wxvjpsavdll28kgwgl"; + sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index ab1a54c0575f..c913a9e87294 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -1,19 +1,30 @@ { stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils -, glib, librsvg, libxml2, intltool, itstool, libgee, libgnome-games-support }: +, glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support +, meson, ninja, python3 +}: let pname = "gnome-klotski"; - version = "3.22.3"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f"; + sha256 = "1p4s15gxj6gasix22z9vlx2yrx196fvcxr6v6qrl569idfgjbi72"; }; - nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ]; - buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ + pkgconfig vala meson ninja python3 wrapGAppsHook + gettext itstool libxml2 appstream-glib desktop-file-utils + gnome3.adwaita-icon-theme + ]; + buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; passthru = { updateScript = gnome3.updateScript { diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index c64ee968f19f..ee55b5a65a5d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -1,25 +1,36 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: +, librsvg, gettext, itstool, libxml2 +, meson, ninja, python3, vala, desktop-file-utils +}: stdenv.mkDerivation rec { name = "gnome-mahjongg-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; + sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + meson ninja vala python3 desktop-file-utils + pkgconfig gnome3.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook + ]; buildInputs = [ - gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.adwaita-icon-theme + gtk3 librsvg ]; + postPatch = '' + chmod +x data/meson_post_install.py + patchShebangs data/meson_post_install.py + ''; + + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Mahjongg; description = "Disassemble a pile of tiles by removing matching pairs"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 6ec18e55cf0e..9ceb65f83083 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -1,22 +1,25 @@ { stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee }: +, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-mines-${version}"; - version = "3.30.1.1"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "08ddk400sg1g3q26gnm5mgv81vdqyix0yl7pd47p50vkc1w6f33z"; + sha256 = "13ia8a7bmdnp1281lwp8nvdqqkclvg1n3pw4bbr2dgsrsswfkscj"; }; # gobject-introspection for finding vapi files - nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja vala gobject-introspection pkgconfig gettext itstool python3 + libxml2 wrapGAppsHook desktop-file-utils + ]; buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' - chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file - patchShebangs data/meson_compile_gschema.py + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py ''; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index ad522c4f56a9..cbac95c8f41e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-nibbles-${version}"; - version = "3.24.1"; + version = "3.31.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "19g44cnrb191v50bdvy2qkrfhvyfsahd0kx9hz95x9gkjfn2nn35"; + sha256 = "0wg0l3aghkxcwp74liw115qjzy6w18hn80mhsz4lrjpnbpaivi18"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index b881dbbf8009..2b40548d37ce 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,26 +1,34 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support -, libgee}: +, librsvg, libcanberra-gtk3, gettext, itstool, libxml2, libgnome-games-support +, libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { name = "gnome-robots-${version}"; - version = "3.22.3"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk"; + sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig meson ninja python3 + libxml2 wrapGAppsHook gettext itstool desktop-file-utils + hicolor-icon-theme # For setup-hook + ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 - libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee + gtk3 librsvg libcanberra-gtk3 libgnome-games-support libgee adwaita-icon-theme ]; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Robots; description = "Avoid the robots and make them crash into each other"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 0996b9bf10b4..5c3fafd3d02a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { name = "gnome-sudoku-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f"; + sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; buildInputs = [ gtk3 libgee json-glib qqwing ]; postPatch = '' - chmod +x post_install.py # patchShebangs requires executable file - patchShebangs post_install.py + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py ''; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 583072d84703..06914d9817c7 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,23 +1,28 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, intltool, itstool, libxml2 }: +, librsvg, libcanberra-gtk3, gettext, itstool, libxml2 +, meson, ninja, vala, python3, desktop-file-utils +}: stdenv.mkDerivation rec { name = "gnome-taquin-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0qijv7wyrjlj56m79la4k7m00712v2m1m994vfx43x3v4isxidgp"; + sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook meson ninja python3 + gettext itstool libxml2 vala desktop-file-utils + ]; buildInputs = [ - gtk3 wrapGAppsHook librsvg libcanberra-gtk3 - intltool itstool libxml2 gnome3.adwaita-icon-theme + gtk3 librsvg libcanberra-gtk3 + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index f3f1fdbc415c..ab0f0f0faf2d 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -1,24 +1,34 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: +, libxml2, gettext, itstool, meson, ninja, python3 +, vala, desktop-file-utils +}: stdenv.mkDerivation rec { name = "gnome-tetravex-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; + sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl"; }; passthru = { updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme + pkgconfig gettext meson ninja python3 vala desktop-file-utils + ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme + gtk3 ]; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Tetravex; description = "Complete the puzzle by matching numbered tiles"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix index ebbbe9d1ceee..72cce760b03e 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -1,25 +1,61 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, glib +, gtk3 +, cairo +, wrapGAppsHook +, libxml2 +, python3 +, gettext +, itstool +, desktop-file-utils +, adwaita-icon-theme +}: stdenv.mkDerivation rec { - name = "hitori-${version}"; - version = "3.22.4"; + pname = "hitori"; + version = "3.31.92"; src = fetchurl { - url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3"; + url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0m2w3zz6v1bsd1fn78ab79d72ywd9vq60rziazsblxsi4qy9dva5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "hitori"; attrPath = "gnome3.hitori"; }; - }; + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + itstool + desktop-file-utils + libxml2 + python3 + wrapGAppsHook + ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 - gnome3.adwaita-icon-theme + glib + gtk3 + cairo + adwaita-icon-theme ]; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Hitori; description = "GTK+ application to generate and let you play games of Hitori"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix index b1996e0fd593..8ef4b2f30751 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,16 +1,21 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra-gtk3, libxml2, dconf }: +, intltool, itstool, libcanberra-gtk3, libxml2 +, meson, ninja, python3, vala, desktop-file-utils +}: stdenv.mkDerivation rec { name = "iagno-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "15skh7186gp0k1lvzpv0l7dsr7mhb57njc3wjbgjwixym67h2d1z"; + sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ]; + nativeBuildInputs = [ + meson ninja python3 vala desktop-file-utils + pkgconfig wrapGAppsHook itstool libxml2 + ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix index bbc65f3e5ba0..18c6f43b3b36 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -4,25 +4,24 @@ stdenv.mkDerivation rec { name = "lightsoff-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cv5pkw0n8k5wb98ihx0z1z615w1wc09y884wk608wy40bgq46wp"; + sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f"; }; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py - ''; - nativeBuildInputs = [ vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ]; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "lightsoff"; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index d3ddcea77f7d..712f984cbf9a 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,21 +1,27 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra-gtk3 -, intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }: +, librsvg, libcanberra-gtk3, libmanette +, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook +, meson, ninja, python3, vala, desktop-file-utils +}: let pname = "quadrapassel"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; + sha256 = "1zhi1957knz9dm98drn2dh95mr33sdch590yddh1f8r6bzsfjvpy"; }; - nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja python3 vala desktop-file-utils + pkgconfig gnome3.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook + ]; buildInputs = [ - gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg + gtk3 gdk_pixbuf librsvg libmanette libcanberra-gtk3 clutter libxml2 clutter-gtk ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 3c017d713821..a944e0c568a2 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -3,13 +3,13 @@ let pname = "swell-foop"; - version = "3.30.0"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00h795clcyzch1sgcxflslv2q03vsz2j5xyy4ghbg6a6dgg8a0ax"; + sha256 = "0jpci3c1wyzbvsq86j30rcl166skhi2wf12001amfgh0dmmwipci"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix b/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix index 399562c0d99d..5ec29554b363 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix @@ -1,24 +1,32 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, intltool, itstool, libxml2, wrapGAppsHook }: +, librsvg, gettext, itstool, libxml2, wrapGAppsHook +, meson, ninja, python3, desktop-file-utils +}: stdenv.mkDerivation rec { name = "tali-${version}"; - version = "3.22.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; + sha256 = "0s5clkn0qm298mvphx1xdymg67w1p8vvgvypvs97k6lfjqijkx3v"; }; passthru = { updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg - libxml2 itstool intltool wrapGAppsHook ]; + nativeBuildInputs = [ + meson ninja python3 desktop-file-utils + pkgconfig gnome3.adwaita-icon-theme + libxml2 itstool gettext wrapGAppsHook + ]; + buildInputs = [ gtk3 gdk_pixbuf librsvg ]; - enableParallelBuilding = true; + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Tali; diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix index 154ebb04a4b3..134cd376bb88 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,27 +1,18 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja +{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext , sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 -, xvfb_run, dbus, shared-mime-info, libunwind, glib-networking }: +, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking }: stdenv.mkDerivation rec { pname = "geary"; - version = "0.13.2"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fp3zzgpkm1l4d0g5194wnriz2spxa9kgrgy98kvvffl7ac860kk"; + sha256 = "1mxlzkmwzg1fyf4r1izwnskm5z681c6hiby48n606n89gjcq565j"; }; - patches = [ - # gobject-introspection is not needed - # https://gitlab.gnome.org/GNOME/geary/merge_requests/138 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch; - sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk"; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig vala wrapGAppsHook python3 @@ -31,7 +22,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3 libgee libnotify libsecret sqlite webkitgtk glib-networking - libunwind + libunwind folks ]; checkInputs = [ xvfb_run dbus ]; @@ -43,11 +34,8 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py - ''; - preFixup = '' - # Add geary to path for geary-attach - gappsWrapperArgs+=(--prefix PATH : "$out/bin") + chmod +x desktop/geary-attach ''; doCheck = true; @@ -60,6 +48,11 @@ stdenv.mkDerivation rec { meson test -v --no-stdsplit ''; + preFixup = '' + # Add geary to path for geary-attach + gappsWrapperArgs+=(--prefix PATH : "$out/bin") + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix index 9f24d04337c2..cb4c5c05cb0b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,22 +1,42 @@ -{ stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib -, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection -, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme -, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret -, meson, ninja, python3 - }: +{ stdenv +, fetchurl +, fetchpatch +, vala_0_42 +, intltool +, pkgconfig +, gtk3 +, glib +, json-glib +, wrapGAppsHook +, libpeas +, bash +, gobject-introspection +, libsoup +, gtksourceview +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome3 +, gtkspell3 +, shared-mime-info +, libgee +, libgit2-glib +, libsecret +, meson +, ninja +, python3 +}: -let +stdenv.mkDerivation rec { pname = "gitg"; version = "3.30.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; }; patches = [ + # Fix build with latest libgit2-glib (fetchpatch { url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch; sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw"; @@ -31,17 +51,35 @@ in stdenv.mkDerivation rec { substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" ''; - doCheck = true; + doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed enableParallelBuilding = true; buildInputs = [ - gtk3 glib json-glib libgee libpeas libsoup - libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas - libsecret gobject-introspection adwaita-icon-theme + adwaita-icon-theme + glib + gsettings-desktop-schemas + gtk3 + gtksourceview + gtkspell3 + json-glib + libgee + libgit2-glib + libpeas + libsecret + libsoup ]; - nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ]; + nativeBuildInputs = [ + gobject-introspection + intltool + meson + ninja + pkgconfig + python3 + vala_0_42 # fails build with 0.44, drop in >3.30.1 + wrapGAppsHook + ]; preFixup = '' gappsWrapperArgs+=( diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index 3cdab30ce8d1..d819961d2819 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,16 +1,20 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit -, gtk3, systemd, wrapGAppsHook, desktop-file-utils }: +, gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; - version = "3.30.0"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1i1hf6833psnq174xm0gjlz5rbrkl8i512y47w7nk8mrrrc31b35"; + sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; }; - nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; + nativeBuildInputs = [ + pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils + hicolor-icon-theme # for setup-hook + ]; + buildInputs = [ gtk3 packagekit systemd polkit ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 47de1de59cac..bf0ef7d34a05 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-tweaks"; - version = "3.30.2"; + version = "3.32.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z"; + sha256 = "037r35cw34ifcs676fq9n2v4mh1nkqx0qk474bznf18mr6r62h55"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix index fd71f1f2a23c..3da7031b5114 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter +{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter, fetchpatch , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobject-introspection }: stdenv.mkDerivation rec { - version = "3.30.2"; + version = "3.32.0"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "0vlbvv6rjxq7h9cl3ilndjk7d51ac1x7agj8k6a7bwjx8h1fr62x"; + sha256 = "1fvpl9vqmrr1w22hm0ybabn9pjfii5qj9ghnc2jzihgrn2h486v6"; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch index ca6b9a5b22ed..c8a3fad2272b 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch @@ -1,6 +1,6 @@ --- a/src/gnome-shell/extension.js +++ b/src/gnome-shell/extension.js -@@ -7,6 +7,8 @@ +@@ -6,6 +6,8 @@ const Config = imports.misc.config; @@ -11,45 +11,27 @@ imports.gi.versions.GPaste = '1.0'; --- a/src/gnome-shell/prefs.js +++ b/src/gnome-shell/prefs.js -@@ -7,6 +7,8 @@ +@@ -6,6 +6,8 @@ const Gettext = imports.gettext; +imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); + - const GPaste = imports.gi.GPaste; + const { GPaste } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; --- a/src/libgpaste/settings/gpaste-settings.c +++ b/src/libgpaste/settings/gpaste-settings.c -@@ -22,6 +22,8 @@ - - typedef struct - { -+ GSettingsSchemaSource *schema_source; -+ GSettingsSchema *schema; - GSettings *settings; - GSettings *shell_settings; - -@@ -919,6 +921,8 @@ +@@ -1013,7 +1013,11 @@ + } + else { - g_signal_handler_disconnect (settings, priv->c_signals[C_CHANGED]); - g_clear_object (&priv->settings); -+ g_settings_schema_unref (priv->schema); -+ g_settings_schema_source_unref (priv->schema_source); +- return g_settings_new (G_PASTE_SETTINGS_NAME); ++ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library ++ GSettingsSchemaSource *schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL); ++ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE); ++ g_settings_schema_source_unref (schema_source); ++ return g_settings_new_full (schema, NULL, NULL); } + } - if (shell_settings) -@@ -1000,7 +1004,11 @@ - g_paste_settings_init (GPasteSettings *self) - { - GPasteSettingsPrivate *priv = g_paste_settings_get_instance_private (self); -- GSettings *settings = priv->settings = g_settings_new (G_PASTE_SETTINGS_NAME); -+ -+ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library -+ GSettingsSchemaSource *schema_source = priv->schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL); -+ priv->schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE); -+ GSettings *settings = priv->settings = g_settings_new_full (priv->schema, NULL, NULL); - - priv->history_name = NULL; - priv->launch_ui = NULL; diff --git a/nixpkgs/pkgs/desktops/mate/atril/default.nix b/nixpkgs/pkgs/desktops/mate/atril/default.nix index 57f721f49a28..4bad52dfb676 100644 --- a/nixpkgs/pkgs/desktops/mate/atril/default.nix +++ b/nixpkgs/pkgs/desktops/mate/atril/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple multi-page document viewer for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix b/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix index 64ef0cb57f27..ec1e8324e231 100644 --- a/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix +++ b/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace "/usr/bin/convert" "${imagemagick}/bin/convert" done ''; - + configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; meta = with stdenv.lib; { description = "Set of extensions for Caja file manager"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/caja/default.nix b/nixpkgs/pkgs/desktops/mate/caja/default.nix index 130d44d6a1a1..a497c48694f8 100644 --- a/nixpkgs/pkgs/desktops/mate/caja/default.nix +++ b/nixpkgs/pkgs/desktops/mate/caja/default.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { patches = [ ./caja-extension-dirs.patch ]; - + configureFlags = [ "--disable-update-mimedb" ]; - + meta = { description = "File manager for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix index d6d189624f17..d00c4f0f0513 100644 --- a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix +++ b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Archive Manager for MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/eom/default.nix b/nixpkgs/pkgs/desktops/mate/eom/default.nix index 22f100008aa8..658eef090584 100644 --- a/nixpkgs/pkgs/desktops/mate/eom/default.nix +++ b/nixpkgs/pkgs/desktops/mate/eom/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "An image viewing and cataloging program for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix b/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix index 15b81a628863..395d69c28e61 100644 --- a/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix +++ b/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, libxklavier }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk3, mate, libxklavier }: stdenv.mkDerivation rec { name = "libmatekbd-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1"; }; + patches = [ + # Fix build with glib 2.60 (TODO: remove after 1.22.0 update) + (fetchpatch { + url = https://github.com/mate-desktop/libmatekbd/commit/dc04e969dd61a2b1f82beae2d3c8ad105447812d.patch; + sha256 = "1ps6mbj6hrm9djn4riya049w2cb0dknghysny8pafmvpkaqvckrb"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk3 libxklavier ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix index 0a562b1f3cc7..8720c8ec0509 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Applets for use with the MATE panel"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix b/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix index 79a322ccb0a5..a3b595021630 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Background images and data for MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix b/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix index d45563db8a1c..0e4f97b8519b 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Calculator for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = [ licenses.gpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-common/default.nix b/nixpkgs/pkgs/desktops/mate/mate-common/default.nix index 63adb1849dac..b50860b8993a 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-common/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-common/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "Common files for development of MATE packages"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix index 7d957e749b0b..fd8bd77785b1 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 03f8c62c448d..17b8f8d44c54 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Faenza icon theme from MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix b/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix index 9d813e715ffd..57dad2185cdd 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-media/default.nix b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix index 90b97cd2bfb4..461f8d7f889f 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-media/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Media tools for MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix index 35a7f1dae610..0a0e83c07abf 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Installing these utilities is recommended for netbooks and similar devices with low resolution displays. ''; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl3 lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix b/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix index 5f1dfaa5ba4e..74792aa471f7 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Integrates polkit authentication for MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix index 88f497f21de9..8ed54b558ae9 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The MATE Power Manager"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix b/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix index 089296a0b842..2e59b16d9a3d 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Screen saver and locker for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix index 5757f5eb9b40..ff6faafca36a 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System monitor for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix b/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix index 9b0018e8e2fc..cce31bc6d35e 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix b/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix index 58feb32cfa8c..8f9b1f155d01 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of themes from MATE"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix b/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix index 5264c772a537..4c1e2ca2c74d 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MATE User Guide"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl2Plus fdl12 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix b/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix index 17ec165f7559..465c1f73e98a 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/nixpkgs/pkgs/desktops/mate/pluma/default.nix index b27804e50a55..23d366dfa1cb 100644 --- a/nixpkgs/pkgs/desktops/mate/pluma/default.nix +++ b/nixpkgs/pkgs/desktops/mate/pluma/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Powerful text editor for the MATE desktop"; - homepage = http://mate-desktop.org; + homepage = https://mate-desktop.org; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index d224dbce7891..fc9d8b5236dd 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "files"; - version = "4.1.6"; + version = "4.1.7"; name = "elementary-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1c17d5lvpzyqd7mmzyfms80am46s566xr1r7b27rgv9w7vpzpgm0"; + sha256 = "1fz7zawqkb9fa2vy36hg1wz1sxzgm307hp5kckb7icarqfrx0gih"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 21d5b9f1db4c..644841354e5b 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils -, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2 +, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2, fetchpatch , granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3 , scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }: @@ -66,6 +66,14 @@ stdenv.mkDerivation rec { "-Dplugins=false" ]; + patches = [ + # Fix build against gexiv2 0.12 + (fetchpatch { + url = "https://github.com/elementary/photos/commit/86df00ced674abb2ee430ea24422079cfabb314c.patch"; + sha256 = "0836fzja93w36jf7ldqypsmnqn46mwsl93q41m104zn8qm0wrkmy"; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 697c3ac592bb..f67b5bc77633 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-bluetooth"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "13jm2idjsgqkvdz1dxgl2wwx7bsqahppf6cnpl0pmz167wahg5zp"; + sha256 = "0rp9wa0yilc3wgwnybc6cryxphja7imixn45zhj475a4nb3afd0q"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 192f8a69ae97..643bce5fe742 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-display"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0pw21bnc79shiynmg7h9bs1x1v011lh07ypn22j73yhmxp6wiypd"; + sha256 = "1icz1is576d2w5a6wc06bnkg2vbsj5g6mz0b6ikzyjddr6j743ql"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index baf5becd3477..c0f005cba2f9 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "101a39v8fssc7s56cpi60zsggvw66y9gaxwjvawds928cll0yiy9"; + sha256 = "0frml591r82j7hf1zlccgv8pzk3w10x470f9nzvdgdjpz0r776k2"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/default.nix b/nixpkgs/pkgs/desktops/pantheon/default.nix index 8271abc1506d..039d75beb4f2 100644 --- a/nixpkgs/pkgs/desktops/pantheon/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/default.nix @@ -133,9 +133,7 @@ lib.makeScope pkgs.newScope (self: with self; { # We're using ubuntu and elementary's patchset due to reasons # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." - elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { - inherit (gnome3) libgweather; - }; + elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 303aae6882b8..32083d3ada62 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -52,13 +52,14 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./gsd.patch; - elementary-settings-daemon = "${elementary-settings-daemon}/libexec"; + elementary_settings_daemon = "${elementary-settings-daemon}/libexec/"; }) (substituteAll { src = ./numlockx.patch; inherit numlockx; }) ./01-sysconfdir-install.patch + ./hardcode-theme.patch ]; mesonFlags = [ @@ -70,9 +71,6 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - # GTK+ reads default settings (such as icons and themes) from elementary's settings.ini here - --prefix XDG_CONFIG_DIRS : "${elementary-default-settings}/etc" - # dbus-launch needed in path --prefix PATH : "${dbus}/bin" diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch index 1770d54aee0d..bcbf604c6a2e 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch @@ -7,7 +7,7 @@ index 2450c1a..a908d11 100644 conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm')) conf_data.set('GETTEXT_PACKAGE', meson.project_name()) -conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/') -+conf_data.set('GSD_DIR', '@elementary-settings-daemon@') ++conf_data.set('GSD_DIR', '@elementary_settings_daemon@') conf_data.set('VERSION', meson.project_version()) config_header = configure_file ( input: 'config.vala.in', diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch new file mode 100644 index 000000000000..e9263aab736e --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/hardcode-theme.patch @@ -0,0 +1,15 @@ +diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala +index 11aa4c0..daf4a8a 100644 +--- a/src/PantheonGreeter.vala ++++ b/src/PantheonGreeter.vala +@@ -474,6 +474,10 @@ public static int main (string [] args) { + Gdk.CursorType.LEFT_PTR); + Gdk.get_default_root_window ().set_cursor (cursor); + ++ var settings = Gtk.Settings.get_default (); ++ settings.gtk_icon_theme_name = "elementary"; ++ settings.gtk_theme_name = "elementary"; ++ + var icon_theme = Gtk.IconTheme.get_default (); + icon_theme.add_resource_path ("/io/elementary/greeter/icons"); + diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 3829cf551f7f..1dfa64ae3732 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,23 +1,59 @@ -{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit -, geocode-glib, gtk3 -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }: +{ accountsservice +, alsaLib +, colord +, docbook_xsl +, fetchgit +, fetchurl +, geoclue2 +, geocode-glib +, gettext +, glib +, gnome3 +, gsettings-desktop-schemas +, gtk3 +, lcms2 +, libcanberra-gtk3 +, libgnomekbd +, libgudev +, libgweather +, libnotify +, libpulseaudio +, libwacom +, libxml2 +, libxslt +, meson +, networkmanager +, ninja +, nss +, pantheon +, perl +, pkgconfig +, polkit +, python3 +, substituteAll +, systemd +, tzdata +, upower +, wrapGAppsHook +, stdenv +}: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.30.2"; + version = "3.32.0"; + + projectName = "gnome-settings-daemon"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/gnome-settings-daemon-${version}.tar.xz"; - sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; + url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz"; + sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63"; }; # Source for ubuntu's patchset src2 = fetchgit { - url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon"; + url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}"; rev = "refs/tags/ubuntu/${version}-1ubuntu1"; - sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; + sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. @@ -33,7 +69,6 @@ stdenv.mkDerivation rec { "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/correct_logout_action.patch" "${patchPath}/ubuntu-lid-close-suspend.patch" - "${patchPath}/revert-wacom-migration.patch" "${patchPath}/revert-gsettings-removals.patch" "${patchPath}/revert-mediakeys-dbus-interface-drop.patch" "${patchPath}/ubuntu_ibus_configs.patch" @@ -60,6 +95,7 @@ stdenv.mkDerivation rec { done # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 + # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop ''; @@ -84,32 +120,34 @@ stdenv.mkDerivation rec { geocode-glib glib gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gtk3 - ibus lcms2 - libXtst libcanberra-gtk3 + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema libgudev libgweather libnotify libpulseaudio - librsvg libwacom - libxkbfile networkmanager nss polkit - udev + systemd upower - xf86_input_wacom - xkeyboard_config ]; mesonFlags = [ "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = projectName; + attrPath = "pantheon.${pname}"; + }; + }; + meta = with stdenv.lib; { license = licenses.gpl2Plus; maintainers = pantheon.maintainers; diff --git a/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix b/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix index cc51c4b0471c..1be3fe1c3098 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, }: +{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, sassc, python3, breeze-qt5 }: let inherit (lib) getLib; in mkDerivation { name = "breeze-gtk"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ]; buildInputs = [ qtbase ]; postPatch = '' sed -i cmake/FindGTKEngine.cmake \ diff --git a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index 5c27d0d2f182..cd2fa293e7d0 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.5/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.3/ ) diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index dde4a3c819f2..55a4518021ed 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -1,5 +1,5 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index 69d30705..52e91028 100644 +index 69d3070..52e9102 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake @@ -1,4 +1,4 @@ @@ -9,13 +9,13 @@ index 69d30705..52e91028 100644 -background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png +background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt -index cb75aeca..247db953 100644 +index 6a1a212..f03fd34 100644 --- a/startkde/CMakeLists.txt +++ b/startkde/CMakeLists.txt -@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) - add_subdirectory(ksyncdbusenv) +@@ -4,11 +4,6 @@ add_subdirectory(ksyncdbusenv) add_subdirectory(waitforname) - + add_subdirectory(kcheckrunning) + -#FIXME: reconsider, looks fishy -if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") - set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${KDE_INSTALL_FULL_DATAROOTDIR}/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") @@ -25,7 +25,7 @@ index cb75aeca..247db953 100644 configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY) configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY) diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp -index 493218ea..d507aa55 100644 +index 493218e..d507aa5 100644 --- a/startkde/kstartupconfig/kstartupconfig.cpp +++ b/startkde/kstartupconfig/kstartupconfig.cpp @@ -147,5 +147,5 @@ int main() @@ -36,7 +36,7 @@ index 493218ea..d507aa55 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 714a9bf1..9733c612 100644 +index b68f0c6..a0ec214 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -45,7 +45,7 @@ index 714a9bf1..9733c612 100644 -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - + +if test "x$1" = x--failsafe; then + KDE_FAILSAFE=1 # General failsafe flag + KWIN_COMPOSE=N # Disable KWin's compositing @@ -56,7 +56,7 @@ index 714a9bf1..9733c612 100644 # When the X server dies we get a HUP signal from xinit. We must ignore it # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP - + -# Check if a Plasma session already is running and whether it's possible to connect to X -kcheckrunning +# we have to unset this for Darwin since it will screw up KDE's dynamic-loading @@ -79,12 +79,12 @@ index 714a9bf1..9733c612 100644 + echo "\$DISPLAY is not set or cannot connect to the X server." + exit 1 fi - + # Boot sequence: -@@ -33,61 +42,142 @@ fi +@@ -33,62 +42,143 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence - + -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -else @@ -122,7 +122,7 @@ index 714a9bf1..9733c612 100644 + @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf fi sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg} - + -# We need to create config folder so we can write startupconfigkeys -mkdir -p $configDir +@NIXPKGS_KBUILDSYCOCA5@ @@ -176,7 +176,7 @@ index 714a9bf1..9733c612 100644 +cursorSize=0 +EOF +fi - + #This is basically setting defaults so we can use them with kstartupconfig5 -cat >$configDir/startupconfigkeys <<EOF +cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF @@ -185,11 +185,12 @@ index 714a9bf1..9733c612 100644 -ksplashrc KSplash Theme Breeze +ksplashrc KSplash Theme org.kde.breeze.desktop ksplashrc KSplash Engine KSplashQML + kdeglobals KScreen ScaleFactor '' kdeglobals KScreen ScreenScaleFactors '' kcmfonts General forceFontDPI 0 +kcmfonts General dontChangeAASettings true EOF - + # preload the user's locale on first start -plasmalocalerc=$configDir/plasma-localerc -test -f $plasmalocalerc || { @@ -202,7 +203,7 @@ index 714a9bf1..9733c612 100644 EOF -} +fi - + # export LC_* variables set by kcmshell5 formats into environment # so it can be picked up by QLocale and friends. -exportformatssettings=$configDir/plasma-locale-settings.sh @@ -213,7 +214,7 @@ index 714a9bf1..9733c612 100644 +if [ -r "$exportformatssettings" ]; then + . "$exportformatssettings" +fi - + # Write a default kdeglobals file to set up the font -kdeglobalsfile=$configDir/kdeglobals -test -f $kdeglobalsfile || { @@ -236,7 +237,7 @@ index 714a9bf1..9733c612 100644 EOF -} +fi - + -kstartupconfig5 -returncode=$? -if test $returncode -ne 0; then @@ -250,13 +251,13 @@ index 714a9bf1..9733c612 100644 +if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then + . "$XDG_CONFIG_HOME/startupconfig" +fi - + #Do not sync any of this section with the wayland versions as there scale factors are #sent properly over wl_output -@@ -99,26 +180,33 @@ fi +@@ -104,26 +194,33 @@ fi #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us export QT_AUTO_SCREEN_SCALE_FACTOR=0 - + +#Set the QtQuickControls style to our own: for QtQuickControls1 +#it will fall back to Desktop, while it will use our own org.kde.desktop +#for QtQuickControlsStyle and Kirigami @@ -292,7 +293,7 @@ index 714a9bf1..9733c612 100644 + export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" fi fi - + -if test "$kcmfonts_general_forcefontdpi" -ne 0; then - xrdb -quiet -merge -nocpp <<EOF +if [ "${kcmfonts_general_forcefontdpi:-0}" -ne 0 ]; then @@ -300,9 +301,9 @@ index 714a9bf1..9733c612 100644 Xft.dpi: $kcmfonts_general_forcefontdpi EOF fi -@@ -127,11 +215,11 @@ dl=$DESKTOP_LOCKED +@@ -132,11 +229,11 @@ dl=$DESKTOP_LOCKED unset DESKTOP_LOCKED # Don't want it in the environment - + ksplash_pid= -if test -z "$dl"; then +if [ -z "$dl" ]; then @@ -314,10 +315,10 @@ index 714a9bf1..9733c612 100644 ;; None) ;; -@@ -140,69 +228,6 @@ if test -z "$dl"; then +@@ -145,27 +242,6 @@ if test -z "$dl"; then esac fi - + -# Source scripts found in <config locations>/plasma-workspace/env/*.sh -# (where <config locations> correspond to the system and user's configuration -# directory. @@ -339,70 +340,28 @@ index 714a9bf1..9733c612 100644 - done -done - --# Activate the kde font directories. --# --# There are 4 directories that may be used for supplying fonts for KDE. --# --# There are two system directories. These belong to the administrator. --# There are two user directories, where the user may add her own fonts. --# --# The 'override' versions are for fonts that should come first in the list, --# i.e. if you have a font in your 'override' directory, it will be used in --# preference to any other. --# --# The preference order looks like this: --# user override, system override, X, user, system --# --# Where X is the original font database that was set up before this script --# runs. -- --usr_odir=$HOME/.fonts/kde-override --usr_fdir=$HOME/.fonts -- --if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -- sys_odir=$kdedirs_first/share/fonts/override -- sys_fdir=$kdedirs_first/share/fonts --else -- sys_odir=$KDEDIR/share/fonts/override -- sys_fdir=$KDEDIR/share/fonts --fi -- --# We run mkfontdir on the user's font dirs (if we have permission) to pick --# up any new fonts they may have installed. If mkfontdir fails, we still --# add the user's dirs to the font path, as they might simply have been made --# read-only by the administrator, for whatever reason. -- --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -- --# Ask X11 to rebuild its font list. --xset fp rehash -- # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two -@@ -257,44 +282,65 @@ export XDG_DATA_DIRS +@@ -221,44 +297,65 @@ export XDG_DATA_DIRS # KDE_FULL_SESSION=true export KDE_FULL_SESSION -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true - + KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 +@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - + -KDE_SESSION_UID=`id -ru` +KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) export KDE_SESSION_UID - + XDG_CURRENT_DESKTOP=KDE export XDG_CURRENT_DESKTOP - + +# Enforce xcb QPA. Helps switching between Wayland and X sessions. +export QT_QPA_PLATFORM=xcb + @@ -445,7 +404,7 @@ index 714a9bf1..9733c612 100644 - xmessage -geometry 500x100 "Could not sync environment to dbus." exit 1 fi - + # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup @@ -457,13 +416,13 @@ index 714a9bf1..9733c612 100644 - xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi - + -qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - + # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -306,12 +352,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@@ -270,12 +367,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. @@ -483,13 +442,13 @@ index 714a9bf1..9733c612 100644 if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 -@@ -322,36 +372,36 @@ fi +@@ -286,36 +387,36 @@ fi #Anything after here is logout #It is not called after shutdown/restart - + -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - + -if test x"$wait_drkonqi"x = x"true"x ; then +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) @@ -512,18 +471,18 @@ index 714a9bf1..9733c612 100644 fi done fi - + echo 'startkde: Shutting down...' 1>&2 # just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +if [ -n "$ksplash_pid" ]; then + kill "$ksplash_pid" 2>/dev/null +fi - + # Clean up -kdeinit5_shutdown +@NIXPKGS_KDEINIT5_SHUTDOWN@ - + unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION @@ -531,10 +490,10 @@ index 714a9bf1..9733c612 100644 -xprop -root -remove KDE_SESSION_VERSION +@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID - + echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index de98541c..39c0b521 100644 +index 1fe41c5..11757df 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -543,12 +502,12 @@ index de98541c..39c0b521 100644 -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - + # Boot sequence: @@ -17,28 +17,26 @@ # # * Then ksmserver is started which takes control of the rest of the startup sequence - + -# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; @@ -558,7 +517,7 @@ index de98541c..39c0b521 100644 +if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then + . "$XDG_CONFIG_HOME/startupconfig" fi - + -[ -r $configDir/startupconfig ] && . $configDir/startupconfig - -xrdb -quiet -merge -nocpp <<EOF @@ -567,10 +526,10 @@ index de98541c..39c0b521 100644 Xft.dpi: $QT_WAYLAND_FORCE_DPI EOF +fi - + dl=$DESKTOP_LOCKED unset DESKTOP_LOCKED # Don't want it in the environment - + ksplash_pid= -if test -z "$dl"; then +if [ -z "$dl" ]; then @@ -582,62 +541,14 @@ index de98541c..39c0b521 100644 ;; None) ;; -@@ -50,48 +48,6 @@ fi - #In wayland we want Plasma to use Qt's scaling - export PLASMA_USE_QT_SCALING=1 - --# Activate the kde font directories. --# --# There are 4 directories that may be used for supplying fonts for KDE. --# --# There are two system directories. These belong to the administrator. --# There are two user directories, where the user may add her own fonts. --# --# The 'override' versions are for fonts that should come first in the list, --# i.e. if you have a font in your 'override' directory, it will be used in --# preference to any other. --# --# The preference order looks like this: --# user override, system override, X, user, system --# --# Where X is the original font database that was set up before this script --# runs. -- --usr_odir=$HOME/.fonts/kde-override --usr_fdir=$HOME/.fonts -- --if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -- sys_odir=$kdedirs_first/share/fonts/override -- sys_fdir=$kdedirs_first/share/fonts --else -- sys_odir=$KDEDIR/share/fonts/override -- sys_fdir=$KDEDIR/share/fonts --fi -- --# We run mkfontdir on the user's font dirs (if we have permission) to pick --# up any new fonts they may have installed. If mkfontdir fails, we still --# add the user's dirs to the font path, as they might simply have been made --# read-only by the administrator, for whatever reason. -- --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -- --# Ask X11 to rebuild its font list. --xset fp rehash -- - # Set a left cursor instead of the standard X11 "X" cursor, since I've heard - # from some users that they're confused and don't know what to do. This is - # especially necessary on slow machines, where starting KDE takes one or two -@@ -100,22 +56,13 @@ xset fp rehash +@@ -58,23 +56,13 @@ export PLASMA_USE_QT_SCALING=1 # If the user has overwritten fonts, the cursor font may be different now # so don't move this up. # -xsetroot -cursor_name left_ptr - -# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap +-usr_fdir=$HOME/.fonts -if test -n "$GS_LIB" ; then - GS_LIB=$usr_fdir:$GS_LIB - export GS_LIB @@ -646,19 +557,19 @@ index de98541c..39c0b521 100644 - export GS_LIB -fi +@NIXPKGS_XSETROOT@ -cursor_name left_ptr - + echo 'startplasma: Starting up...' 1>&2 - + # export our session variables to the Xwayland server -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 +@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 - + # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then -@@ -131,16 +78,15 @@ fi - +@@ -90,16 +78,15 @@ fi + # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup @@ -670,21 +581,20 @@ index de98541c..39c0b521 100644 - xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi - + -qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - + # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -166,19 +112,19 @@ fi +@@ -125,19 +112,19 @@ fi #Anything after here is logout #It is not called after shutdown/restart - + -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -- --if test x"$wait_drkonqi"x = x"true"x ; then +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) -+ + +-if test x"$wait_drkonqi"x = x"true"x ; then +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` @@ -704,19 +614,19 @@ index de98541c..39c0b521 100644 done break fi -@@ -187,15 +133,17 @@ fi - +@@ -146,15 +133,17 @@ fi + echo 'startplasma: Shutting down...' 1>&2 # just in case -test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +if [ -n "$ksplash_pid" ]; then + "$ksplash_pid" 2>/dev/null +fi - + # Clean up -kdeinit5_shutdown +@NIXPKGS_KDEINIT5_SHUTDOWN@ - + unset KDE_FULL_SESSION -xprop -root -remove KDE_FULL_SESSION +@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION @@ -724,10 +634,10 @@ index de98541c..39c0b521 100644 -xprop -root -remove KDE_SESSION_VERSION +@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID - + echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dd9e304d..12132f9e 100644 +index dcb473a..0988740 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake @@ -1,118 +1,174 @@ @@ -736,7 +646,7 @@ index dd9e304d..12132f9e 100644 -# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) +# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # - + -# We need to create config folder so we can write startupconfigkeys -if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; @@ -803,7 +713,7 @@ index dd9e304d..12132f9e 100644 +EOF fi sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg} - + -# We need to create config folder so we can write startupconfigkeys -mkdir -p $configDir +# Set the default GTK 3 theme @@ -832,7 +742,7 @@ index dd9e304d..12132f9e 100644 +cursorSize=0 +EOF +fi - + #This is basically setting defaults so we can use them with kstartupconfig5 -cat >$configDir/startupconfigkeys <<EOF +cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF @@ -846,7 +756,7 @@ index dd9e304d..12132f9e 100644 +kcmfonts General forceFontDPI 0 +kcmfonts General dontChangeAASettings true EOF - + # preload the user's locale on first start -plasmalocalerc=$configDir/plasma-localerc -test -f $plasmalocalerc || { @@ -859,7 +769,7 @@ index dd9e304d..12132f9e 100644 EOF -} +fi - + # export LC_* variables set by kcmshell5 formats into environment # so it can be picked up by QLocale and friends. -exportformatssettings=$configDir/plasma-locale-settings.sh @@ -870,7 +780,7 @@ index dd9e304d..12132f9e 100644 +if [ -r "$exportformatssettings" ]; then + . "$exportformatssettings" +fi - + # Write a default kdeglobals file to set up the font -kdeglobalsfile=$configDir/kdeglobals -test -f $kdeglobalsfile || { @@ -924,7 +834,7 @@ index dd9e304d..12132f9e 100644 - test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir - } fi - + -kstartupconfig5 +@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5 returncode=$? @@ -935,11 +845,11 @@ index dd9e304d..12132f9e 100644 +if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then + . "$XDG_CONFIG_HOME/startupconfig" +fi - + #Manually disable auto scaling because we are scaling above #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output export QT_AUTO_SCREEN_SCALE_FACTOR=0 - + -# XCursor mouse theme needs to be applied here to work even for kded or ksmserver -if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then - @EXPORT_XCURSOR_PATH@ @@ -949,7 +859,7 @@ index dd9e304d..12132f9e 100644 + XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" +done +export XCURSOR_PATH - + - # TODO: is kapplymousetheme a core app? +# XCursor mouse theme needs to be applied here to work even for kded or ksmserver +if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then @@ -972,20 +882,20 @@ index dd9e304d..12132f9e 100644 + export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize" fi fi - + -if test "$kcmfonts_general_forcefontdpiwayland" -ne 0; then +if [ "${kcmfonts_general_forcefontdpiwayland:-0}" -ne 0 ]; then export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland else export QT_WAYLAND_FORCE_DPI=96 -@@ -120,12 +167,12 @@ fi - +@@ -120,12 +176,12 @@ fi + # Get a property value from org.freedesktop.locale1 queryLocale1() { - qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" + @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" } - + # Query whether org.freedesktop.locale1 is available. If it is, try to # set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly. -if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then @@ -993,10 +903,10 @@ index dd9e304d..12132f9e 100644 # Do not overwrite existing values. There is no point in setting only some # of them as then they would not match anymore. if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \ -@@ -141,41 +188,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then +@@ -141,41 +197,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then fi fi - + -# Source scripts found in <config locations>/plasma-workspace/env/*.sh -# (where <config locations> correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config @@ -1020,7 +930,7 @@ index dd9e304d..12132f9e 100644 -done - echo 'startplasmacompositor: Starting up...' 1>&2 - + -# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend -# to set it to a list of paths *not* including the KDE prefix if it's not /usr or @@ -1036,17 +946,19 @@ index dd9e304d..12132f9e 100644 : # ok else echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 -@@ -212,26 +228,47 @@ export KDE_FULL_SESSION +@@ -212,7 +237,7 @@ export KDE_FULL_SESSION KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION - + -KDE_SESSION_UID=`id -ru` +KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru) export KDE_SESSION_UID - + XDG_CURRENT_DESKTOP=KDE - export XDG_CURRENT_DESKTOP - +@@ -221,20 +246,41 @@ export XDG_CURRENT_DESKTOP + XDG_SESSION_TYPE=wayland + export XDG_SESSION_TYPE + +# Source scripts found in <config locations>/plasma-workspace/env/*.sh +# (where <config locations> correspond to the system and user's configuration +# directories, as identified by Qt's qtpaths, e.g. $HOME/.config @@ -1089,9 +1001,11 @@ index dd9e304d..12132f9e 100644 + echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2 + exit 1 fi - + -@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma +@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@ - + echo 'startplasmacompositor: Shutting down...' 1>&2 - + +-- +2.19.2 diff --git a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index 0842034f0d89..cfafc4d13219 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/bluedevil-5.14.5.tar.xz"; - sha256 = "1khqw11apvcf5g5m9z111rvk4scxh3z3yhcpwqws1h0s5c5lr7z7"; - name = "bluedevil-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/bluedevil-5.15.3.tar.xz"; + sha256 = "1vdij1ydrwj51nsf3ysmql3wy3y7ayipzrqgxwa52r9n49zckva0"; + name = "bluedevil-5.15.3.tar.xz"; }; }; breeze = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/breeze-5.14.5.tar.xz"; - sha256 = "15hphz2mm2m3j0a0hwj7m65rggyaxdxy08yqs73bg3yg67n6x3p7"; - name = "breeze-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/breeze-5.15.3.tar.xz"; + sha256 = "0l7yngc32af7gdi8p68c8267bbzhfvpynqclq3il4fvaxc6vbq2b"; + name = "breeze-5.15.3.tar.xz"; }; }; breeze-grub = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/breeze-grub-5.14.5.tar.xz"; - sha256 = "0bkaaxfl1ds58qcdrxswaacir7wcc65a960lwdkmpdl16g9f4gix"; - name = "breeze-grub-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/breeze-grub-5.15.3.tar.xz"; + sha256 = "0ccx8yfxhc5r3kv7snv80wpz7h5a9l762iz1cx5sfjpmmq2jhi64"; + name = "breeze-grub-5.15.3.tar.xz"; }; }; breeze-gtk = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/breeze-gtk-5.14.5.tar.xz"; - sha256 = "0bysq83xbqmhb4wld51zd6lllr66b8w7pinizc99k8z1yz5jdb0m"; - name = "breeze-gtk-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/breeze-gtk-5.15.3.tar.xz"; + sha256 = "1rg323fyq0q07k00xi63csi0f3bwzi1cbm6srshqih0cnfgq69j4"; + name = "breeze-gtk-5.15.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/breeze-plymouth-5.14.5.tar.xz"; - sha256 = "1rbdpz9vlami7217v3dk8ljz0fgjz9zi1l0gwkhslayz5sybld96"; - name = "breeze-plymouth-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/breeze-plymouth-5.15.3.tar.xz"; + sha256 = "0f654kys4xw2c84iblz2q2x53z4mb2javgngb1dr3jkafysr0h37"; + name = "breeze-plymouth-5.15.3.tar.xz"; }; }; discover = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/discover-5.14.5.tar.xz"; - sha256 = "0gxhl2cv5yz3jw8fp8g8idi1k5hlhnvwbnvvg0dgnlzz6jb1s8dd"; - name = "discover-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/discover-5.15.3.tar.xz"; + sha256 = "1b6mc81xr4wl29bjw95jm8k72j3hhn1ps8a5dvzanbslfx31hf1b"; + name = "discover-5.15.3.tar.xz"; }; }; drkonqi = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/drkonqi-5.14.5.tar.xz"; - sha256 = "0xgym368f9r21wjh9fpv16m90dcj87g9p5df850fnn2k5n8x38z8"; - name = "drkonqi-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/drkonqi-5.15.3.tar.xz"; + sha256 = "0y4bkrv7bx69hm4kbbd2jfjnccj99686s0k5lm4ldv3wvf66k4sx"; + name = "drkonqi-5.15.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kactivitymanagerd-5.14.5.tar.xz"; - sha256 = "0zms9npis0rklnbz93c69h4yg7dkrmfkzvzsfvkg90w37ap3vyl7"; - name = "kactivitymanagerd-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kactivitymanagerd-5.15.3.tar.xz"; + sha256 = "1lz3mm0bli2w8xwr3n06ss7qqzm4clvs3d9hfydyf7xq03mszrym"; + name = "kactivitymanagerd-5.15.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kde-cli-tools-5.14.5.tar.xz"; - sha256 = "01mrnjqla4q07cnb1p51nq2pvj9vaamic3dsyj3b7hqky9fna9ln"; - name = "kde-cli-tools-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kde-cli-tools-5.15.3.tar.xz"; + sha256 = "1praysa894m67kwy4xaqh354c0shwfyyrqf4n9wrfwwrchdw6ypg"; + name = "kde-cli-tools-5.15.3.tar.xz"; }; }; kdecoration = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kdecoration-5.14.5.tar.xz"; - sha256 = "115pli0qpa8lx0jasg1886fcg7gb2kk8v6k8r8l8c820l97sq7in"; - name = "kdecoration-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kdecoration-5.15.3.tar.xz"; + sha256 = "1ymp6szphpnfvdnhg8n1wan76z1s5xw68xsmwm21zrjf8lmrwkdh"; + name = "kdecoration-5.15.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kde-gtk-config-5.14.5.tar.xz"; - sha256 = "12467wkjh2nmcf6r7n8qin1rryd39g0dg7gn43sdg6vdwpyl2kdm"; - name = "kde-gtk-config-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kde-gtk-config-5.15.3.tar.xz"; + sha256 = "1ysw26sfx2wyd79bkknvvcmg5s4b154iyds9c6wp8brmcn6ng3s8"; + name = "kde-gtk-config-5.15.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kdeplasma-addons-5.14.5.tar.xz"; - sha256 = "18sph3719d9pq2j5k7swiv9xbrpj659a3q66zvhz3dmh11y73f0m"; - name = "kdeplasma-addons-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kdeplasma-addons-5.15.3.tar.xz"; + sha256 = "071wnwxgywg6bqqgwmjyswai3k0n4c15lq8mspcy92kym3msqkrn"; + name = "kdeplasma-addons-5.15.3.tar.xz"; }; }; kgamma5 = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kgamma5-5.14.5.tar.xz"; - sha256 = "17smrdwyalknb3f6ckqs7kglfpqwajbiyd212wlsmqbva4by0fy0"; - name = "kgamma5-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kgamma5-5.15.3.tar.xz"; + sha256 = "12cnrnmr2wp14afg6x438gm502514pk61mfr26cypvcd6azpc2my"; + name = "kgamma5-5.15.3.tar.xz"; }; }; khotkeys = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/khotkeys-5.14.5.tar.xz"; - sha256 = "0572jpgbhacx4gy40m594rbnxy3zaq5w3lcrfd8i2750ljswcq24"; - name = "khotkeys-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/khotkeys-5.15.3.tar.xz"; + sha256 = "0gnkdl6kki8xph3787bacggapm4vbakj39y9kcjqvqrqxifp1ml5"; + name = "khotkeys-5.15.3.tar.xz"; }; }; kinfocenter = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kinfocenter-5.14.5.tar.xz"; - sha256 = "1z1i9g923cbdni5gfa6dpv46z1p2v40rfcvhy7i9h5nf49aw2rnc"; - name = "kinfocenter-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kinfocenter-5.15.3.tar.xz"; + sha256 = "0rhhrsp0fmgfsmrfv468l4xinyfyghf6921s1581sgg5fk9qhrwr"; + name = "kinfocenter-5.15.3.tar.xz"; }; }; kmenuedit = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kmenuedit-5.14.5.tar.xz"; - sha256 = "1aa4a35s5h44fc88hmmfdpzy26zc47h9n448cd4vbm4bm411551d"; - name = "kmenuedit-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kmenuedit-5.15.3.tar.xz"; + sha256 = "1s7bhpxiapmx496f3y3klmc9i2347fs25yhd2brg92jziw73jpab"; + name = "kmenuedit-5.15.3.tar.xz"; }; }; kscreen = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kscreen-5.14.5.tar.xz"; - sha256 = "1nb1ysgcx49galbf16mxbawybfik92bpr9vbwgg5ycsdx1f9q8yi"; - name = "kscreen-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kscreen-5.15.3.tar.xz"; + sha256 = "1izq1anl0r9ysmsdnc2ny7cx73xc190qbad59nrnlqcxrsplb68f"; + name = "kscreen-5.15.3.tar.xz"; }; }; kscreenlocker = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kscreenlocker-5.14.5.tar.xz"; - sha256 = "16amr7pz0k6w5vkk1dwn2qi3s1mln0jypwmjazqq2lbwimn8k56m"; - name = "kscreenlocker-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kscreenlocker-5.15.3.tar.xz"; + sha256 = "0bglpgibrc8l6yi24pj4kja33mc02clgi1vbdvw1qpp65ixhpzna"; + name = "kscreenlocker-5.15.3.tar.xz"; }; }; ksshaskpass = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/ksshaskpass-5.14.5.tar.xz"; - sha256 = "0skr247k4ky7lpbdwlmkrnr3mj1pa6pxl96pyxwsw7za784qg6dj"; - name = "ksshaskpass-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/ksshaskpass-5.15.3.tar.xz"; + sha256 = "1zrjc74srb4jp8sw6pi0ik2i4yxffvgv037d50yk1fif1xyvnf9s"; + name = "ksshaskpass-5.15.3.tar.xz"; }; }; ksysguard = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/ksysguard-5.14.5.tar.xz"; - sha256 = "0ybxh6ll080rkrrr4b5ydl06x8zi97702661cajvbv00lhq4vp8b"; - name = "ksysguard-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/ksysguard-5.15.3.tar.xz"; + sha256 = "1nxgadymq45yn92cs08gfmv5krc2ylwgbn5qcc2aq6ryrrhrw89q"; + name = "ksysguard-5.15.3.tar.xz"; }; }; kwallet-pam = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kwallet-pam-5.14.5.tar.xz"; - sha256 = "1mkjjc88kqf5x313nifla9pzrgzqm4v92150dbs1f89bsn673pk8"; - name = "kwallet-pam-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwallet-pam-5.15.3.tar.xz"; + sha256 = "1w3vf92k3k2084cflv4fwav16czc4vqg62gi8x1alri38ziyb793"; + name = "kwallet-pam-5.15.3.tar.xz"; }; }; kwayland-integration = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kwayland-integration-5.14.5.tar.xz"; - sha256 = "0rd0xhb53iixv9i8x0gh3rr1082lj7zdymsqdmi7sfgb66g8c03l"; - name = "kwayland-integration-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwayland-integration-5.15.3.tar.xz"; + sha256 = "0grb9fnk7pfgwzj3c9d11zl1j9jy9k6d4pw2n2fdrs02g3yg603h"; + name = "kwayland-integration-5.15.3.tar.xz"; }; }; kwin = { - version = "5.14.5"; + version = "5.15.3.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kwin-5.14.5.tar.xz"; - sha256 = "0ifdlnzw3ydrbidzk256vks66d1rxyilhqi09csygx17jqk7szj4"; - name = "kwin-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.2.tar.xz"; + sha256 = "0iri6993zsxmrm7qnf76py7ihc27x9y741ar7g9fry8c8knmqyrw"; + name = "kwin-5.15.3.2.tar.xz"; }; }; kwrited = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/kwrited-5.14.5.tar.xz"; - sha256 = "0115qscr8a54h7h8w4xw4fjzp7qipyw3d3jswhii7axnzp6q6qnh"; - name = "kwrited-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/kwrited-5.15.3.tar.xz"; + sha256 = "0xhdmnfkpr35sks7k66s5cbq220yrmbn8ixcsdqwsgpji2sx4g7v"; + name = "kwrited-5.15.3.tar.xz"; }; }; libkscreen = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/libkscreen-5.14.5.tar.xz"; - sha256 = "1vyaml5ap9siw9idiny92li2bykd0nwjsmwmg0c7ad912j4g1s7y"; - name = "libkscreen-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/libkscreen-5.15.3.tar.xz"; + sha256 = "0fzfk8ga5qinsmag61l29cf92r7qm4nlb8hrhddyff7d7c7kr3vj"; + name = "libkscreen-5.15.3.tar.xz"; }; }; libksysguard = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/libksysguard-5.14.5.tar.xz"; - sha256 = "11nz0g7dqvpvgsv0a7sai445vgfsfi25plj7jb1i46n7zf8i8mya"; - name = "libksysguard-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/libksysguard-5.15.3.tar.xz"; + sha256 = "05cfb51xcmxb8k2k14n2i5ysj47aism9yq7lk2rw216bsdp2mqnj"; + name = "libksysguard-5.15.3.tar.xz"; }; }; milou = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/milou-5.14.5.tar.xz"; - sha256 = "1776441mhmwcvrzmdqg531md79azbkbhng51kyq6i9cvkhxyf583"; - name = "milou-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/milou-5.15.3.tar.xz"; + sha256 = "1prq9mdrysz8ckf7n6sjfn3qc87135nj69v2jcayn9irb0k8wz01"; + name = "milou-5.15.3.tar.xz"; }; }; oxygen = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/oxygen-5.14.5.tar.xz"; - sha256 = "0h70k7af69zdky0g6napd1kdnvbxhnw3nrwr9jqv1fq5762xnkk8"; - name = "oxygen-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/oxygen-5.15.3.tar.xz"; + sha256 = "0a069imvw0khkbcih8zvx0i0ks99jkwis6p73n4846qz544f3dvb"; + name = "oxygen-5.15.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-browser-integration-5.14.5.tar.xz"; - sha256 = "1260h5sh0gkbkhcj17ss0n0y48i1pxh3f4p5dcbgbz775g1dhi2s"; - name = "plasma-browser-integration-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-browser-integration-5.15.3.tar.xz"; + sha256 = "1mhaa5z63gyd8j7zplmyicnibqsv1xhd9mxip6clhj5bfk8q9jar"; + name = "plasma-browser-integration-5.15.3.tar.xz"; }; }; plasma-desktop = { - version = "5.14.5"; + version = "5.15.3.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-desktop-5.14.5.tar.xz"; - sha256 = "0pr07p36jrpvkk4fp14fb4minnwj5gnmvdg9jf7bi8sjjz6jpnnl"; - name = "plasma-desktop-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.2.tar.xz"; + sha256 = "12pz0bin3j2f98k88nwmb271lr6v6w3l28li0iri2x8pk144vr91"; + name = "plasma-desktop-5.15.3.2.tar.xz"; }; }; plasma-integration = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-integration-5.14.5.tar.xz"; - sha256 = "15nhrliri4cjx712f1rxbq2f87lj4wxsqgbhw9p02z12h3n9z3ds"; - name = "plasma-integration-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-integration-5.15.3.tar.xz"; + sha256 = "08qw2ibl0j2nhsplc3b117vdc00bd2gn1q48nx0xy349bf64m735"; + name = "plasma-integration-5.15.3.tar.xz"; }; }; plasma-nm = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-nm-5.14.5.tar.xz"; - sha256 = "1hf98c9llcff0h2w4l45nw0vysxvnanf7hczhj93z4562qrafxm2"; - name = "plasma-nm-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-nm-5.15.3.tar.xz"; + sha256 = "1l9wh4hs2v0b9hdagcgl67z0w4amffakxczwy0nwymqzv0mxgqvz"; + name = "plasma-nm-5.15.3.tar.xz"; }; }; plasma-pa = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-pa-5.14.5.tar.xz"; - sha256 = "0z74qg7m4y1ifzni1877hiil3rn6ad3x4fvgv4bib4jhg7ckaiqg"; - name = "plasma-pa-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-pa-5.15.3.tar.xz"; + sha256 = "1lkhidd5b4mjn23mxcp2vfmxf7dwbk7y14svc4wy6xc1xg1pc125"; + name = "plasma-pa-5.15.3.tar.xz"; }; }; plasma-sdk = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-sdk-5.14.5.tar.xz"; - sha256 = "0v90nk6yhrapdszh8sd3m0wffkjgnrhdy1sz1vl9s0ab5sdpmxr1"; - name = "plasma-sdk-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-sdk-5.15.3.tar.xz"; + sha256 = "1qzh0yy4zql7a50ql9ghhvlfxjnbckflbgbzdyd7i9x3ml7s5saw"; + name = "plasma-sdk-5.15.3.tar.xz"; }; }; plasma-tests = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-tests-5.14.5.tar.xz"; - sha256 = "03h889xn6i067d1sdymn6fgj8xik3pa75lljl8kj3vl6bks24jyh"; - name = "plasma-tests-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-tests-5.15.3.tar.xz"; + sha256 = "1z5vhw1dy1qks6w161yamn2fawrgkggv9mvvgpmljmy07qpafgkg"; + name = "plasma-tests-5.15.3.tar.xz"; }; }; plasma-vault = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-vault-5.14.5.tar.xz"; - sha256 = "17r44n0mkcwc2fkjf397ks8xv82m59gvnawbj9713c5l31ln5mi3"; - name = "plasma-vault-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-vault-5.15.3.tar.xz"; + sha256 = "1my9dnqz11frn07fk505pfi2nkf2d642jfgjklh5zfngjxy589jy"; + name = "plasma-vault-5.15.3.tar.xz"; }; }; plasma-workspace = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz"; - sha256 = "14d3wnsm4bi1izx5qlpk0mnqmxwx18bqypa3wwmhn1535kfz8glh"; - name = "plasma-workspace-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-5.15.3.tar.xz"; + sha256 = "08irdg8divr45z53kr6b1mv4s2jakmq3r79g7df6ja9rb6py5f59"; + name = "plasma-workspace-5.15.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plasma-workspace-wallpapers-5.14.5.tar.xz"; - sha256 = "17q0685i4267ihlrii3b8764ak458kzs0inqfcj9x25m338xz19q"; - name = "plasma-workspace-wallpapers-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-wallpapers-5.15.3.tar.xz"; + sha256 = "0xgssv66ksljv8xkj20v2x1bppkyn8z17wa3hynwlcqxh2g4afq4"; + name = "plasma-workspace-wallpapers-5.15.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/plymouth-kcm-5.14.5.tar.xz"; - sha256 = "1cwmkprhc4496x4a38l2x7hnifnp4daw8g1gic0ik2sm0a6xn77k"; - name = "plymouth-kcm-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/plymouth-kcm-5.15.3.tar.xz"; + sha256 = "0fbr9nf263pc9inakhp901r58mlsm1jgw0xqp9fj08c9lj25z190"; + name = "plymouth-kcm-5.15.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.14.5"; + version = "1-5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/polkit-kde-agent-1-5.14.5.tar.xz"; - sha256 = "1lzw4zq2ysnva5g1v85k9k6yck30wfgcy0sn1ncxy183vm36b2ag"; - name = "polkit-kde-agent-1-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/polkit-kde-agent-1-5.15.3.tar.xz"; + sha256 = "07gl57h9zmagbw7v2sfksbcbqrfdhr8isfmpcw10rc4k2awlsysy"; + name = "polkit-kde-agent-1-5.15.3.tar.xz"; }; }; powerdevil = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/powerdevil-5.14.5.tar.xz"; - sha256 = "0rdrj6k7bb1cisz1g8akxxn68c8rj0zddim1afvcq1iqr727wqj5"; - name = "powerdevil-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/powerdevil-5.15.3.tar.xz"; + sha256 = "1f7ik3lh30irqzf0pgy59kkrsn4fkl8xwam1bikfm34bwzrsxb14"; + name = "powerdevil-5.15.3.tar.xz"; }; }; sddm-kcm = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz"; - sha256 = "0aix2grc2h2w8qxcbdwxhvq09ispblnisl017bvb19apkvs0w8m1"; - name = "sddm-kcm-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/sddm-kcm-5.15.3.tar.xz"; + sha256 = "1mvp8p1k9csmn6h6iyk29yj1j4b4dfyd6j4v0v2ha1vdfjwjlsh2"; + name = "sddm-kcm-5.15.3.tar.xz"; }; }; systemsettings = { - version = "5.14.5"; + version = "5.15.3.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/systemsettings-5.14.5.tar.xz"; - sha256 = "1q1ih74vkdhss64ayc3qmbrw4hhvfl3axlkhh63rky09qn83x9zw"; - name = "systemsettings-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.2.tar.xz"; + sha256 = "0bqhff2s2qyz1x8nhrphnkyja0mhr7msf58cwdkscsl6lyamn2a2"; + name = "systemsettings-5.15.3.2.tar.xz"; }; }; user-manager = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/user-manager-5.14.5.tar.xz"; - sha256 = "0aw2s029547rzx3xg9nib5w30d25978fpv7xyshxmp3z8rmzgcjv"; - name = "user-manager-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/user-manager-5.15.3.tar.xz"; + sha256 = "18acg3xjcdhcwk3irsf1hgkwma9mn6msl6qwmf0slz1lydlrljs4"; + name = "user-manager-5.15.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.14.5"; + version = "5.15.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.5/xdg-desktop-portal-kde-5.14.5.tar.xz"; - sha256 = "0h6hdk9fkf98jfjaza773k37369ayvwmwrgxn6al2pma6n07vddq"; - name = "xdg-desktop-portal-kde-5.14.5.tar.xz"; + url = "${mirror}/stable/plasma/5.15.3/xdg-desktop-portal-kde-5.15.3.tar.xz"; + sha256 = "10cmy4j54nkwrgibxdpx6d30g596ikvb1dqqmp1gvmzr570gmbi7"; + name = "xdg-desktop-portal-kde-5.15.3.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index ae1ee50a1211..1e04eb1e2b00 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -2,14 +2,14 @@ mkDerivation, extra-cmake-modules, gettext, kdoctools, python, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - cups, pcre, pipewire + cups, pcre, pipewire, kio }: mkDerivation { name = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ - cups pcre pipewire + cups pcre pipewire kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem ]; } diff --git a/nixpkgs/pkgs/desktops/xfce/applications/mousepad.nix b/nixpkgs/pkgs/desktops/xfce/applications/mousepad.nix index d66fa2049e65..2dca1fa29b0f 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/mousepad.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/mousepad.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "A simple text editor for Xfce"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/applications/orage.nix b/nixpkgs/pkgs/desktops/xfce/applications/orage.nix index 72d8e682c862..5cf39639a126 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/orage.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/orage.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { xfce.xfce4-panel ]; meta = { - homepage = http://www.xfce.org/projects/; + homepage = https://www.xfce.org/projects/; description = "A simple calendar application with reminders"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/applications/terminal.nix b/nixpkgs/pkgs/desktops/xfce/applications/terminal.nix index 773a8274f341..31e851a469d7 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/terminal.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/terminal.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ]; meta = { - homepage = http://www.xfce.org/projects/terminal; + homepage = https://www.xfce.org/projects/terminal; description = "A modern terminal emulator primarily for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 93a7fad4918a..e1646d93a619 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { passthru = { inherit gst_plugins; }; meta = { - homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive + homepage = https://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 8e5bffd9dd6f..085cfd7b8f90 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter; + homepage = https://goodies.xfce.org/projects/applications/xfce4-screenshooter; description = "Xfce screenshooter"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed.nix index 8e4f952438fe..dafb72582b31 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-volumed.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfce4-volumed; # referenced but inactive + homepage = https://www.xfce.org/projects/xfce4-volumed; # referenced but inactive description = "A volume keys control daemon for the Xfce desktop environment"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index a0f2ed00d0e8..6ac601c6685e 100644 --- a/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/nixpkgs/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gtk2 ]; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Icons for Xfce"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix b/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix index 80cf7dd28c5d..783fbb13c83c 100644 --- a/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/nixpkgs/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; meta = with stdenv.lib; { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Themes for Xfce"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/core/garcon.nix b/nixpkgs/pkgs/desktops/xfce/core/garcon.nix index d9c918c0fdc1..41d98f17516d 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/garcon.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/garcon.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ]; meta = with stdenv.lib; { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Xfce menu support library"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 0d69d4d2f32b..bb319e6fc6c3 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "GTK+ theme engine for Xfce"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui.nix b/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui.nix index e8d5b4acd769..797b51de8e40 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Basic GUI library for Xfce"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; } - diff --git a/nixpkgs/pkgs/desktops/xfce/core/libxfce4util.nix b/nixpkgs/pkgs/desktops/xfce/core/libxfce4util.nix index 5a411bfbb5be..b68b7059f8df 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/libxfce4util.nix @@ -18,10 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib intltool ]; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Basic utility non-GUI functions for Xfce"; license = "bsd"; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/nixpkgs/pkgs/desktops/xfce/core/libxfcegui4.nix b/nixpkgs/pkgs/desktops/xfce/core/libxfcegui4.nix index 7fe76057c930..5c61c16cbcc1 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.xfce.org/; + homepage = https://www.xfce.org/; description = "Basic GUI library for Xfce"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/core/thunar-volman.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar-volman.nix index 39214ca57b1f..eda3aab070ac 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/thunar-volman.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman; + homepage = https://goodies.xfce.org/projects/thunar-plugins/thunar-volman; description = "Thunar extension for automatic management of removable drives and media"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel.nix index d2d992d54a88..b8ecae7e4e64 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfce4-panel; + homepage = https://www.xfce.org/projects/xfce4-panel; description = "Xfce panel"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager.nix index ffcc67bf0e9b..266f30645075 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -35,11 +35,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; + homepage = https://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; }; } - diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-session.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session.nix index 3f6237d6de17..b57dd252033f 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session.nix @@ -35,11 +35,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xsession-prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfce4-session; + homepage = https://www.xfce.org/projects/xfce4-session; description = "Session manager for Xfce"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; }; } - diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings.nix index 592b03e8954a..584055c8ddf6 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfce4-settings; + homepage = https://www.xfce.org/projects/xfce4-settings; description = "Settings manager for Xfce"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfdesktop.nix b/nixpkgs/pkgs/desktops/xfce/core/xfdesktop.nix index 48585b4004bb..091dd03c0bcf 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfdesktop.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfdesktop; + homepage = https://www.xfce.org/projects/xfdesktop; description = "Xfce desktop manager"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfwm4.nix b/nixpkgs/pkgs/desktops/xfce/core/xfwm4.nix index 313a2662f039..d26649ee6ce9 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfwm4.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfwm4.nix @@ -22,11 +22,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xfce.org/projects/xfwm4; + homepage = https://www.xfce.org/projects/xfwm4; description = "Window manager for Xfce"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; }; } - diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 80153332934a..541b30ec1b3d 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Mailwatch plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 8a602b8b4a1e..5331c29a4546 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 73ab7782ebd4..57cd48c6f270 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index e43dacce6250..b62dc2def7f1 100644 --- a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -18,19 +18,28 @@ let "x86_64-unknown-linux-gnu" = { double = "linux-x86_64"; }; - "armv5tel-unknown-linux-androideabi" = { - arch = "arm"; - triple = "arm-linux-androideabi"; - gccVer = "4.8"; + "i686-unknown-linux-android" = { + triple = "i686-linux-android"; + arch = "x86"; + toolchain = "x86"; + gccVer = "4.9"; + }; + "x86_64-unknown-linux-android" = { + triple = "x86_64-linux-android"; + arch = "x86_64"; + toolchain = "x86_64"; + gccVer = "4.9"; }; "armv7a-unknown-linux-androideabi" = { arch = "arm"; triple = "arm-linux-androideabi"; + toolchain = "arm-linux-androideabi"; gccVer = "4.9"; }; "aarch64-unknown-linux-android" = { arch = "arm64"; triple = "aarch64-linux-android"; + toolchain = "aarch64-linux-android"; gccVer = "4.9"; }; }.${config} or @@ -38,49 +47,49 @@ let hostInfo = ndkInfoFun stdenv.hostPlatform; targetInfo = ndkInfoFun stdenv.targetPlatform; + + prefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); in rec { # Misc tools - binaries = let - ndkBinDir = - "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin"; - ndkGCCLibDir = - "${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/lib/gcc/${targetInfo.triple}/4.9.x"; + binaries = runCommand "ndk-gcc-binutils" { + isClang = true; # clang based cc, but bintools ld + nativeBuildInputs = [ makeWrapper ]; + propgatedBuildInputs = [ androidndk ]; + } '' + mkdir -p $out/bin - in runCommand "ndk-gcc-binutils" { - isGNU = true; # for cc-wrapper - nativeBuildInputs = [ makeWrapper ]; - propgatedBuildInputs = [ androidndk ]; - } '' - mkdir -p $out/bin - for prog in ${ndkBinDir}/${targetInfo.triple}-*; do - prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//') - cat > $out/bin/${stdenv.targetPlatform.config}-$prog_suffix <<EOF - #! ${stdenv.shell} -e - $prog "\$@" - EOF - chmod +x $out/bin/${stdenv.targetPlatform.config}-$prog_suffix - done + # llvm toolchain + for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/bin/*; do + ln -s $prog $out/bin/$(basename $prog) + ln -s $prog $out/bin/${prefix}$(basename $prog) + done - ln -s $out/bin/${stdenv.targetPlatform.config}-ld $out/bin/ld - ln -s ${ndkGCCLibDir} $out/lib - ''; + # bintools toolchain + for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin/*; do + prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//') + ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix + done + + # shitty googly wrappers + rm -f $out/bin/${stdenv.targetPlatform.config}-gcc $out/bin/${stdenv.targetPlatform.config}-g++ + ''; binutils = wrapBintoolsWith { bintools = binaries; libc = targetAndroidndkPkgs.libraries; - extraBuildCommands = '' - echo "--build-id" >> $out/nix-support/libc-ldflags - ''; }; - gcc = wrapCCWith { + clang = wrapCCWith { cc = binaries; bintools = binutils; libc = targetAndroidndkPkgs.libraries; extraBuildCommands = '' echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags + echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags '' + lib.optionalString stdenv.targetPlatform.isAarch32 (let p = stdenv.targetPlatform.platform.gcc or {} @@ -90,7 +99,6 @@ rec { (lib.optional (p ? cpu) "-mcpu=${p.cpu}") (lib.optional (p ? abi) "-mabi=${p.abi}") (lib.optional (p ? fpu) "-mfpu=${p.fpu}") - (lib.optional (p ? float) "-mfloat=${p.float}") (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}") (lib.optional (p ? mode) "-mmode=${p.mode}") ]; @@ -98,17 +106,10 @@ rec { sed -E -i \ $out/bin/${stdenv.targetPlatform.config}-cc \ $out/bin/${stdenv.targetPlatform.config}-c++ \ - $out/bin/${stdenv.targetPlatform.config}-gcc \ - $out/bin/${stdenv.targetPlatform.config}-g++ \ - -e '130i extraBefore+=(-Wl,--fix-cortex-a8)' \ - -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|' - '') - # GCC 4.9 is the first relase with "-fstack-protector" - + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") '' - sed -E \ - -i $out/nix-support/add-hardening.sh \ - -e 's|(-fstack-protector)-strong|\1|g' - ''; + $out/bin/${stdenv.targetPlatform.config}-clang \ + $out/bin/${stdenv.targetPlatform.config}-clang++ \ + -e 's|^(extraBefore=)\((.*)\)$|\1(\2 -Wl,--fix-cortex-a8 ${builtins.toString flags})|' + ''); }; # Bionic lib C and other libraries. @@ -116,17 +117,11 @@ rec { # We use androidndk from the previous stage, else we waste time or get cycles # cross-compiling packages to wrap incorrectly wrap binaries we don't include # anyways. - libraries = - let - includePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include"; - asmIncludePath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}"; - libPath = "${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/"; - in - runCommand "bionic-prebuilt" {} '' - mkdir -p $out - cp -r ${includePath} $out/include - chmod +w $out/include - cp -r ${asmIncludePath}/* $out/include - ln -s ${libPath} $out/lib - ''; + libraries = runCommand "bionic-prebuilt" {} '' + mkdir -p $out + cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include + chmod +w $out/include + cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include + ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib + ''; } diff --git a/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix b/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix index 09422a7a8623..ad68382c13ae 100644 --- a/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/arachne-pnr/default.nix @@ -4,7 +4,7 @@ with builtins; stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2018.09.08"; + version = "2018.09.09"; src = fetchFromGitHub { owner = "yosyshq"; diff --git a/nixpkgs/pkgs/development/compilers/aspectj/default.nix b/nixpkgs/pkgs/development/compilers/aspectj/default.nix index f9e792260335..4b216761259d 100644 --- a/nixpkgs/pkgs/development/compilers/aspectj/default.nix +++ b/nixpkgs/pkgs/development/compilers/aspectj/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://www.eclipse.org/aspectj/; description = "A seamless aspect-oriented extension to the Java programming language"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.epl10; }; } diff --git a/nixpkgs/pkgs/development/compilers/bupc/default.nix b/nixpkgs/pkgs/development/compilers/bupc/default.nix index f22549d06e63..ad10845e98cf 100644 --- a/nixpkgs/pkgs/development/compilers/bupc/default.nix +++ b/nixpkgs/pkgs/development/compilers/bupc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { parallelism is fixed at program startup time, typically with a single thread of execution per processor. ''; - homepage = http://upc.lbl.gov/; + homepage = https://upc.lbl.gov/; license = licenses.mit; platforms = with platforms; [ linux ]; maintainers = with maintainers; [ zimbatm ]; diff --git a/nixpkgs/pkgs/development/compilers/chez/default.nix b/nixpkgs/pkgs/development/compilers/chez/default.nix index 5b02aed274f8..9216c7791433 100644 --- a/nixpkgs/pkgs/development/compilers/chez/default.nix +++ b/nixpkgs/pkgs/development/compilers/chez/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchgit, coreutils, cctools, ncurses, libiconv, libX11 }: +{ stdenv, fetchFromGitHub +, coreutils, cctools +, ncurses, libiconv, libX11, libuuid +}: stdenv.mkDerivation rec { name = "chez-scheme-${version}"; - version = "9.5.1"; + version = "9.5.2"; - src = fetchgit { - url = "https://github.com/cisco/chezscheme.git"; - rev = "bc117fd4d567a6863689fec6814882a0f04e577a"; - sha256 = "1adzw7bgdz0p4xmccc6awdkb7bp6xba9mnlsh3r3zvblqfci8i70"; + src = fetchFromGitHub { + owner = "cisco"; + repo = "ChezScheme"; + rev = "refs/tags/v${version}"; + sha256 = "1gsjmsvsj31q5l9bjvm869y7bakrvl41yq94vyqdx8zwcr1bmpjf"; fetchSubmodules = true; }; nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools; - buildInputs = [ ncurses libiconv libX11 ]; + buildInputs = [ ncurses libiconv libX11 libuuid ]; enableParallelBuilding = true; @@ -49,41 +53,22 @@ stdenv.mkDerivation rec { ** for. */ configurePhase = '' - ./configure --threads \ - --installprefix=$out --installman=$out/share/man \ - --workarea=work + ./configure --threads --installprefix=$out --installman=$out/share/man ''; /* - ** Install the kernel.o file, so we can compile C applications that - ** link directly to the Chez runtime (for booting their own files, or - ** embedding.) - ** - ** Ideally in the future this would be less of a hack and could be - ** done by Chez itself. Alternatively, there could just be a big - ** case statement matching to the different stdenv.hostPlatform.platform - ** values... + ** Clean up some of the examples from the build output. */ postInstall = '' - m="$(ls ./work/boot)" - if [ "x''${m[1]}" != "x" ]; then - >&2 echo "ERROR: more than one bootfile build found; this is a nixpkgs error" - exit 1 - fi - - kernel=./work/boot/$m/kernel.o - kerneldest=$out/lib/csv${version}/$m/ - - echo installing $kernel to $kerneldest - cp $kernel $kerneldest/kernel.o + rm -rf $out/lib/csv${version}/examples ''; meta = { - description = "A powerful and incredibly fast R6RS Scheme compiler"; - homepage = https://cisco.github.io/ChezScheme/; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + description = "A powerful and incredibly fast R6RS Scheme compiler"; + homepage = https://cisco.github.io/ChezScheme/; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.unix; badPlatforms = [ "aarch64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/nixpkgs/pkgs/development/compilers/cmdstan/default.nix index 960a54489da4..dab724ea607c 100644 --- a/nixpkgs/pkgs/development/compilers/cmdstan/default.nix +++ b/nixpkgs/pkgs/development/compilers/cmdstan/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { inference with Variational inference (ADVI) and penalized maximum likelihood estimation with Optimization (L-BFGS). ''; - homepage = http://mc-stan.org/interfaces/cmdstan.html; + homepage = https://mc-stan.org/interfaces/cmdstan.html; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/nixpkgs/pkgs/development/compilers/dmd/default.nix b/nixpkgs/pkgs/development/compilers/dmd/default.nix index a9f0e3ec0a51..b15e1a9aa309 100644 --- a/nixpkgs/pkgs/development/compilers/dmd/default.nix +++ b/nixpkgs/pkgs/development/compilers/dmd/default.nix @@ -2,10 +2,10 @@ , makeWrapper, unzip, which, writeTextFile , curl, tzdata, gdb, darwin, git , callPackage, targetPackages, ldc -, version ? "2.084.1" -, dmdSha256 ? "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms" -, druntimeSha256 ? "0i0g2cnzh097pmvb86gvyj79canaxppw33hp7ylqnd11q4kqc8pb" -, phobosSha256 ? "1hxpismj9gy5n1bc9kl9ykgd4lfmkq9i8xgrq09j0fybfwn9j1gc" +, version ? "2.085.1" +, dmdSha256 ? "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660" +, druntimeSha256 ? "109f2glsqrlshk06761xlw4r5v22mivp873cq9g5gcax3g00k617" +, phobosSha256 ? "0giispqqx8j8xg6c0hm7nx77bcahiwic8rvf12sws3sv5pizv8pr" }: let @@ -51,14 +51,6 @@ stdenv.mkDerivation rec { }) ]; - patches = [ - (fetchpatch { - name = "fix-loader-import.patch"; - url = "https://github.com/dlang/dmd/commit/e7790436c4af1910b8c079dac9bb69627d7dea4b.patch"; - sha256 = "0w69hajx8agywc7m2hph5m27g2yclz8ml0gjjyjk9k6ii3jv45kx"; - }) - ]; - patchFlags = [ "--directory=dmd" "-p1" ]; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 956f357f84c6..68c05d289784 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -48,6 +48,9 @@ let version = "7.4.0"; ./riscv-no-relax.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optionals targetPlatform.isNetBSD [ + ../libstdc++-netbsd-ctypes.patch + ] ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; @@ -302,6 +305,7 @@ stdenv.mkDerivation ({ "--disable-gnu-indirect-function" ] ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" + ++ optional targetPlatform.isNetBSD "--disable-libcilkrts" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; diff --git a/nixpkgs/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch b/nixpkgs/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch new file mode 100644 index 000000000000..28fff80b786d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch @@ -0,0 +1,141 @@ +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +index ff3ec893974..21eccf9fde1 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +@@ -38,40 +38,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + /// @brief Base class for ctype. + struct ctype_base + { +- // Non-standard typedefs. +- typedef const unsigned char* __to_type; + + // NB: Offsets into ctype<char>::_M_table force a particular size + // on the mask type. Because of this, we don't use an enum. +- typedef unsigned char mask; + + #ifndef _CTYPE_U +- static const mask upper = _U; +- static const mask lower = _L; +- static const mask alpha = _U | _L; +- static const mask digit = _N; +- static const mask xdigit = _N | _X; +- static const mask space = _S; +- static const mask print = _P | _U | _L | _N | _B; +- static const mask graph = _P | _U | _L | _N; +- static const mask cntrl = _C; +- static const mask punct = _P; +- static const mask alnum = _U | _L | _N; ++ // Non-standard typedefs. ++ typedef const unsigned char* __to_type; ++ ++ typedef unsigned char mask; ++ ++ static const mask upper = _U; ++ static const mask lower = _L; ++ static const mask alpha = _U | _L; ++ static const mask digit = _N; ++ static const mask xdigit = _N | _X; ++ static const mask space = _S; ++ static const mask print = _P | _U | _L | _N | _B; ++ static const mask graph = _P | _U | _L | _N; ++ static const mask cntrl = _C; ++ static const mask punct = _P; ++ static const mask alnum = _U | _L | _N; + #else +- static const mask upper = _CTYPE_U; +- static const mask lower = _CTYPE_L; +- static const mask alpha = _CTYPE_U | _CTYPE_L; +- static const mask digit = _CTYPE_N; +- static const mask xdigit = _CTYPE_N | _CTYPE_X; +- static const mask space = _CTYPE_S; +- static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B; +- static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N; +- static const mask cntrl = _CTYPE_C; +- static const mask punct = _CTYPE_P; +- static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N; ++ typedef const unsigned short* __to_type; ++ ++ typedef unsigned short mask; ++ ++ static const mask upper = _CTYPE_U; ++ static const mask lower = _CTYPE_L; ++ static const mask alpha = _CTYPE_A; ++ static const mask digit = _CTYPE_D; ++ static const mask xdigit = _CTYPE_X; ++ static const mask space = _CTYPE_S; ++ static const mask print = _CTYPE_R; ++ static const mask graph = _CTYPE_G; ++ static const mask cntrl = _CTYPE_C; ++ static const mask punct = _CTYPE_P; ++ static const mask alnum = _CTYPE_A | _CTYPE_D; + #endif + #if __cplusplus >= 201103L +- static const mask blank = space; ++ static const mask blank = space; + #endif + }; + +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc +index ed3b7cd0d6a..33358e8f5d8 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc +@@ -38,11 +38,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + // Information as gleaned from /usr/include/ctype.h + +- extern "C" const u_int8_t _C_ctype_[]; +- + const ctype_base::mask* + ctype<char>::classic_table() throw() +- { return _C_ctype_ + 1; } ++ { return _C_ctype_tab_ + 1; } + + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) +@@ -69,14 +67,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + char + ctype<char>::do_toupper(char __c) const +- { return ::toupper((int) __c); } ++ { return ::toupper((int)(unsigned char) __c); } + + const char* + ctype<char>::do_toupper(char* __low, const char* __high) const + { + while (__low < __high) + { +- *__low = ::toupper((int) *__low); ++ *__low = ::toupper((int)(unsigned char) *__low); + ++__low; + } + return __high; +@@ -84,14 +82,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + char + ctype<char>::do_tolower(char __c) const +- { return ::tolower((int) __c); } ++ { return ::tolower((int)(unsigned char) __c); } + + const char* + ctype<char>::do_tolower(char* __low, const char* __high) const + { + while (__low < __high) + { +- *__low = ::tolower((int) *__low); ++ *__low = ::tolower((int)(unsigned char) *__low); + ++__low; + } + return __high; +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h +index ace1120fba2..3234ce17c70 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h +@@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + is(const char* __low, const char* __high, mask* __vec) const + { + while (__low < __high) +- *__vec++ = _M_table[*__low++]; ++ *__vec++ = _M_table[(unsigned char)*__low++]; + return __high; + } + diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix index af98e9a311d5..9fe3a7d9dba3 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation rec { let gcc-clang-wrapper = substituteAll { inherit (stdenv) shell; + isExecutable = true; src = ./gcc-clang-wrapper.sh; }; in diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix index 6cd7522bae87..640709aba1b8 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix @@ -96,11 +96,20 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123 - url = "http://tarballs.nixos.org/sha256/${sha256}"; - name = "D5123.diff"; - sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; - })]; + patches = [ + (fetchpatch rec { # https://phabricator.haskell.org/D5123 + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D5123.diff"; + sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; + }) + (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; + name = "loadpluginsinmodules.diff"; + sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; postPatch = "patchShebangs ."; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix new file mode 100644 index 000000000000..1cbfa7e65936 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix @@ -0,0 +1,245 @@ +{ stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + ++ [libffi] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation (rec { + version = "8.6.4.20190406"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/8.6.5-rc1/ghc-${version}-src.tar.xz"; + sha256 = "1zschidlaj80fl9flnlfhvlvy75cks3hz31cfxyyz935m3xyayxv"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + (fetchpatch rec { # https://phabricator.haskell.org/D5123 + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D5123.diff"; + sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; + }) + (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; + name = "loadpluginsinmodules.diff"; + sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.6.4.20190406"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix index bf4fd6d68a7e..3b89db144979 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix @@ -107,7 +107,7 @@ base binary bytestring containers ghc-prim ghci-ghcjs template-haskell-ghcjs ]; - homepage = "http://github.com/ghcjs"; + homepage = "https://github.com/ghcjs"; license = stdenv.lib.licenses.mit; }) {}; diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix index 4e5d656cb064..a89ab15c55fd 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix @@ -107,7 +107,7 @@ base binary bytestring containers ghc-prim ghci-ghcjs template-haskell-ghcjs ]; - homepage = "http://github.com/ghcjs"; + homepage = "https://github.com/ghcjs"; license = stdenv.lib.licenses.mit; }) {}; diff --git a/nixpkgs/pkgs/development/compilers/go/1.11.nix b/nixpkgs/pkgs/development/compilers/go/1.11.nix index 355b2559e98d..1e3a63983f4a 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.11.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.11.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation , mailcap, runtimeShell , buildPackages, pkgsTargetTarget @@ -30,13 +30,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.11.5"; + version = "1.11.6"; - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "0d45057rc0bngq0nja847cagxji42qmlywr68f0dkg51im8nyr9y"; + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0cz1sdhxf9283p1p4jxb020pym0ncd0qlfh36r3hkv6bbm1a2vd9"; }; # perl is used for testing go vet @@ -126,7 +124,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.11.patch - ./ssl-cert-file-1.9.patch + ./ssl-cert-file-1.12.1.patch ./remove-test-pie.patch ./creds-test.patch ./go-1.9-skip-flaky-19608.patch diff --git a/nixpkgs/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix index bcd2eacc7ecf..44304006f6b4 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.12.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.12.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.12"; + version = "1.12.1"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1wl8kq21fbzmv4plnaza5acz8dhbaaq6smjzk3r6cf3l6qrkvi09"; + sha256 = "12l12mmgqvy3nbscy7sz83qj4m6iz5a322aq9sk45f7l9ml2gq8b"; }; # perl is used for testing go vet @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.11.patch + ./ssl-cert-file-1.12.1.patch ./remove-test-pie.patch ./creds-test.patch ./go-1.9-skip-flaky-19608.patch diff --git a/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch new file mode 100644 index 000000000000..aa3116d76c12 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch @@ -0,0 +1,59 @@ +diff -Naur a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +--- a/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:34:53.323180897 -0700 +@@ -270,11 +270,20 @@ + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + + 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 ++ } ++ } + + var data C.CFDataRef = 0 + var untrustedData C.CFDataRef = 0 +diff -Naur a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +--- a/src/crypto/x509/root_darwin.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_darwin.go 2019-03-15 11:36:21.205123541 -0700 +@@ -92,6 +92,14 @@ + verifyCh = make(chan rootCandidate) + ) + ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + // Using 4 goroutines to pipe into verify-cert seems to be + // about the best we can do. The verify-cert binary seems to + // just RPC to another server with coarse locking anyway, so +diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +--- a/src/crypto/x509/root_unix.go 2019-03-15 11:33:55.920232337 -0700 ++++ b/src/crypto/x509/root_unix.go 2019-03-15 11:37:15.737326340 -0700 +@@ -38,6 +38,13 @@ + + 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/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix index b088e07c49e2..06f321bc39c4 100644 --- a/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/javacard-devkit/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] For more details, please refer to the documentation by Oracle ''; - homepage = http://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html; + homepage = https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.ekleog ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 82c4188344f3..cb5cf2c18a55 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.21"; + version = "1.3.30"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0mpb9l46jj4i4cgkrclblgd953ggq6gxivzn5qprmyp0cznzpiyv"; + sha256 = "1v5x64srafg7j3d31qhwhxv4hm2vg8vlbfncri3s5h3y6lcj4p1x"; }; propagatedBuildInputs = [ jre ] ; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { It is developed by a team at JetBrains although it is an OSS language and has external contributors. ''; - homepage = http://kotlinlang.org/; + homepage = https://kotlinlang.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ nequissimus ]; diff --git a/nixpkgs/pkgs/development/compilers/ldc/default.nix b/nixpkgs/pkgs/development/compilers/ldc/default.nix index a290d2b6cfe6..71473be580ea 100644 --- a/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ldc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, cmake, llvm, curl, tzdata +{ stdenv, fetchurl, cmake, ninja, llvm, llvm_8, curl, tzdata , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false -, version ? "1.14.0" -, ldcSha256 ? "147vlzzzjx2n6zyz9wj54gj046i1mw5p5wixwzi5wkllgxghyy9c" +, version ? "1.15.0" +, ldcSha256 ? "1qnfy2q8zkywvby7wa8jm20mlpghn28x6w357cpc8hi56g7y1q6p" }: let @@ -37,6 +37,12 @@ stdenv.mkDerivation rec { patchShebangs . '' + + stdenv.lib.optionalString (!bootstrapVersion) '' + rm ldc-${version}-src/tests/d2/dmd-testsuite/fail_compilation/mixin_gc.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/xtest46_gc.d + rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/testptrref_gc.d + '' + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' # https://github.com/NixOS/nixpkgs/issues/34817 rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall @@ -68,19 +74,29 @@ stdenv.mkDerivation rec { substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan ''; - nativeBuildInputs = [ cmake makeWrapper llvm unzip ] + nativeBuildInputs = [ cmake ninja makeWrapper unzip ] ++ stdenv.lib.optional (!bootstrapVersion) [ bootstrapLdc python lit ] + ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) [ + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm + ] + + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ + llvm_8 + ] + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb ] ++ stdenv.lib.optional (bootstrapVersion) [ - libconfig + libconfig llvm ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -123,6 +139,7 @@ stdenv.mkDerivation rec { } fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + export DYLD_LIBRARY_PATH=$(pwd)/lib '' else ""; @@ -137,7 +154,7 @@ stdenv.mkDerivation rec { checkPhase = stdenv.lib.optionalString doCheck '' # Build default lib test runners - make -j$NIX_BUILD_CORES all-test-runners + ninja -j$NIX_BUILD_CORES all-test-runners ${fixNames} diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix index 9e181a1202ba..41dc20ec4fe3 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation (rec { passthru.src = src; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix index 16a716d32fa6..1d96513a0ece 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/llvm.nix @@ -14,9 +14,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -# Mesa requires AMDGPU target -# BPF is used by bcc -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ] }: let diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch new file mode 100644 index 000000000000..eb57d3458228 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/clang-xpc.patch @@ -0,0 +1,41 @@ +From 61c9b97d7b81cc2c013b423bf1763a92b14fcae3 Mon Sep 17 00:00:00 2001 +From: Jan Korous <jkorous@apple.com> +Date: Tue, 26 Mar 2019 03:48:25 +0000 +Subject: [PATCH] [clangd][xpc][cmake] Respect explicit value of + CLANGD_BUILD_XPC + +We shouldn't prevent user from disabling XPC framework build on Darwin. +However, by keeping it on by default our CI systems also test +it by default on macOS. + +Based on user request: +http://lists.llvm.org/pipermail/cfe-dev/2019-March/061778.html + +Differential Revision: https://reviews.llvm.org/D59808 + +git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@356974 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + CMakeLists.txt | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 66ebeaeeaa..514b17fb3c 100644 +--- a/tools/extra/CMakeLists.txt ++++ b/tools/extra/CMakeLists.txt +@@ -1,6 +1,13 @@ +-option(CLANGD_BUILD_XPC "Build XPC Support For Clangd." OFF) +-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- set(CLANGD_BUILD_XPC ON CACHE BOOL "" FORCE) ++if (NOT DEFINED CLANGD_BUILD_XPC) ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++ set(CLANGD_BUILD_XPC_DEFAULT ON) ++ else () ++ set(CLANGD_BUILD_XPC_DEFAULT OFF) ++ endif () ++ ++ set(CLANGD_BUILD_XPC ${CLANGD_BUILD_XPC_DEFAULT} CACHE BOOL "Build XPC Support For Clangd." FORCE) ++ ++ unset(CLANGD_BUILD_XPC_DEFAULT) + endif () + + add_subdirectory(clang-apply-replacements) \ No newline at end of file diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index 44ec6c376cdb..8709e47dd3aa 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python +{ stdenv, fetch, fetchpatch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -24,6 +24,7 @@ let cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DCLANGD_BUILD_XPC=OFF" ] ++ stdenv.lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" @@ -35,7 +36,16 @@ let "-DLINK_POLLY_INTO_TOOLS=ON" ]; - patches = [ ./purity.patch ]; + patches = [ + ./purity.patch + ./clang-xpc.patch + # Backport for -static-pie, which the latter touches, and which is nice in + # its own right. + ./static-pie.patch + # Backport for the `--unwindlib=[libgcc|complier-rt]` flag, which is + # needed for our bootstrapping to not interfere with C. + ./unwindlib.patch + ]; postPatch = '' sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/static-pie.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/static-pie.patch new file mode 100644 index 000000000000..d1f86a162327 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/static-pie.patch @@ -0,0 +1,157 @@ +commit 7a9842bc92921e79b84630045276861be90b2d47 +Author: Siva Chandra <sivachandra@google.com> +Date: Wed Feb 20 19:07:04 2019 +0000 + + [Clang Driver] Add support for "-static-pie" argument to the Clang driver. + + Summary: This change mimics GCC's support for the "-static-pie" argument. + + Subscribers: cfe-commits + + Tags: #clang + + Differential Revision: https://reviews.llvm.org/D58307 + + git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@354502 91177308-0d34-0410-b5e6-96231b3b80d8 + (cherry picked from commit 7d6cd7825e6883f8650e32b07f3750824c2cef62) + +diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td +index d02d9744d7..75a21e66c7 100644 +--- a/include/clang/Driver/Options.td ++++ b/include/clang/Driver/Options.td +@@ -2502,6 +2502,7 @@ def pthread : Flag<["-"], "pthread">, Flags<[CC1Option]>, + def no_pthread : Flag<["-"], "no-pthread">, Flags<[CC1Option]>; + def p : Flag<["-"], "p">; + def pie : Flag<["-"], "pie">; ++def static_pie : Flag<["-"], "static-pie">; + def read__only__relocs : Separate<["-"], "read_only_relocs">; + def remap : Flag<["-"], "remap">; + def rewrite_objc : Flag<["-"], "rewrite-objc">, Flags<[DriverOption,CC1Option]>, +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index d7e316befa..85ffc1618d 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -1138,19 +1138,22 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D, + bool isCygMing = Triple.isOSCygMing(); + bool IsIAMCU = Triple.isOSIAMCU(); + bool StaticLibgcc = Args.hasArg(options::OPT_static_libgcc) || +- Args.hasArg(options::OPT_static); ++ Args.hasArg(options::OPT_static) || ++ Args.hasArg(options::OPT_static_pie); + + bool SharedLibgcc = Args.hasArg(options::OPT_shared_libgcc); + bool UnspecifiedLibgcc = !StaticLibgcc && !SharedLibgcc; + + // Gcc adds libgcc arguments in various ways: + // +- // gcc <none>: -lgcc --as-needed -lgcc_s --no-as-needed +- // g++ <none>: -lgcc_s -lgcc +- // gcc shared: -lgcc_s -lgcc +- // g++ shared: -lgcc_s -lgcc +- // gcc static: -lgcc -lgcc_eh +- // g++ static: -lgcc -lgcc_eh ++ // gcc <none>: -lgcc --as-needed -lgcc_s --no-as-needed ++ // g++ <none>: -lgcc_s -lgcc ++ // gcc shared: -lgcc_s -lgcc ++ // g++ shared: -lgcc_s -lgcc ++ // gcc static: -lgcc -lgcc_eh ++ // g++ static: -lgcc -lgcc_eh ++ // gcc static-pie: -lgcc -lgcc_eh ++ // g++ static-pie: -lgcc -lgcc_eh + // + // Also, certain targets need additional adjustments. + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index 69dba8fec8..0faa0bb473 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -334,6 +334,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + const bool isAndroid = ToolChain.getTriple().isAndroid(); + const bool IsIAMCU = ToolChain.getTriple().isOSIAMCU(); + const bool IsPIE = getPIE(Args, ToolChain); ++ const bool IsStaticPIE = Args.hasArg(options::OPT_static_pie); + const bool HasCRTBeginEndFiles = + ToolChain.getTriple().hasEnvironment() || + (ToolChain.getTriple().getVendor() != llvm::Triple::MipsTechnologies); +@@ -354,6 +355,12 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (IsPIE) + CmdArgs.push_back("-pie"); + ++ if (IsStaticPIE) { ++ CmdArgs.push_back("-static"); ++ CmdArgs.push_back("-pie"); ++ CmdArgs.push_back("--no-dynamic-linker"); ++ } ++ + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); + +@@ -415,6 +422,8 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + crt1 = "gcrt1.o"; + else if (IsPIE) + crt1 = "Scrt1.o"; ++ else if (IsStaticPIE) ++ crt1 = "rcrt1.o"; + else + crt1 = "crt1.o"; + } +@@ -432,7 +441,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + crtbegin = isAndroid ? "crtbegin_static.o" : "crtbeginT.o"; + else if (Args.hasArg(options::OPT_shared)) + crtbegin = isAndroid ? "crtbegin_so.o" : "crtbeginS.o"; +- else if (IsPIE) ++ else if (IsPIE || IsStaticPIE) + crtbegin = isAndroid ? "crtbegin_dynamic.o" : "crtbeginS.o"; + else + crtbegin = isAndroid ? "crtbegin_dynamic.o" : "crtbegin.o"; +@@ -483,7 +492,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + + if (!Args.hasArg(options::OPT_nostdlib)) { + if (!Args.hasArg(options::OPT_nodefaultlibs)) { +- if (Args.hasArg(options::OPT_static)) ++ if (Args.hasArg(options::OPT_static) || IsStaticPIE) + CmdArgs.push_back("--start-group"); + + if (NeedsSanitizerDeps) +@@ -518,7 +527,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (IsIAMCU) + CmdArgs.push_back("-lgloss"); + +- if (Args.hasArg(options::OPT_static)) ++ if (Args.hasArg(options::OPT_static) || IsStaticPIE) + CmdArgs.push_back("--end-group"); + else + AddRunTimeLibs(ToolChain, D, CmdArgs, Args); +@@ -535,7 +544,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + const char *crtend; + if (Args.hasArg(options::OPT_shared)) + crtend = isAndroid ? "crtend_so.o" : "crtendS.o"; +- else if (IsPIE) ++ else if (IsPIE || IsStaticPIE) + crtend = isAndroid ? "crtend_android.o" : "crtendS.o"; + else + crtend = isAndroid ? "crtend_android.o" : "crtend.o"; +diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c +index 3ab81be490..800f782523 100644 +--- a/test/Driver/linux-ld.c ++++ b/test/Driver/linux-ld.c +@@ -176,6 +176,19 @@ + // CHECK-CLANG-NO-LIBGCC-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" + // CHECK-CLANG-NO-LIBGCC-STATIC: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "--end-group" + // ++// RUN: %clang -static-pie -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=platform \ ++// RUN: --gcc-toolchain="" \ ++// RUN: --sysroot=%S/Inputs/basic_linux_tree \ ++// RUN: | FileCheck --check-prefix=CHECK-CLANG-LD-STATIC-PIE %s ++// CHECK-CLANG-LD-STATIC-PIE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" ++// CHECK-CLANG-LD-STATIC-PIE: "-static" ++// CHECK-CLANG-LD-STATIC-PIE: "-pie" ++// CHECK-CLANG-LD-STATIC-PIE: "--no-dynamic-linker" ++// CHECK-CLANG-LD-STATIC-PIE: "-m" "elf_x86_64" ++// CHECK-CLANG-LD-STATIC-PIE: "{{.*}}rcrt1.o" ++// CHECK-CLANG-LD-STATIC-PIE: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "--end-group" ++// + // RUN: %clang -dynamic -no-canonical-prefixes %s -### -o %t.o 2>&1 \ + // RUN: --target=x86_64-unknown-linux -rtlib=platform \ + // RUN: --gcc-toolchain="" \ diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/unwindlib.patch b/nixpkgs/pkgs/development/compilers/llvm/8/clang/unwindlib.patch new file mode 100644 index 000000000000..6958fce60cef --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/unwindlib.patch @@ -0,0 +1,372 @@ +commit cd5603a4767277a29d3e67a9c3f2a5d2129cd973 +Author: Sterling Augustine <saugustine@google.com> +Date: Tue Mar 19 20:01:59 2019 +0000 + + Add --unwindlib=[libgcc|compiler-rt] to parallel --rtlib= [take 2] + + "clang++ hello.cc --rtlib=compiler-rt" + + now can works without specifying additional unwind or exception + handling libraries. + + This reworked version of the feature no longer modifies today's default + unwind library for compiler-rt: which is nothing. Rather, a user + can specify -DCLANG_DEFAULT_UNWINDLIB=libunwind when configuring + the compiler. + + This should address the issues from the previous version. + + Update tests for new --unwindlib semantics. + + Differential Revision: https://reviews.llvm.org/D59109 + + git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@356508 91177308-0d34-0410-b5e6-96231b3b80d8 + (cherry picked from commit 344aa82a52f2fae527f58284567ae305a314f7a8) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2016a45ca..edeb2b66a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,6 +261,24 @@ if (NOT(CLANG_DEFAULT_RTLIB STREQUAL "" OR + "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE) + endif() + ++set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING ++ "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty to match runtime library.)") ++if (CLANG_DEFAULT_UNWINDLIB STREQUAL "") ++ if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc") ++ set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE) ++ elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind") ++ set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE) ++ endif() ++endif() ++ ++if (NOT(CLANG_DEFAULT_UNWINDLIB STREQUAL "none" OR ++ CLANG_DEFAULT_UNWINDLIB STREQUAL "libgcc" OR ++ CLANG_DEFAULT_UNWINDLIB STREQUAL "libunwind")) ++ message(WARNING "Resetting default unwindlib to use platform default") ++ set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING ++ "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty for none)" FORCE) ++endif() ++ + set(CLANG_DEFAULT_OBJCOPY "objcopy" CACHE STRING + "Default objcopy executable to use.") + +diff --git a/include/clang/Basic/DiagnosticDriverKinds.td b/include/clang/Basic/DiagnosticDriverKinds.td +index 5475e28ed7..15971210e4 100644 +--- a/include/clang/Basic/DiagnosticDriverKinds.td ++++ b/include/clang/Basic/DiagnosticDriverKinds.td +@@ -52,6 +52,10 @@ def err_drv_invalid_rtlib_name : Error< + "invalid runtime library name in argument '%0'">; + def err_drv_unsupported_rtlib_for_platform : Error< + "unsupported runtime library '%0' for platform '%1'">; ++def err_drv_invalid_unwindlib_name : Error< ++ "invalid unwind library name in argument '%0'">; ++def err_drv_incompatible_unwindlib : Error< ++ "--rtlib=libgcc requires --unwindlib=libgcc">; + def err_drv_invalid_stdlib_name : Error< + "invalid library name in argument '%0'">; + def err_drv_invalid_output_with_multiple_archs : Error< +diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake +index 1d624450b9..2d4cb747e8 100644 +--- a/include/clang/Config/config.h.cmake ++++ b/include/clang/Config/config.h.cmake +@@ -23,6 +23,9 @@ + /* Default runtime library to use. */ + #define CLANG_DEFAULT_RTLIB "${CLANG_DEFAULT_RTLIB}" + ++/* Default unwind library to use. */ ++#define CLANG_DEFAULT_UNWINDLIB "${CLANG_DEFAULT_UNWINDLIB}" ++ + /* Default objcopy to use */ + #define CLANG_DEFAULT_OBJCOPY "${CLANG_DEFAULT_OBJCOPY}" + +diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td +index 75a21e66c7..4da0e54965 100644 +--- a/include/clang/Driver/Options.td ++++ b/include/clang/Driver/Options.td +@@ -2570,6 +2570,8 @@ def std_EQ : Joined<["-", "--"], "std=">, Flags<[CC1Option]>, + }]>; + def stdlib_EQ : Joined<["-", "--"], "stdlib=">, Flags<[CC1Option]>, + HelpText<"C++ standard library to use">, Values<"libc++,libstdc++,platform">; ++def unwindlib_EQ : Joined<["-", "--"], "unwindlib=">, Flags<[CC1Option]>, ++ HelpText<"Unwind library to use">, Values<"libgcc,unwindlib,platform">; + def sub__library : JoinedOrSeparate<["-"], "sub_library">; + def sub__umbrella : JoinedOrSeparate<["-"], "sub_umbrella">; + def system_header_prefix : Joined<["--"], "system-header-prefix=">, +diff --git a/include/clang/Driver/ToolChain.h b/include/clang/Driver/ToolChain.h +index d5f75b8271..4bedf760eb 100644 +--- a/include/clang/Driver/ToolChain.h ++++ b/include/clang/Driver/ToolChain.h +@@ -100,6 +100,12 @@ public: + RLT_Libgcc + }; + ++ enum UnwindLibType { ++ UNW_None, ++ UNW_CompilerRT, ++ UNW_Libgcc ++ }; ++ + enum RTTIMode { + RM_Enabled, + RM_Disabled, +@@ -368,6 +374,10 @@ public: + return ToolChain::CST_Libstdcxx; + } + ++ virtual UnwindLibType GetDefaultUnwindLibType() const { ++ return ToolChain::UNW_None; ++ } ++ + virtual std::string getCompilerRTPath() const; + + virtual std::string getCompilerRT(const llvm::opt::ArgList &Args, +@@ -512,6 +522,10 @@ public: + // given compilation arguments. + virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const; + ++ // GetUnwindLibType - Determine the unwind library type to use with the ++ // given compilation arguments. ++ virtual UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const; ++ + /// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set + /// the include paths to use for the given C++ standard library type. + virtual void +diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp +index 88a627eab6..d82423f4a8 100644 +--- a/lib/Driver/ToolChain.cpp ++++ b/lib/Driver/ToolChain.cpp +@@ -680,6 +680,33 @@ ToolChain::RuntimeLibType ToolChain::GetRuntimeLibType( + return GetDefaultRuntimeLibType(); + } + ++ToolChain::UnwindLibType ToolChain::GetUnwindLibType( ++ const ArgList &Args) const { ++ const Arg *A = Args.getLastArg(options::OPT_unwindlib_EQ); ++ StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_UNWINDLIB; ++ ++ if (LibName == "none") ++ return ToolChain::UNW_None; ++ else if (LibName == "platform" || LibName == "") { ++ ToolChain::RuntimeLibType RtLibType = GetRuntimeLibType(Args); ++ if (RtLibType == ToolChain::RLT_CompilerRT) ++ return ToolChain::UNW_None; ++ else if (RtLibType == ToolChain::RLT_Libgcc) ++ return ToolChain::UNW_Libgcc; ++ } else if (LibName == "libunwind") { ++ if (GetRuntimeLibType(Args) == RLT_Libgcc) ++ getDriver().Diag(diag::err_drv_incompatible_unwindlib); ++ return ToolChain::UNW_CompilerRT; ++ } else if (LibName == "libgcc") ++ return ToolChain::UNW_Libgcc; ++ ++ if (A) ++ getDriver().Diag(diag::err_drv_invalid_unwindlib_name) ++ << A->getAsString(Args); ++ ++ return GetDefaultUnwindLibType(); ++} ++ + ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{ + const Arg *A = Args.getLastArg(options::OPT_stdlib_EQ); + StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_CXX_STDLIB; +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index 85ffc1618d..9fd29726a4 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -1132,47 +1132,80 @@ bool tools::isObjCAutoRefCount(const ArgList &Args) { + return Args.hasFlag(options::OPT_fobjc_arc, options::OPT_fno_objc_arc, false); + } + +-static void AddLibgcc(const llvm::Triple &Triple, const Driver &D, +- ArgStringList &CmdArgs, const ArgList &Args) { +- bool isAndroid = Triple.isAndroid(); +- bool isCygMing = Triple.isOSCygMing(); +- bool IsIAMCU = Triple.isOSIAMCU(); +- bool StaticLibgcc = Args.hasArg(options::OPT_static_libgcc) || +- Args.hasArg(options::OPT_static) || +- Args.hasArg(options::OPT_static_pie); +- +- bool SharedLibgcc = Args.hasArg(options::OPT_shared_libgcc); +- bool UnspecifiedLibgcc = !StaticLibgcc && !SharedLibgcc; +- +- // Gcc adds libgcc arguments in various ways: +- // +- // gcc <none>: -lgcc --as-needed -lgcc_s --no-as-needed +- // g++ <none>: -lgcc_s -lgcc +- // gcc shared: -lgcc_s -lgcc +- // g++ shared: -lgcc_s -lgcc +- // gcc static: -lgcc -lgcc_eh +- // g++ static: -lgcc -lgcc_eh +- // gcc static-pie: -lgcc -lgcc_eh +- // g++ static-pie: -lgcc -lgcc_eh +- // +- // Also, certain targets need additional adjustments. ++enum class LibGccType { UnspecifiedLibGcc, StaticLibGcc, SharedLibGcc }; ++ ++static LibGccType getLibGccType(const ArgList &Args) { ++ bool Static = Args.hasArg(options::OPT_static_libgcc) || ++ Args.hasArg(options::OPT_static) || ++ Args.hasArg(options::OPT_static_pie); ++ ++ bool Shared = Args.hasArg(options::OPT_shared_libgcc); ++ if (Shared) ++ return LibGccType::SharedLibGcc; ++ if (Static) ++ return LibGccType::StaticLibGcc; ++ return LibGccType::UnspecifiedLibGcc; ++} + +- bool LibGccFirst = (D.CCCIsCC() && UnspecifiedLibgcc) || StaticLibgcc; +- if (LibGccFirst) +- CmdArgs.push_back("-lgcc"); ++// Gcc adds libgcc arguments in various ways: ++// ++// gcc <none>: -lgcc --as-needed -lgcc_s --no-as-needed ++// g++ <none>: -lgcc_s -lgcc ++// gcc shared: -lgcc_s -lgcc ++// g++ shared: -lgcc_s -lgcc ++// gcc static: -lgcc -lgcc_eh ++// g++ static: -lgcc -lgcc_eh ++// gcc static-pie: -lgcc -lgcc_eh ++// g++ static-pie: -lgcc -lgcc_eh ++// ++// Also, certain targets need additional adjustments. ++ ++static void AddUnwindLibrary(const ToolChain &TC, const Driver &D, ++ ArgStringList &CmdArgs, const ArgList &Args) { ++ ToolChain::UnwindLibType UNW = TC.GetUnwindLibType(Args); ++ // Targets that don't use unwind libraries. ++ if (TC.getTriple().isAndroid() || TC.getTriple().isOSIAMCU() || ++ TC.getTriple().isOSBinFormatWasm() || ++ UNW == ToolChain::UNW_None) ++ return; + +- bool AsNeeded = D.CCCIsCC() && UnspecifiedLibgcc && !isAndroid && !isCygMing; ++ LibGccType LGT = getLibGccType(Args); ++ bool AsNeeded = D.CCCIsCC() && LGT == LibGccType::UnspecifiedLibGcc && ++ !TC.getTriple().isAndroid() && !TC.getTriple().isOSCygMing(); + if (AsNeeded) + CmdArgs.push_back("--as-needed"); + +- if ((UnspecifiedLibgcc || SharedLibgcc) && !isAndroid) +- CmdArgs.push_back("-lgcc_s"); +- +- else if (StaticLibgcc && !isAndroid && !IsIAMCU) +- CmdArgs.push_back("-lgcc_eh"); ++ switch (UNW) { ++ case ToolChain::UNW_None: ++ return; ++ case ToolChain::UNW_Libgcc: { ++ LibGccType LGT = getLibGccType(Args); ++ if (LGT == LibGccType::UnspecifiedLibGcc || LGT == LibGccType::SharedLibGcc) ++ CmdArgs.push_back("-lgcc_s"); ++ else if (LGT == LibGccType::StaticLibGcc) ++ CmdArgs.push_back("-lgcc_eh"); ++ break; ++ } ++ case ToolChain::UNW_CompilerRT: ++ CmdArgs.push_back("-lunwind"); ++ break; ++ } + + if (AsNeeded) + CmdArgs.push_back("--no-as-needed"); ++} ++ ++static void AddLibgcc(const ToolChain &TC, const Driver &D, ++ ArgStringList &CmdArgs, const ArgList &Args) { ++ bool isAndroid = TC.getTriple().isAndroid(); ++ ++ LibGccType LGT = getLibGccType(Args); ++ bool LibGccFirst = (D.CCCIsCC() && LGT == LibGccType::UnspecifiedLibGcc) || ++ LGT == LibGccType::StaticLibGcc; ++ if (LibGccFirst) ++ CmdArgs.push_back("-lgcc"); ++ ++ AddUnwindLibrary(TC, D, CmdArgs, Args); + + if (!LibGccFirst) + CmdArgs.push_back("-lgcc"); +@@ -1182,7 +1215,7 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D, + // + // NOTE: This fixes a link error on Android MIPS as well. The non-static + // libgcc for MIPS relies on _Unwind_Find_FDE and dl_iterate_phdr from libdl. +- if (isAndroid && !StaticLibgcc) ++ if (isAndroid && getLibGccType(Args) != LibGccType::StaticLibGcc) + CmdArgs.push_back("-ldl"); + } + +@@ -1194,6 +1227,7 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D, + switch (RLT) { + case ToolChain::RLT_CompilerRT: + CmdArgs.push_back(TC.getCompilerRTArgString(Args, "builtins")); ++ AddUnwindLibrary(TC, D, CmdArgs, Args); + break; + case ToolChain::RLT_Libgcc: + // Make sure libgcc is not used under MSVC environment by default +@@ -1205,7 +1239,7 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D, + << Args.getLastArg(options::OPT_rtlib_EQ)->getValue() << "MSVC"; + } + } else +- AddLibgcc(TC.getTriple(), D, CmdArgs, Args); ++ AddLibgcc(TC, D, CmdArgs, Args); + break; + } + } +diff --git a/test/Driver/compiler-rt-unwind.c b/test/Driver/compiler-rt-unwind.c +new file mode 100644 +index 0000000000..00024dfa7e +--- /dev/null ++++ b/test/Driver/compiler-rt-unwind.c +@@ -0,0 +1,49 @@ ++// General tests that the driver handles combinations of --rtlib=XXX and ++// --unwindlib=XXX properly. ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-EMPTY %s ++// RTLIB-EMPTY: "{{.*}}lgcc" ++// RTLIB-EMPTY: "{{.*}}-lgcc_s" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=libgcc \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-GCC %s ++// RTLIB-GCC: "{{.*}}lgcc" ++// RTLIB-GCC: "{{.*}}lgcc_s" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER-RT %s ++// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lgcc" ++// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lunwind" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s ++// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s ++// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins-x86_64.a" ++// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}lgcc_s" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \ ++// RUN: -static --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s ++// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins-x86_64.a" ++// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}lgcc_eh" ++// ++// RUN: not %clang -no-canonical-prefixes %s -o %t.o 2> %t.err \ ++// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \ ++// RUN: --gcc-toolchain="" \ ++// RUN: FileCheck --input-file=%t.err --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER_RT %s ++// RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc" diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index 4965b57b0d73..47c8b7bd59f5 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { # Hack around weird upsream RPATH bug postInstall = stdenv.lib.optionalString stdenv.isDarwin '' ln -s "$out/lib"/*/* "$out/lib" - '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o - ln -s $out/lib/*/cclang_rt.crtend-*.o $out/lib/crtend.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index c5f2163450fe..3503e6b83d2e 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -23,7 +23,7 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc) '' + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags ''; in { @@ -78,48 +78,80 @@ let lldb = callPackage ./lldb.nix {}; + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + bintools = callPackage ./bintools.nix {}; lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + targetLlvmLibraries.libcxx + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = '' + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; }; extraPackages = [ - # targetLlvmLibraries.libcxx - # targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; lldClangNoLibc = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; libc = null; }; extraPackages = [ - # targetLlvmLibraries.libcxx - # targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; lldClangNoCompilerRt = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; libc = null; }; extraPackages = [ ]; extraBuildCommands = '' - echo "-nostartfiles -target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-nostartfiles" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; @@ -129,21 +161,33 @@ let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); in { - compiler-rt = callPackage ./compiler-rt.nix { - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt - else stdenv; - }; + compiler-rt = callPackage ./compiler-rt.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; + })); stdenv = overrideCC stdenv buildLlvmTools.clang; libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ {}; + libcxx = callPackage ./libc++ ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); - libcxxabi = callPackage ./libc++abi.nix {}; + libcxxabi = callPackage ./libc++abi.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + libunwind = libraries.libunwind; + })); openmp = callPackage ./openmp.nix {}; + + libunwind = callPackage ./libunwind.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); + }); in { inherit tools libraries; } // libraries // tools diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index 84db33209ebd..d0a5c37c4148 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix index 976c289e5bc5..0eb5ebca5159 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -8,10 +8,15 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; + cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ]; + postUnpack = '' unpackFile ${libcxx.src} unpackFile ${llvm.src} - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix new file mode 100644 index 000000000000..a187d0adc994 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libunwind.nix @@ -0,0 +1,22 @@ +{ stdenv, version, fetch, cmake, libcxx, fetchpatch }: + +stdenv.mkDerivation { + name = "libunwind-${version}"; + + src = fetch "libunwind" "0q7ndlldid9wchnny0a936llwxj7zgb9gxp46wjjxvwwkik3l97z"; + + nativeBuildInputs = [ cmake ]; + + patches = [ + (fetchpatch { + url = "https://github.com/llvm-mirror/libunwind/commit/34a45c630d4c79af403661d267db42fbe7de1178.patch"; + sha256 = "0n0pv6jvcky8pn3srhrf9x5kbnd0d2kia9xlx2g590f5q0bgwfhv"; + }) + (fetchpatch { + url = "https://github.com/llvm-mirror/libunwind/commit/e050272d2eb57eb4e56a37b429a61df2ebb8aa3e.patch"; + sha256 = "1sxyx5xnax8k713jjcxgq3jq3cpnxygs2rcdf5vfja0f2k9jzldl"; + }) + ]; + + enableParallelBuilding = true; +} diff --git a/nixpkgs/pkgs/development/compilers/mono/generic.nix b/nixpkgs/pkgs/development/compilers/mono/generic.nix index 400b040ae85b..13fc3cf3c3dc 100644 --- a/nixpkgs/pkgs/development/compilers/mono/generic.nix +++ b/nixpkgs/pkgs/development/compilers/mono/generic.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { inherit enableParallelBuilding; meta = with stdenv.lib; { - homepage = http://mono-project.com/; + homepage = https://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; diff --git a/nixpkgs/pkgs/development/compilers/mosml/default.nix b/nixpkgs/pkgs/development/compilers/mosml/default.nix index 5ea3f63ccd18..89726f20c6b8 100644 --- a/nixpkgs/pkgs/development/compilers/mosml/default.nix +++ b/nixpkgs/pkgs/development/compilers/mosml/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Moscow ML is a light-weight implementation of Standard ML (SML), a strict functional language used in teaching and research. ''; - homepage = http://mosml.org/; + homepage = https://mosml.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ vaibhavsagar ]; diff --git a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index ef07b01a750b..e2aa5375835e 100644 --- a/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, boost, python3 +, boost, python3, eigen , icestorm, trellis # TODO(thoughtpolice) Currently the GUI build seems broken at runtime on my @@ -27,18 +27,18 @@ let in stdenv.mkDerivation rec { name = "nextpnr-${version}"; - version = "2019.02.20"; + version = "2019.04.02"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "e8d3aaaf34895a073e4023192d97fc936d090990"; - sha256 = "0ijqpjnn7x16crd6cmd4nmgay320flizmjb7bbvg9hv464z3p4x7"; + rev = "6adf37e3c1d4301e087d89c9e9c37563fe8d78df"; + sha256 = "0qqb2yd2s39hahh5qigvllgyzj7rp3r1k9jp2n9z2jrfpiaz68c6"; }; nativeBuildInputs = [ cmake makeWrapper ]; buildInputs - = [ boostPython python3 ] + = [ boostPython python3 eigen ] ++ (stdenv.lib.optional enableGui qtbase); enableParallelBuilding = true; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { [ "-DARCH=generic;ice40;ecp5" "-DICEBOX_ROOT=${icestorm}/share/icebox" "-DTRELLIS_ROOT=${trellisRoot}/trellis" + "-DUSE_OPENMP=ON" ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF"); # Fix the version number. This is a bit stupid (and fragile) in practice @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { postInstall = stdenv.lib.optionalString enableGui '' for x in generic ice40 ecp5; do wrapProgram $out/bin/nextpnr-$x \ - --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtbase.qtCompatVersion}/plugins + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" done ''; diff --git a/nixpkgs/pkgs/development/compilers/polyml/5.7.nix b/nixpkgs/pkgs/development/compilers/polyml/5.7.nix new file mode 100644 index 000000000000..b7feed84c37f --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/polyml/5.7.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: + +stdenv.mkDerivation rec { + name = "polyml-${version}"; + version = "5.7.1"; + + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure.ac --replace stdc++ c++ + ''; + + buildInputs = [ libffi gmp ]; + + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + + configureFlags = [ + "--enable-shared" + "--with-system-libffi" + "--with-gmp" + ]; + + src = fetchFromGitHub { + owner = "polyml"; + repo = "polyml"; + rev = "v${version}"; + sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; + }; + + meta = with stdenv.lib; { + description = "Standard ML compiler and interpreter"; + longDescription = '' + Poly/ML is a full implementation of Standard ML. + ''; + homepage = https://www.polyml.org/; + license = licenses.lgpl21; + platforms = with platforms; (linux ++ darwin); + maintainers = with maintainers; [ z77z yurrriq ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/polyml/default.nix b/nixpkgs/pkgs/development/compilers/polyml/default.nix index b7feed84c37f..91a3bb45352f 100644 --- a/nixpkgs/pkgs/development/compilers/polyml/default.nix +++ b/nixpkgs/pkgs/development/compilers/polyml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "polyml-${version}"; - version = "5.7.1"; + version = "5.8"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "polyml"; repo = "polyml"; rev = "v${version}"; - sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; + sha256 = "1s7q77bivppxa4vd7gxjj5dbh66qnirfxnkzh1ql69rfx1c057n3"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index 5e84f2d874a5..0bfb8de0061b 100644 --- a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { name = "purs-simple"; - version = "v0.12.3"; + version = "v0.12.4"; src = if stdenv.isDarwin then fetchurl { - url = "https://github.com/purescript/purescript/releases/download/v0.12.3/macos.tar.gz"; - sha256 = "1f916gv4fz571l4jvr15xjnsvjyy4nljv2ii9njwlm7k6yr5m0qn"; + url = "https://github.com/purescript/purescript/releases/download/v0.12.4/macos.tar.gz"; + sha256 = "046b18plakwvqr77x1hybhfiyzrhnnq0q5ixcmypri1mkkdsmczx"; } else fetchurl { - url = "https://github.com/purescript/purescript/releases/download/v0.12.3/linux64.tar.gz"; - sha256 = "1fad862a2sv4njxbbcfzibbi585m6is3ywb94nmjl8ax254baj3i"; + url = "https://github.com/purescript/purescript/releases/download/v0.12.4/linux64.tar.gz"; + sha256 = "18yny533sjfgacxqx1ki306nhznj4q6nv52c83l82gqj8amyj7k0"; }; diff --git a/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix index ddef4adf0a0d..b44c7815e90c 100644 --- a/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix +++ b/nixpkgs/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.31.1"; + version = "1.32.0"; - # fetch hashes by running `print-hashes.sh 1.31.1` + # fetch hashes by running `print-hashes.sh 1.32.0` hashes = { - i686-unknown-linux-gnu = "1e77e5e8c745320faad9ce6f319a77b4a2e75d972eb68a195acd081ad910ab6d"; - x86_64-unknown-linux-gnu = "a64685535d0c457f49a8712a096a5c21564cd66fd2f7da739487f028192ebe3c"; - armv7-unknown-linux-gnueabihf = "11c717b781a7af5bdc829894139f8f45d4c12a061f7f9e39481f21426a04eb21"; - aarch64-unknown-linux-gnu = "29a7c6eb536fefd0ca459e48dfaea006aa8bff8a87aa82a9b7d483487033632a"; - i686-apple-darwin = "46566dc25fcbd8badc9950b8c9f9b0faeca065b5a09cd96258e4f4b10d686aed"; - x86_64-apple-darwin = "8398b1b303bdf0e7605d08b87070a514a4f588797c6fb3593718cb9cec233ad6"; + i686-unknown-linux-gnu = "4ce3a6a656669fa86606074b43fadeac7465ef48394249407e21106ed714c8db"; + x86_64-unknown-linux-gnu = "e024698320d76b74daf0e6e71be3681a1e7923122e3ebd03673fcac3ecc23810"; + armv7-unknown-linux-gnueabihf = "d7b69f60689d2905d8d3c2829b0f1cd0f86265a255ff88ea0deb601aebac6428"; + aarch64-unknown-linux-gnu = "60def40961728212da4b3a9767d5a2ddb748400e150a5f8a6d5aa0e1b8ba1cee"; + i686-apple-darwin = "76cc1280f6b61bf7cf1fddd5202cc236db7573ee05f39fc8cd12ddda8f39a7c3"; + x86_64-apple-darwin = "f0dfba507192f9b5c330b5984ba71d57d434475f3d62bd44a39201e36fa76304"; }; platform = diff --git a/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/nixpkgs/pkgs/development/compilers/rust/cargo.nix index a7e2a40597bc..9f576042787a 100644 --- a/nixpkgs/pkgs/development/compilers/rust/cargo.nix +++ b/nixpkgs/pkgs/development/compilers/rust/cargo.nix @@ -1,13 +1,11 @@ { stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 , CoreFoundation, Security -, version -, patches ? [] -, src }: +}: rustPlatform.buildRustPackage rec { - name = "cargo-${version}"; - inherit version src patches; + name = "cargo-${rustc.version}"; + inherit (rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again cargoVendorDir = "vendor"; @@ -19,14 +17,14 @@ rustPlatform.buildRustPackage rec { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] + nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; + buildInputs = [ cacert file curl python openssl zlib libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; - LIBGIT2_SYS_USE_PKG_CONFIG=1; + LIBGIT2_SYS_USE_PKG_CONFIG = 1; # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel - RUSTC_BOOTSTRAP=1; + RUSTC_BOOTSTRAP = 1; # FIXME: Use impure version of CoreFoundation because of missing symbols. # CFURLSetResourcePropertyForKey is defined in the headers but there's no diff --git a/nixpkgs/pkgs/development/compilers/rust/default.nix b/nixpkgs/pkgs/development/compilers/rust/default.nix index 9640cd9b577e..47df7e716dc1 100644 --- a/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -1,47 +1,62 @@ -{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +{ stdenv, lib, overrideCC +, buildPackages +, newScope, callPackage , CoreFoundation, Security -, targets ? [] -, targetToolchains ? [] -, targetPatches ? [] -}: - -let - rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.32.0"; - cargoVersion = "1.32.0"; - src = fetchurl { - url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0ji2l9xv53y27xy72qagggvq47gayr5lcv2jwvmfirx029vlqnac"; - }; -in rec { - rustc = callPackage ./rustc.nix { - inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src; - - patches = [ - ./patches/net-tcp-disable-tests.patch - - # Re-evaluate if this we need to disable this one - #./patches/stdsimd-disable-doctest.patch - ]; - - withBundledLLVM = false; - - configureFlags = [ "--release-channel=stable" ]; - - # 1. Upstream is not running tests on aarch64: - # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 - # So we do the same. - # 2. Tests run out of memory for i686 - #doCheck = !stdenv.isAarch64 && !stdenv.isi686; - - # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598. - doCheck = false; +}: rec { + makeRustPlatform = { rustc, cargo, ... }: { + rust = { + inherit rustc cargo; + }; + + buildRustPackage = callPackage ../../../build-support/rust { + inherit rustc cargo; + + fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix { + inherit cargo; + }; + }; + + rustcSrc = callPackage ./rust-src.nix { + inherit rustc; + }; }; - cargo = callPackage ./cargo.nix rec { - version = cargoVersion; - inherit src stdenv CoreFoundation Security; - inherit rustc; # the rustc that will be wrapped by cargo - inherit rustPlatform; # used to build cargo + # This just contains tools for now. But it would conceivably contain + # libraries too, say if we picked some default/recommended versions from + # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for + # all vendored Carnix-generated nix. + # + # In the end game, rustc, the rust standard library (`core`, `std`, etc.), + # and cargo would themselves be built with `buildRustCreate` like + # everything else. Tools and `build.rs` and procedural macro dependencies + # would be taken from `buildRustPackages` (and `bootstrapRustPackages` for + # anything provided prebuilt or their build-time dependencies to break + # cycles / purify builds). In this way, nixpkgs would be in control of all + # bootstrapping. + packages = { + prebuilt = callPackage ./bootstrap.nix {}; + stable = lib.makeScope newScope (self: let + # Like `buildRustPackages`, but may also contain prebuilt binaries to + # break cycle. Just like `bootstrapTools` for nixpkgs as a whole, + # nothing in the final package set should refer to this. + bootstrapRustPackages = self.buildRustPackages.overrideScope' (_: _: + lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) + buildPackages.rust.packages.prebuilt); + bootRustPlatform = makeRustPlatform bootstrapRustPackages; + in { + # Packages suitable for build-time, e.g. `build.rs`-type stuff. + buildRustPackages = buildPackages.rust.packages.stable; + # Analogous to stdenv + rustPlatform = makeRustPlatform self.buildRustPackages; + rustc = self.callPackage ./rustc.nix { + # Use boot package set to break cycle + rustPlatform = bootRustPlatform; + }; + cargo = self.callPackage ./cargo.nix { + # Use boot package set to break cycle + rustPlatform = bootRustPlatform; + inherit CoreFoundation Security; + }; + }); }; } diff --git a/nixpkgs/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/nixpkgs/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch index 10713b6b7aa9..1bb9a98f7b6d 100644 --- a/nixpkgs/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch +++ b/nixpkgs/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch @@ -1,8 +1,8 @@ diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs -index 0f60b5b3e..9b08415e7 100644 +index 86ecb10edf..626be0a52d 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs -@@ -962,6 +962,7 @@ mod tests { +@@ -955,6 +955,7 @@ mod tests { } } @@ -10,7 +10,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn listen_localhost() { let socket_addr = next_test_ip4(); -@@ -1020,6 +1021,7 @@ mod tests { +@@ -1013,6 +1014,7 @@ mod tests { }) } @@ -18,7 +18,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn read_eof() { each_ip(&mut |addr| { -@@ -1039,6 +1041,7 @@ mod tests { +@@ -1032,6 +1034,7 @@ mod tests { }) } @@ -26,7 +26,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn write_close() { each_ip(&mut |addr| { -@@ -1065,6 +1068,7 @@ mod tests { +@@ -1058,6 +1061,7 @@ mod tests { }) } @@ -34,7 +34,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn multiple_connect_serial() { each_ip(&mut |addr| { -@@ -1087,6 +1091,7 @@ mod tests { +@@ -1080,6 +1084,7 @@ mod tests { }) } @@ -42,7 +42,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn multiple_connect_interleaved_greedy_schedule() { const MAX: usize = 10; -@@ -1123,6 +1128,7 @@ mod tests { +@@ -1116,6 +1121,7 @@ mod tests { } #[test] @@ -50,7 +50,7 @@ index 0f60b5b3e..9b08415e7 100644 fn multiple_connect_interleaved_lazy_schedule() { const MAX: usize = 10; each_ip(&mut |addr| { -@@ -1401,6 +1407,7 @@ mod tests { +@@ -1394,6 +1400,7 @@ mod tests { } #[test] @@ -58,7 +58,7 @@ index 0f60b5b3e..9b08415e7 100644 fn clone_while_reading() { each_ip(&mut |addr| { let accept = t!(TcpListener::bind(&addr)); -@@ -1421,7 +1422,10 @@ mod tests { +@@ -1504,7 +1511,10 @@ mod tests { // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code // no longer has rounding errors. @@ -70,7 +70,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn timeouts() { let addr = next_test_ip4(); -@@ -1596,6 +1603,7 @@ mod tests { +@@ -1591,6 +1601,7 @@ mod tests { drop(listener); } @@ -78,7 +78,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn nodelay() { let addr = next_test_ip4(); -@@ -1610,6 +1618,7 @@ mod tests { +@@ -1605,6 +1616,7 @@ mod tests { assert_eq!(false, t!(stream.nodelay())); } @@ -86,7 +86,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn ttl() { let ttl = 100; -@@ -1647,6 +1656,7 @@ mod tests { +@@ -1642,6 +1654,7 @@ mod tests { } } @@ -94,11 +94,3 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn peek() { each_ip(&mut |addr| { -@@ -1679,6 +1689,7 @@ mod tests { - } - - #[test] -+ #[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)] - fn connect_timeout_unroutable() { - // this IP is unroutable, so connections should always time out, - // provided the network is reachable to begin with. diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 1f43832716bd..192e017f6e6e 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -1,33 +1,28 @@ -{ stdenv, targetPackages, removeReferencesTo +{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps -, llvm, ncurses, darwin, rustPlatform, git, cmake, curl +, llvm_7, ncurses, darwin, git, cmake, curl, rustPlatform , which, libffi, gdb -, version , withBundledLLVM ? false -, src -, configureFlags ? [] -, patches -, targets -, targetPatches -, targetToolchains -, doCheck ? true -, broken ? false }: let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - llvmShared = llvm.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; }; - target = builtins.replaceStrings [" "] [","] (builtins.toString targets); -in + # For use at runtime + llvmShared = llvm_7.override { enableSharedLibraries = true; }; +in stdenv.mkDerivation rec { + pname = "rustc"; + version = "1.33.0"; -stdenv.mkDerivation { - name = "rustc-${version}"; - inherit version; - - inherit src; + src = fetchurl { + url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; + sha256 = "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"; + }; __darwinAllowLocalNetworking = true; @@ -38,13 +33,17 @@ stdenv.mkDerivation { # .rlib files in "lib/". # # See https://github.com/NixOS/nixpkgs/pull/34227 - stripDebugList = if stdenv.isDarwin then [ "bin" ] else null; + # + # Running `strip -S` when cross compiling can harm the cross rlibs. + # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 + stripDebugList = [ "bin" ]; + NIX_LDFLAGS = # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" - ++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib"; + ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"; # Enable nightly features in stable compiles (used for # bootstrapping, see https://github.com/rust-lang/rust/pull/37265). @@ -57,27 +56,67 @@ stdenv.mkDerivation { # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py - configureFlags = configureFlags - ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" - "--enable-vendor" - "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] - ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] - ++ optional (targets != []) "--target=${target}"; + configureFlags = let + setBuild = "--set=target.${stdenv.buildPlatform.config}"; + setHost = "--set=target.${stdenv.hostPlatform.config}"; + setTarget = "--set=target.${stdenv.targetPlatform.config}"; + ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc"; + cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++"; + ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc"; + cxxForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}c++"; + ccForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc"; + cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++"; + in [ + "--release-channel=stable" + "--set=build.rustc=${rustPlatform.rust.rustc}/bin/rustc" + "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" + "--enable-rpath" + "--enable-vendor" + "--build=${stdenv.buildPlatform.config}" + "--host=${stdenv.hostPlatform.config}" + "--target=${stdenv.targetPlatform.config}" + + "${setBuild}.cc=${ccForBuild}" + "${setHost}.cc=${ccForHost}" + "${setTarget}.cc=${ccForTarget}" + + "${setBuild}.linker=${ccForBuild}" + "${setHost}.linker=${ccForHost}" + "${setTarget}.linker=${ccForTarget}" + + "${setBuild}.cxx=${cxxForBuild}" + "${setHost}.cxx=${cxxForHost}" + "${setTarget}.cxx=${cxxForTarget}" + ] ++ optional (!withBundledLLVM) [ + "--enable-llvm-link-shared" + "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" + "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" + "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" + ]; # The bootstrap.py will generated a Makefile that then executes the build. # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass # to the bootstrap builder. postConfigure = '' - substituteInPlace Makefile --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' + substituteInPlace Makefile \ + --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' ''; - patches = patches ++ targetPatches; + patches = [ + ./patches/net-tcp-disable-tests.patch + + # Re-evaluate if this we need to disable this one + #./patches/stdsimd-disable-doctest.patch + + # Fails on hydra - not locally; the exact reason is unknown. + # Comments in the test suggest that some non-reproducible environment + # variables such $RANDOM can make it fail. + # ./patches/disable-test-inherit-env.patch + ]; # the rust build system complains that nix alters the checksums dontFixLibtool = true; - passthru.target = target; - postPatch = '' patchShebangs src/etc @@ -115,20 +154,18 @@ stdenv.mkDerivation { rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ??? ''; - # rustc unfortunately need cmake for compiling llvm-rt but doesn't + # rustc unfortunately needs cmake to compile llvm-rt but doesn't # use it for the normal build. This disables cmake in Nix. dontUseCmakeConfigure = true; # ps is needed for one of the test cases - nativeBuildInputs = - [ file python2 ps rustPlatform.rust.rustc git cmake - which libffi removeReferencesTo - ] - # Only needed for the debuginfo tests + nativeBuildInputs = [ + file python2 ps rustPlatform.rust.rustc git cmake + which libffi removeReferencesTo + ] # Only needed for the debuginfo tests ++ optional (!stdenv.isDarwin) gdb; - buildInputs = targetToolchains - ++ optional stdenv.isDarwin Security + buildInputs = optional stdenv.isDarwin Security ++ optional (!withBundledLLVM) llvmShared; outputs = [ "out" "man" "doc" ]; @@ -148,7 +185,14 @@ stdenv.mkDerivation { sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs ''; - inherit doCheck; + # 1. Upstream is not running tests on aarch64: + # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567 + # So we do the same. + # 2. Tests run out of memory for i686 + #doCheck = !stdenv.isAarch64 && !stdenv.isi686; + + # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598. + doCheck = false; # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so # and thus a transitive dependency on ncurses @@ -170,6 +214,5 @@ stdenv.mkDerivation { maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; - broken = broken; }; } diff --git a/nixpkgs/pkgs/development/compilers/solc/default.nix b/nixpkgs/pkgs/development/compilers/solc/default.nix index 2f3674fdbea4..8f005d475dc7 100644 --- a/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -6,9 +6,9 @@ assert z3Support -> z3 != null; assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; let - version = "0.5.4"; - rev = "9549d8fff7343908228c3e8bedc309d1b83fc204"; - sha256 = "1r6wklp3ab2s1lrm70zv6p7blv9917ph1arjsb250j7b7bpjg5pq"; + version = "0.5.7"; + rev = "6da8b019e4a155d1f70abe7a3acc0f9765480a9e"; + sha256 = "0ii868r0ra6brjnn453kxqvw76p4bwjbvdyqfcn6v1bl2h4s60ir"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -43,8 +43,8 @@ stdenv.mkDerivation { ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; - checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " + - "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; + checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:./test/tools/yulInterpreter:$LD_LIBRARY_PATH " + + "./test/soltest -p true -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost ] diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix index d94437b6a167..dfd40c92ecfa 100644 --- a/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -30,12 +30,20 @@ let }; # NOTE: the openembedded-core project doesn't have a patch for 0.40.12 - # or 0.42.4 just yet; we've fixed the single merge conflict in the - # patches below and checked them in here. + # We've fixed the single merge conflict in the following patch. # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch - # 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch "0.40" = ./disable-graphviz-0.40.12.patch; - "0.42" = ./disable-graphviz-0.42.4.patch; + + "0.42" = fp { + commit = "f2b4f9ec6f44dced7f88df849cca68961419eeb8"; + sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g"; + }; + + # NOTE: the openembedded-core project doesn't have a patch for 0.44.1 + # We've reverted the addition of the "--disable-valadoc" option + # and then applied the following patch. + # 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch + "0.44" = ./disable-graphviz-0.44.1.patch; }.${major} or (throw "no graphviz patch for this version of vala"); @@ -88,15 +96,15 @@ let homepage = https://wiki.gnome.org/Projects/Vala; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ]; + maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ]; }; }); in rec { vala_0_36 = generic { major = "0.36"; - minor = "17"; - sha256 = "1f6qg40zd6jzhbwr3dy4fb66k4qs1xlk2whdyqh64zxxjw0k9pv7"; + minor = "18"; + sha256 = "0csb9skgy663y05kl813dsarzjbfcdsmx5fvz13p8gas3hycciq9"; }; vala_0_38 = generic { @@ -108,15 +116,21 @@ in rec { vala_0_40 = generic { major = "0.40"; - minor = "12"; - sha256 = "1nhk45w5iwg97q3cfybn0i4qz5w9qvk423ndpg6mq6cnna076snx"; + minor = "14"; + sha256 = "0llid9b9cgjcrcclc0pw2skkssb7br7b2clq9cql3p14dl94gki0"; }; vala_0_42 = generic { major = "0.42"; - minor = "4"; - sha256 = "07jgkx812y7wq4cswwfsf1f4k3lq9hcjra45682bdi8a11nr0a5m"; + minor = "6"; + sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p"; + }; + + vala_0_44 = generic { + major = "0.44"; + minor = "1"; + sha256 = "1qiglkgymws6a3m8xz1v8b3na165ywx2dbipp3bdg134bi0w3a4n"; }; - vala = vala_0_42; + vala = vala_0_44; } diff --git a/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch deleted file mode 100644 index 77e7d6272afd..000000000000 --- a/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff --git i/configure.ac w/configure.ac -index 730c72d7b..af8198637 100644 ---- i/configure.ac -+++ w/configure.ac -@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) - AC_SUBST(GMODULE_CFLAGS) - AC_SUBST(GMODULE_LIBS) - --PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) --AC_MSG_CHECKING([for CGRAPH]) --cgraph_tmp_LIBADD="$LIBADD" --cgraph_tmp_CFLAGS="$CFLAGS" --LIBADD="$LIBADD $LIBGVC_LIBS" --CFLAGS="$CFLAGS $LIBGVC_CFLAGS" --AC_RUN_IFELSE( -- [AC_LANG_SOURCE([ -- #include <gvc.h> -- -- int main(void) { -- #ifdef WITH_CGRAPH -- return 0; -- #else -- return -1; -- #endif -- } -- ])], [ -- AC_MSG_RESULT([yes]) -- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" -- have_cgraph=yes -- ], [ -- AC_MSG_RESULT([no]) -- have_cgraph=no -- ] --) --LIBADD="$cgraph_tmp_LIBADD" --CFLAGS="$cgraph_tmp_CFLAGS" -+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) -+if test x$enable_graphviz = xyes; then -+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) -+ AC_MSG_CHECKING([for CGRAPH]) -+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" -+ cgraph_tmp_LIBADD="$LIBADD" -+ cgraph_tmp_CFLAGS="$CFLAGS" -+ LIBADD="$LIBADD $LIBGVC_LIBS" -+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" -+ AC_RUN_IFELSE( -+ [AC_LANG_SOURCE([ -+ #include <gvc.h> -+ int main(void) { -+ #ifdef WITH_CGRAPH -+ return 0; -+ #else -+ return -1; -+ #endif -+ } -+ ])], [ -+ AC_MSG_RESULT([yes]) -+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" -+ have_cgraph=yes -+ ], [ -+ AC_MSG_RESULT([no]) -+ have_cgraph=no -+ ] -+ ) -+ LIBADD="$cgraph_tmp_LIBADD" -+ CFLAGS="$cgraph_tmp_CFLAGS" -+fi -+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") - - AC_PATH_PROG([XSLTPROC], [xsltproc], :) -diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am -index f3f790e76..3c5dc4c80 100644 ---- i/libvaladoc/Makefile.am -+++ w/libvaladoc/Makefile.am -@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ - content/tablerow.vala \ - content/taglet.vala \ - content/text.vala \ -- charts/chart.vala \ -- charts/chartfactory.vala \ -- charts/hierarchychart.vala \ -- charts/simplechartfactory.vala \ - parser/manyrule.vala \ - parser/oneofrule.vala \ - parser/optionalrule.vala \ -@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ - highlighter/codetoken.vala \ - highlighter/highlighter.vala \ - html/basicdoclet.vala \ -- html/htmlchartfactory.vala \ - html/linkhelper.vala \ - html/cssclassresolver.vala \ - html/htmlmarkupwriter.vala \ - html/htmlrenderer.vala \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc_la_VALASOURCES += \ -+ charts/chart.vala \ -+ charts/chartfactory.vala \ -+ charts/hierarchychart.vala \ -+ charts/simplechartfactory.vala \ -+ html/htmlchartfactory.vala \ -+ $(NULL) -+ -+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc -+endif -+ - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - --library valadoc \ - --vapi valadoc@PACKAGE_SUFFIX@.vapi \ - --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ -- --vapidir $(top_srcdir)/vapi --pkg libgvc \ - --vapidir $(top_srcdir)/gee --pkg gee \ - --vapidir $(top_srcdir)/vala --pkg vala \ - --vapidir $(top_srcdir)/ccode --pkg ccode \ - --vapidir $(top_srcdir)/codegen --pkg codegen \ -+ $(LIBGVC_PKG) \ - --pkg config \ - $(filter %.vala %.c,$^) - touch $@ -@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc - - valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc //g" $@ -+endif - - vapidir = $(datadir)/vala/vapi - dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi -@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps - - valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc//g" $@ -+endif - - EXTRA_DIST = \ - $(libvaladoc_la_VALASOURCES) \ -diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala -index 192e488cd..ec0960222 100644 ---- i/libvaladoc/html/basicdoclet.vala -+++ w/libvaladoc/html/basicdoclet.vala -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - protected HtmlRenderer _renderer; - protected Html.MarkupWriter writer; - protected Html.CssClassResolver cssresolver; -+#if HAVE_GRAPHVIZ - protected Charts.Factory image_factory; -+#else -+ protected void* image_factory; -+#endif - protected ErrorReporter reporter; - protected string package_list_link = "../index.html"; - -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.linker = new LinkHelper (); - - _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); -+#if HAVE_GRAPHVIZ - this.image_factory = new SimpleChartFactory (settings, linker); -+#endif - } - - -@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - } - - protected void write_image_block (Api.Node element) { -+#if HAVE_GRAPHVIZ - if (element is Class || element is Interface || element is Struct) { - unowned string format = (settings.use_svg_images ? "svg" : "png"); - var chart = new Charts.Hierarchy (image_factory, element); -@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.get_img_path_html (element, format)}); - writer.add_usemap (chart); - } -+#endif - } - - public void write_namespace_content (Namespace node, Api.Node? parent) { -diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala -index 5aa4afdea..e79b0b8f5 100644 ---- i/libvaladoc/html/htmlmarkupwriter.vala -+++ w/libvaladoc/html/htmlmarkupwriter.vala -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { - } - } - -+#if HAVE_GRAPHVIZ - public unowned MarkupWriter add_usemap (Charts.Chart chart) { - string? buf = (string?) chart.write_buffer ("cmapx"); - if (buf != null) { - raw_text ("\n"); - raw_text ((!) buf); - } -+#else -+ public unowned MarkupWriter add_usemap (void* chart) { -+#endif - - return this; - } diff --git a/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch new file mode 100644 index 000000000000..2752aa1e2050 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch @@ -0,0 +1,261 @@ +diff --git a/Makefile.am b/Makefile.am +index f70234759..b3d6c3833 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,19 +13,9 @@ SUBDIRS = \ + doc \ + gobject-introspection \ + vapigen \ +- $(NULL) +- +-if ENABLE_VALADOC +-SUBDIRS += \ + libvaladoc \ + valadoc \ + $(NULL) +-endif +- +-DISTCHECK_CONFIGURE_FLAGS = \ +- --enable-valadoc \ +- --enable-unversioned \ +- $(NULL) + + if ENABLE_UNVERSIONED + aclocaldir = $(datadir)/aclocal +diff --git a/configure.ac b/configure.ac +index 16ebd1f81..cf23db4b8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -156,10 +156,11 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) + AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + +-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) +-if test x$enable_valadoc = xyes; then ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) ++if test x$enable_graphviz = xyes; then + PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) + AC_MSG_CHECKING([for CGRAPH]) ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" + cgraph_tmp_LIBADD="$LIBADD" + cgraph_tmp_CFLAGS="$CFLAGS" + LIBADD="$LIBADD $LIBGVC_LIBS" +@@ -186,8 +187,8 @@ if test x$enable_valadoc = xyes; then + LIBADD="$cgraph_tmp_LIBADD" + CFLAGS="$cgraph_tmp_CFLAGS" + fi ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") +-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) + + AC_PATH_PROG([XSLTPROC], [xsltproc], :) + AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) +diff --git a/doc/Makefile.am b/doc/Makefile.am +index d2684a0e0..b343c7c10 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -6,16 +6,11 @@ SUBDIRS = \ + + dist_man_MANS = \ + valac.1 \ ++ valadoc.1 \ + vala-gen-introspect.1 \ + vapigen.1 \ + $(NULL) + +-if ENABLE_VALADOC +-dist_man_MANS += \ +- valadoc.1 \ +- $(NULL) +-endif +- + EXTRA_DIST = \ + valac.h2m \ + valadoc.h2m \ +@@ -24,11 +19,7 @@ EXTRA_DIST = \ + $(NULL) + + if HAVE_HELP2MAN +-if ENABLE_VALADOC + manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1 +-else +-manpages: valac.1 vala-gen-introspect.1 vapigen.1 +-endif + @rm $^ + $(MAKE) $(AM_MAKEFLAGS) $^ + +@@ -37,13 +28,11 @@ valac.1: + --include $(srcdir)/valac.h2m \ + --libtool --no-info \ + --output=$@ +-if ENABLE_VALADOC + valadoc.1: + $(HELP2MAN) $(top_builddir)/valadoc/valadoc \ + --include $(srcdir)/valadoc.h2m \ + --libtool --no-info \ + --output=$@ +-endif + vala-gen-introspect.1: + $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \ + --include $(srcdir)/vala-gen-introspect.h2m \ +@@ -60,15 +49,12 @@ endif + if ENABLE_UNVERSIONED + install-data-hook: + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1 +-if ENABLE_VALADOC + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1 +-endif + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1 + endif + + +-if ENABLE_VALADOC + COMMON_VALADOCFLAGS = \ + --force \ + --verbose \ +@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen + @touch $@ + + internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc +-endif + + clean-local: + rm -rf $(builddir)/internal-apis +diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am +index 7456fb836..107338e91 100644 +--- a/libvaladoc/Makefile.am ++++ b/libvaladoc/Makefile.am +@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ ++ $(LIBGVC_PKG) \ + --pkg config \ + $(filter %.vala %.c,$^) + touch $@ +@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala +index 46578c28f..f6ce7097c 100644 +--- a/libvaladoc/html/basicdoclet.vala ++++ b/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala +index 5aa4afdea..e79b0b8f5 100644 +--- a/libvaladoc/html/htmlmarkupwriter.vala ++++ b/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public unowned MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public unowned MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/nixpkgs/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix index 7167a967c1c9..eacb46e8ae87 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2019.02.22"; + version = "2019.04.08"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "c521f4632f1c82b48a5538c832980668044e8fd9"; - sha256 = "18pg1ry5qhhx8c49n2gqwlf55sd9bfsfk3khfyh1a1vjh1qpfgdf"; + rev = "0deaccbaae436bc94ad5b2913fa39a9368c09ace"; + sha256 = "13kil8z1f35lr9436njn2y60458wnjxldz0bsjcr9mpx8if0zp84"; name = "yosys"; }) diff --git a/nixpkgs/pkgs/development/compilers/zig/default.nix b/nixpkgs/pkgs/development/compilers/zig/default.nix index fd95635616fc..35ad09320dec 100644 --- a/nixpkgs/pkgs/development/compilers/zig/default.nix +++ b/nixpkgs/pkgs/development/compilers/zig/default.nix @@ -1,23 +1,19 @@ { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: stdenv.mkDerivation rec { - version = "0.3.0"; - name = "zig-${version}"; + version = "0.4.0"; + pname = "zig"; src = fetchFromGitHub { owner = "ziglang"; - repo = "zig"; - rev = "${version}"; - sha256 = "089ywagxjjh7gxv8h8yg7jpmryzjf7n4m5irhdkhp2966d03kyxm"; + repo = pname; + rev = version; + sha256 = "1cq6cc5pvybz9kn3y0j5gskkjq88hkmmcsva54mfzpcc65l3pv6p"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - meta = with stdenv.lib; { description = "Programming languaged designed for robustness, optimality, and clarity"; homepage = https://ziglang.org/; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index c439d2cca00d..ff309da41d2d 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -871,8 +871,38 @@ self: super: { # https://github.com/takano-akio/filelock/issues/5 filelock = dontCheck super.filelock; - # cryptol-2.5.0 doesn't want happy 1.19.6+. - cryptol = super.cryptol.override { happy = self.happy_1_19_5; }; + # fix GHC 8.6 builds by using irrefutable patterns. jailbreak is also + # required due to a constraint failure for base-compat. + cryptol = doJailbreak (overrideCabal super.cryptol (drv: { + + # the last patch fixes ghc 8.6 builds; the other two (small) patches fix a + # few bugs between them, but are also hard dependencies + patches = drv.patches or [] ++ [ + (pkgs.fetchpatch { + url = https://github.com/GaloisInc/cryptol/commit/634c5a03e757663bf86d1ffad1ce2c6086d4483f.patch; + sha256 = "16dvfihsl2c4jnyfndgrjarkm3z5pyn7rzg2svnidx0qipwrxzm7"; + }) + (pkgs.fetchpatch { + url = https://github.com/GaloisInc/cryptol/commit/515642328aff6d958ff1b534b9effdd726901b60.patch; + sha256 = "1fml71b720igyh8s7mj1z1c2bbv1vk490iy7blvxp625nymzjij6"; + }) + (pkgs.fetchpatch { + url = https://github.com/GaloisInc/cryptol/commit/a8eab11b319f6434f9b01b26d419b8305ff30bc2.patch; + sha256 = "1bbznp3kbj8l83q979gf4gr2khwbyqi85ykwsf2jnkhzda6pr0n8"; + }) + ]; + + buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; + + # make sure the binaries always start up. previously this was in + # all-packages.nix but it's almost certainly better to do it here (e.g. a + # haskell deps may use cryptol in the test suite or something, etc) + postInstall = drv.postInstall or "" + '' + for b in $out/bin/cryptol $out/bin/cryptol-html; do + wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin" + done + ''; + })); # Tests try to invoke external process and process == 1.4 grakn = dontCheck (doJailbreak super.grakn); @@ -1228,7 +1258,7 @@ self: super: { # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. - pandoc = doDistribute super.pandoc_2_7_1; + pandoc = doDistribute super.pandoc_2_7_2; pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_1_3; # https://github.com/qfpl/tasty-hedgehog/issues/24 @@ -1249,4 +1279,7 @@ self: super: { # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; + # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65) + yesod-markdown = doJailbreak super.yesod-markdown; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 5a856032e47c..b5fe837cec57 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -82,8 +82,8 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "ucsd-progsys"; repo = "liquidhaskell"; - rev = "254e77da9cd36e95b72c526bfb9eec50d3447050"; - sha256 = "089x41z51iw542ijz32j9ns6flcc4hsbjqx7rfznvmm7a4q78yza"; + rev = "46f11e8faef006e70d39572d08419283b1280b88"; + sha256 = "10z5r6g5acd43bsak762kwhy33ff262zmhs0wga545nbg29q1fyp"; }; version = "0.8.6.0-pre-release"; }; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 439a7f4dfea3..ad444e56b56a 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.14 + # LTS Haskell 13.17 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -239,24 +239,24 @@ default-package-overrides: - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.3.0 + - avro ==0.4.4.1 - avwx ==0.3.0.2 - axel ==0.0.9 - - backprop ==0.2.6.1 + - backprop ==0.2.6.2 - bank-holidays-england ==0.1.0.8 - - barbies ==1.1.1.0 + - barbies ==1.1.2.1 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 - base58string ==0.10.0 - base64-bytestring ==1.0.0.2 - - base64-bytestring-type ==1 + - base64-bytestring-type ==1.0.1 - base64-string ==0.2 - base-compat ==0.10.5 - base-compat-batteries ==0.10.5 - basement ==0.0.10 - base-noprelude ==4.12.0.0 - - base-orphans ==0.8 + - base-orphans ==0.8.1 - base-prelude ==1.3 - base-unicode-symbols ==0.2.3 - basic-prelude ==0.7.0 @@ -367,7 +367,7 @@ default-package-overrides: - cassava-megaparsec ==2.0.0 - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - - category ==0.2.2.0 + - category ==0.2.4.0 - cayley-client ==0.4.9 - cborg ==0.2.1.0 - cborg-json ==0.2.1.0 @@ -561,7 +561,7 @@ default-package-overrides: - DAV ==1.3.3 - dbcleaner ==0.1.3 - DBFunctor ==0.1.1.1 - - dbus ==1.2.4 + - dbus ==1.2.5 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -604,7 +604,7 @@ default-package-overrides: - distributed-closure ==0.4.1.1 - distribution-opensuse ==1.1.1 - distributive ==0.6 - - dlist ==0.8.0.5 + - dlist ==0.8.0.6 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==3.0.4 @@ -653,13 +653,14 @@ default-package-overrides: - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - emacs-module ==0.1.1 - - email-validate ==2.3.2.10 + - email-validate ==2.3.2.11 - emd ==0.1.4.0 - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.4 - enummapset ==0.6.0.1 - enumset ==0.0.4.1 - enum-subset-generate ==0.1.0.0 + - enum-text ==0.5.0.0 - envelope ==0.2.2.0 - envy ==1.5.1.0 - epub-metadata ==4.5 @@ -678,13 +679,13 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.2.2 + - eventstore ==1.2.4 - every ==0.0.1 - - exact-combinatorics ==0.2.0.8 + - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exceptional ==0.3.0.0 - exception-mtl ==0.4.0.1 - - exceptions ==0.10.0 + - exceptions ==0.10.1 - exception-transformers ==0.4.0.7 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 @@ -700,7 +701,7 @@ default-package-overrides: - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.13 + - fast-logger ==2.4.15 - fast-math ==1.0.2 - fb ==1.2.1 - fclabels ==2.0.3.3 @@ -739,11 +740,11 @@ default-package-overrides: - flexible-defaults ==0.0.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - - flow ==1.0.17 + - flow ==1.0.18 - fmlist ==0.9.2 - fmt ==0.6.1.1 - fn ==0.3.0.2 - - focus ==1.0.1.2 + - focus ==1.0.1.3 - focuslist ==0.1.0.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.8 @@ -819,7 +820,7 @@ default-package-overrides: - ghcjs-codemirror ==0.0.0.2 - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.1.5 - - ghc-syntax-highlighter ==0.0.3.0 + - ghc-syntax-highlighter ==0.0.3.1 - ghc-tcplugins-extra ==0.3 - ghc-typelits-extra ==0.3 - ghc-typelits-knownnat ==0.6 @@ -869,7 +870,7 @@ default-package-overrides: - gravatar ==0.8.0 - graylog ==0.1.0.1 - greskell ==0.2.3.0 - - greskell-core ==0.1.2.4 + - greskell-core ==0.1.2.5 - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 - groundhog ==0.10.0 @@ -903,21 +904,21 @@ default-package-overrides: - haskell-gi-base ==0.21.5 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - - haskell-lsp ==0.8.1.0 - - haskell-lsp-types ==0.8.0.1 + - haskell-lsp ==0.8.2.0 + - haskell-lsp-types ==0.8.2.0 - haskell-names ==0.9.4 - HaskellNet ==0.5.1 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.3.0 - haskell-src-exts ==1.20.3 - - haskell-src-exts-util ==0.2.4 + - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.2 - haskey-btree ==0.3.0.0 - haskoin-core ==0.8.4 - hasql ==1.3.0.3 - hasql-optparse-applicative ==0.3.0.3 - hasql-pool ==0.5.0.1 - - hasql-transaction ==0.7 + - hasql-transaction ==0.7.1 - hasty-hamiltonian ==1.3.2 - haxl ==2.0.1.1 - hbeanstalk ==0.2.4 @@ -990,7 +991,7 @@ default-package-overrides: - HSet ==0.0.1 - hset ==2.2.0 - hsexif ==0.6.1.6 - - hs-functors ==0.1.3.0 + - hs-functors ==0.1.4.0 - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.2 @@ -1034,13 +1035,13 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==1.6.4 + - http2 ==1.6.5 - HTTP ==4000.3.13 - http-api-data ==0.4 - http-client ==0.5.14 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.6.1 + - http-conduit ==2.3.7 - http-date ==0.0.8 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 @@ -1055,7 +1056,7 @@ default-package-overrides: - hvect ==0.4.0.0 - hvega ==0.1.0.3 - hw-balancedparens ==0.2.0.2 - - hw-bits ==0.7.0.5 + - hw-bits ==0.7.0.6 - hw-conduit ==0.2.0.5 - hw-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.5 @@ -1070,7 +1071,7 @@ default-package-overrides: - hw-mquery ==0.1.0.3 - hw-packed-vector ==0.0.0.1 - hw-parser ==0.1.0.0 - - hw-prim ==0.6.2.22 + - hw-prim ==0.6.2.23 - hw-rankselect ==0.12.0.4 - hw-rankselect-base ==0.3.2.1 - hw-streams ==0.0.0.10 @@ -1100,14 +1101,14 @@ default-package-overrides: - Imlib ==0.1.2 - immortal ==0.3 - include-file ==0.1.0.4 - - incremental-parser ==0.3.2.1 + - incremental-parser ==0.3.2.2 - indentation-core ==0.0.0.2 - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 - indexed-list-literals ==0.2.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.4 - - influxdb ==1.6.1.2 + - influxdb ==1.6.1.3 - ini ==0.3.6 - inline-c ==0.7.0.1 - inline-c-cpp ==0.3.0.1 @@ -1122,7 +1123,7 @@ default-package-overrides: - interpolatedstring-perl6 ==1.0.1 - interpolation ==0.1.1 - interpolator ==0.1.1 - - IntervalMap ==0.6.1.0 + - IntervalMap ==0.6.1.1 - intervals ==0.8.1 - intset-imperative ==0.1.0.0 - invariant ==0.5.1 @@ -1259,7 +1260,7 @@ default-package-overrides: - long-double ==0.1 - loop ==0.3.0 - lrucaching ==0.3.3 - - lsp-test ==0.5.0.2 + - lsp-test ==0.5.1.0 - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 @@ -1278,7 +1279,7 @@ default-package-overrides: - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - massiv ==0.2.8.0 - - massiv-io ==0.1.5.0 + - massiv-io ==0.1.6.0 - mathexpr ==0.3.0.0 - math-functions ==0.3.1.0 - matrices ==0.4.5 @@ -1296,7 +1297,7 @@ default-package-overrides: - mega-sdist ==0.3.3.2 - memory ==0.14.18 - MemoTrie ==0.6.9 - - menshen ==0.0.2 + - menshen ==0.0.3 - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1500,7 +1501,7 @@ default-package-overrides: - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==1.0.1 + - parser-combinators ==1.0.2 - parsers ==0.12.9 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 @@ -1525,15 +1526,15 @@ default-package-overrides: - pem ==0.2.4 - percent-format ==0.0.1 - perfect-hash-generator ==0.2.0.6 - - persist ==0.1.1.1 + - persist ==0.1.1.2 - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.9.1 + - persistent ==2.9.2 - persistent-iproute ==0.2.3 - persistent-mysql ==2.9.0 - persistent-mysql-haskell ==0.5.2 - - persistent-postgresql ==2.9.0 - - persistent-sqlite ==2.9.2 + - persistent-postgresql ==2.9.1 + - persistent-sqlite ==2.9.3 - persistent-template ==2.5.4 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 @@ -1571,6 +1572,7 @@ default-package-overrides: - pooled-io ==0.0.2.2 - port-utils ==0.2.0.0 - posix-paths ==0.2.1.6 + - possibly ==1.0.0.0 - postgresql-binary ==0.12.1.2 - postgresql-libpq ==0.9.4.2 - postgresql-schema ==0.1.14 @@ -1678,7 +1680,7 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - rebase ==1.3 + - rebase ==1.3.1 - record-dot-preprocessor ==0.1.5 - records-sop ==0.1.0.2 - recursion-schemes ==5.1.2 @@ -1700,7 +1702,7 @@ default-package-overrides: - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 - regex-with-pcre ==1.0.2.0 - - registry ==0.1.2.6 + - registry ==0.1.3.4 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.1.0 @@ -1716,7 +1718,7 @@ default-package-overrides: - req ==1.2.1 - req-conduit ==1.0.0 - req-url-extra ==0.1.0.0 - - rerebase ==1.3 + - rerebase ==1.3.1 - resource-pool ==0.2.3.2 - resourcet ==1.2.2 - result ==0.2.6.0 @@ -1747,7 +1749,7 @@ default-package-overrides: - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 - - salak ==0.1.8 + - salak ==0.1.11 - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 @@ -1842,8 +1844,8 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.3.1 - - simple-cmd-args ==0.1.0.1 + - simple-cmd ==0.1.4 + - simple-cmd-args ==0.1.1 - simple-log ==0.9.11 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 @@ -1886,7 +1888,7 @@ default-package-overrides: - Spintax ==0.3.3 - splice ==0.6.1.1 - split ==0.2.3.3 - - splitmix ==0.0.1 + - splitmix ==0.0.2 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 @@ -2001,7 +2003,7 @@ default-package-overrides: - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - - tensors ==0.1.2 + - tensors ==0.1.4 - termbox ==0.1.0 - terminal-size ==0.3.2.1 - test-framework ==0.8.2.0 @@ -2039,7 +2041,7 @@ default-package-overrides: - th-extras ==0.0.0.4 - th-lift ==0.7.11 - th-lift-instances ==0.1.12 - - th-orphans ==0.13.6 + - th-orphans ==0.13.7 - th-printf ==0.6.0 - thread-hierarchy ==0.3.0.1 - thread-local-storage ==0.2 @@ -2082,7 +2084,7 @@ default-package-overrides: - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 - - transformers-compat ==0.6.2 + - transformers-compat ==0.6.4 - transformers-fix ==1.0 - traverse-with-class ==1.0.0.0 - tree-diff ==0.0.2 @@ -2110,7 +2112,7 @@ default-package-overrides: - typerep-map ==0.3.1 - type-spec ==0.3.0.1 - tz ==0.1.3.2 - - tzdata ==0.1.20181026.0 + - tzdata ==0.1.20190325.0 - ua-parser ==0.7.5.1 - ucam-webauth ==0.1.0.0 - ucam-webauth-types ==0.1.0.0 @@ -2294,8 +2296,8 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yam ==0.5.14 - - yam-datasource ==0.5.14 + - yam ==0.5.17 + - yam-datasource ==0.5.17 - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 @@ -2306,8 +2308,8 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.1 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.13 - - yesod-csp ==0.2.4.0 + - yesod-core ==1.6.14 + - yesod-csp ==0.2.5.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - yesod-form ==1.6.4 @@ -3736,6 +3738,7 @@ broken-packages: - courier - court - coverage + - coya - cparsing - CPBrainfuck - cpio-conduit @@ -3788,7 +3791,6 @@ broken-packages: - crypto-simple - cryptocompare - cryptoconditions - - cryptol - cryptsy-api - crystalfontz - cse-ghc-plugin @@ -4387,6 +4389,7 @@ broken-packages: - extract-dependencies - extractelf - ez-couch + - ez3 - f-ree-hack-cheats-free-v-bucks-generator - Facebook-Password-Hacker-Online-Latest-Version - faceted @@ -4441,6 +4444,7 @@ broken-packages: - fdo-trash - feature-flipper - feature-flipper-postgres + - fedora-img-dl - fedora-packages - feed-cli - feed-collect @@ -4662,6 +4666,7 @@ broken-packages: - funion - funpat - funsat + - fused-effects-exceptions - fusion - futun - future @@ -4785,6 +4790,8 @@ broken-packages: - ghci-lib - ghci-ng - ghcjs-base-stub + - ghcjs-dom + - ghcjs-dom-jsaddle - ghcjs-dom-jsffi - ghcjs-fetch - ghcjs-hplay @@ -5502,6 +5509,7 @@ broken-packages: - hierarchy - hiernotify - Hieroglyph + - higgledy - HiggsSet - higherorder - highjson @@ -5908,6 +5916,7 @@ broken-packages: - http-shed - http-wget - http2-client-grpc + - http2-grpc-types - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -6234,6 +6243,7 @@ broken-packages: - jonathanscard - jpeg - js-good-parts + - jsaddle-dom - jsaddle-hello - jsaddle-warp - jsaddle-wkwebview @@ -6579,7 +6589,6 @@ broken-packages: - lio-simple - lipsum-gen - liquid - - liquidhaskell-cabal - liquidhaskell-cabal-demo - list-fusion-probe - list-mux @@ -8008,6 +8017,7 @@ broken-packages: - reflection-extras - reflex - reflex-animation + - reflex-backend-wai - reflex-basic-host - reflex-dom-core - reflex-gloss @@ -8039,6 +8049,7 @@ broken-packages: - regions-monadstf - regions-mtl - register-machine-typelevel + - registry - regress - regular - regular-extras @@ -8137,6 +8148,7 @@ broken-packages: - riemann - riff - ring-buffer + - ring-buffers - riot - risc386 - riscv-isa @@ -8231,6 +8243,8 @@ broken-packages: - sai-shape-syb - sajson - salak + - salak-toml + - salak-yaml - Salsa - saltine-quickcheck - salvia @@ -8709,6 +8723,7 @@ broken-packages: - spice - SpinCounter - spir-v + - spiros - splay - splaytree - splines @@ -8881,6 +8896,7 @@ broken-packages: - SuffixStructures - suitable - summoner + - summoner-tui - sump - sunlight - sunroof-compiler @@ -8966,7 +8982,6 @@ broken-packages: - Tablify - tabloid - tabs - - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -9606,6 +9621,7 @@ broken-packages: - waldo - wallpaper - warp-dynamic + - warp-grpc - warp-static - WashNGo - wasm @@ -9649,6 +9665,7 @@ broken-packages: - webkit2gtk3-javascriptcore - Webrexp - webserver + - webshow - websockets-rpc - webwire - weighted @@ -9714,6 +9731,7 @@ broken-packages: - writer-cps-monads-tf - writer-cps-morph - ws + - ws-chans - wsdl - wsedit - wss-client @@ -9962,7 +9980,7 @@ broken-packages: - zeromq3-haskell - zeromq4-clone-pattern - zeromq4-conduit - - zeromq4-haskell + - zeromq4-haskell == 0.7.* - zeromq4-patterns - zeromq4-simple - zeroth diff --git a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index a8d530516a5e..8047eee13187 100644 --- a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -81,10 +81,10 @@ in # built. Will delay failures, if any, to compile time. allowInconsistentDependencies ? false , maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 -, # Build a pre-linked .o file for this Haskell library. This can make it - # slightly faster to load this library into GHCi, but takes extra disk space - # and compile time. - enableLibraryForGhci ? true +, # If set to true, this builds a pre-linked .o file for this Haskell library. + # This can make it slightly faster to load this library into GHCi, but takes + # extra disk space and compile time. + enableLibraryForGhci ? false } @ args: assert editedCabalFile != null -> revision != null; diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 107625226945..ce4b3b2d7074 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -758,29 +758,29 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, alex, array, async, base, binary, blaze-html - , boxes, bytestring, Cabal, containers, data-hash, deepseq - , directory, EdisonCore, edit-distance, emacs, equivalence - , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable + ({ mkDerivation, aeson, alex, array, async, base, binary + , blaze-html, boxes, bytestring, Cabal, containers, data-hash + , deepseq, directory, EdisonCore, edit-distance, emacs, equivalence + , exceptions, filepath, geniplate-mirror, gitrev, happy, hashable , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process - , regex-tdfa, stm, strict, template-haskell, text, time + , regex-tdfa, split, stm, strict, template-haskell, text, time , transformers, unordered-containers, uri-encode, zlib }: mkDerivation { pname = "Agda"; - version = "2.5.4.2"; - sha256 = "07wvawpfjhx3gw2w53v27ncv1bl0kkx08wkm6wzxldbslkcasign"; + version = "2.6.0"; + sha256 = "1f3gq1vd9ra3421ff5an6q33mlfzc2qvaxmfg9qhvr4z99ivqwdz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal filemanip filepath process ]; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ - array async base binary blaze-html boxes bytestring containers - data-hash deepseq directory EdisonCore edit-distance equivalence - filepath geniplate-mirror gitrev hashable hashtables haskeline - ieee754 mtl murmur-hash pretty process regex-tdfa stm strict - template-haskell text time transformers unordered-containers - uri-encode zlib + aeson array async base binary blaze-html boxes bytestring + containers data-hash deepseq directory EdisonCore edit-distance + equivalence exceptions filepath geniplate-mirror gitrev hashable + hashtables haskeline ieee754 mtl murmur-hash pretty process + regex-tdfa split stm strict template-haskell text time transformers + unordered-containers uri-encode zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base directory filepath process ]; @@ -942,6 +942,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Allure_0_9_3_3" = callPackage + ({ mkDerivation, async, base, enummapset, filepath, ghc-compact + , LambdaHack, optparse-applicative, primitive, random + , template-haskell, text, transformers + }: + mkDerivation { + pname = "Allure"; + version = "0.9.3.3"; + sha256 = "0s2f8fmcbcyvqg9vx492irr69ihkrwwf6nhp511b4y5xcgw69k12"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base enummapset filepath ghc-compact LambdaHack + optparse-applicative primitive random template-haskell text + transformers + ]; + executableHaskellDepends = [ + async base filepath LambdaHack optparse-applicative + ]; + testHaskellDepends = [ + async base filepath LambdaHack optparse-applicative + ]; + description = "Near-future Sci-Fi roguelike and tactical squad combat game"; + license = stdenv.lib.licenses.agpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "AndroidViewHierarchyImporter" = callPackage ({ mkDerivation, base, bytestring, cmdtheline, containers, mtl , network, opml, pretty, process, QuickCheck, split, transformers @@ -2827,8 +2855,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.9.1"; - sha256 = "188zy20ahz51c8jwp41ij1pp8vanpmfv77bjzafwcib6gjbjlp77"; + version = "1.9.2"; + sha256 = "0am51ck84apijwwvpkwhnpmsr4047svzdi7g5nbf5yprsb8vzd4n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -7678,8 +7706,8 @@ self: { }: mkDerivation { pname = "HDBC-odbc"; - version = "2.5.0.1"; - sha256 = "16fywv2jzh0cxfmcxikydp47wk8czz279y89r8qx4wz8ffahl04n"; + version = "2.6.0.0"; + sha256 = "0nmma7z7r9rgibiwi3m7zkx90val4qqvljidlyiw6ysw20s3gbs3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10898,8 +10926,8 @@ self: { }: mkDerivation { pname = "IntervalMap"; - version = "0.6.1.0"; - sha256 = "0g47mf4m0vwbibk8hi9k78xwbgdaa4zvypgbpzcvj20hw2wpcdhk"; + version = "0.6.1.1"; + sha256 = "0vdlvxvhf7vjyv0mfn6jaj2i2gclqv8419ck32s2jxfcmki5m5g8"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; benchmarkHaskellDepends = [ @@ -11761,6 +11789,38 @@ self: { broken = true; }) {}; + "LambdaHack_0_9_3_1" = callPackage + ({ mkDerivation, assert-failure, async, base, base-compat, binary + , bytestring, containers, deepseq, directory, enummapset, filepath + , ghc-compact, ghc-prim, hashable, hsini, keys, miniutter + , optparse-applicative, pretty-show, primitive, random, sdl2 + , sdl2-ttf, stm, template-haskell, text, time, transformers + , unordered-containers, vector, vector-binary-instances, zlib + }: + mkDerivation { + pname = "LambdaHack"; + version = "0.9.3.1"; + sha256 = "1s1xz5iz81wdwxc1bmgbpj2s19qlvz1d5q7c2l01cdzqwd2iwn3f"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + assert-failure async base base-compat binary bytestring containers + deepseq directory enummapset filepath ghc-compact ghc-prim hashable + hsini keys miniutter optparse-applicative pretty-show primitive + random sdl2 sdl2-ttf stm template-haskell text time transformers + unordered-containers vector vector-binary-instances zlib + ]; + executableHaskellDepends = [ + async base filepath optparse-applicative + ]; + testHaskellDepends = [ async base filepath optparse-applicative ]; + description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "LambdaINet" = callPackage ({ mkDerivation, base, containers, GLFW, GLFW-task, monad-task, mtl , OpenGL, transformers, vector @@ -22190,6 +22250,29 @@ self: { broken = true; }) {}; + "acousticbrainz-client" = callPackage + ({ mkDerivation, aeson, base-compat-batteries, base-noprelude + , bytestring, exceptions, filepath, microlens-aeson + , microlens-platform, pretty-simple, relude, scientific + , streaming-bytestring, streaming-utils, tasty, tasty-golden, text + }: + mkDerivation { + pname = "acousticbrainz-client"; + version = "0.1.0.0"; + sha256 = "03bzfxv1d7bgsp6bm15h2a8h573id4nyb7xd4y52gbkzyblbz58c"; + libraryHaskellDepends = [ + aeson base-compat-batteries base-noprelude bytestring exceptions + microlens-aeson microlens-platform relude scientific + streaming-bytestring streaming-utils text + ]; + testHaskellDepends = [ + aeson base-compat-batteries base-noprelude filepath pretty-simple + relude tasty tasty-golden text + ]; + description = "AcousticBrainz API client"; + license = stdenv.lib.licenses.cc0; + }) {}; + "acquire" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -23266,8 +23349,8 @@ self: { }: mkDerivation { pname = "aeson-quick"; - version = "0.1.2.1"; - sha256 = "135mnzh56za992p8083yr3yx96q7zh5h50l7y8c5jm7qla32n2b4"; + version = "0.1.3"; + sha256 = "07xkiakl2zhknpj6sxjicyrcq4lishnyv645mq3fg9lls463fhm1"; libraryHaskellDepends = [ aeson attoparsec base deepseq text unordered-containers vector ]; @@ -24502,8 +24585,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "alist"; - version = "0.1.0.6"; - sha256 = "19r7g8ghpiklam6pv081sh60d7lrlznpwbp5yqlm5h7ah1m284jh"; + version = "0.1.1.6"; + sha256 = "0shfvjakcq2cmqizqvsqdvc7mnxkbalj6drp289lqqcmy4nxszin"; libraryHaskellDepends = [ base ]; description = "lists with O(1) append"; license = stdenv.lib.licenses.bsd3; @@ -27545,26 +27628,31 @@ self: { "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, data-default - , exceptions, monad-control, monad-loops, mtl, resource-pool, split - , tasty, tasty-hunit, text, transformers-base + , exceptions, monad-control, monad-loops, mtl, resource-pool + , server, split, text, transformers-base }: mkDerivation { pname = "amqp-worker"; - version = "0.2.5"; - sha256 = "0crbrmxwv1dwd84l41p2zmx5ap5wwr0n5a9cznz87x3cc6qncylq"; + version = "0.3.2"; + sha256 = "0w6nz5crrvr8wb0ylszl3ckxc17pll03swr30zvpqaz855pqriw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amqp base bytestring data-default exceptions monad-control monad-loops mtl resource-pool split text transformers-base ]; - executableHaskellDepends = [ aeson base exceptions text ]; + executableHaskellDepends = [ + aeson amqp base bytestring data-default exceptions monad-control + monad-loops mtl resource-pool split text transformers-base + ]; testHaskellDepends = [ - aeson amqp base bytestring tasty tasty-hunit text + aeson amqp base bytestring data-default exceptions monad-control + monad-loops mtl resource-pool server split text transformers-base ]; - description = "High level functions for working with message queues"; license = stdenv.lib.licenses.bsd3; - }) {}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {server = null;}; "amrun" = callPackage ({ mkDerivation, base, deepseq, parsec }: @@ -30998,7 +31086,7 @@ self: { broken = true; }) {}; - "asif_5_0_2" = callPackage + "asif_6_0_0" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -31008,8 +31096,8 @@ self: { }: mkDerivation { pname = "asif"; - version = "5.0.2"; - sha256 = "19wsjpk3jnij6b4ap84g5jaka734za2381yz4x5ahm4f1nvc6gdf"; + version = "6.0.0"; + sha256 = "1kiafpfr1xgbsp2j0fdyiavp6b8lbnrfcfvczbhbwm6vy0w0l4bq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31746,8 +31834,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.7.0"; - sha256 = "0n9a0bkf525gw1fcik6gmaarf5l7zmn29whiyrcp3dv7afqdfhwa"; + version = "0.4.8.0"; + sha256 = "0vqwrzr9axhxc2mvbwv4qzk5jgf9wplh2ss1hkbaqc9zp7wb4j7f"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -33212,8 +33300,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.4.3.0"; - sha256 = "0sv1l51gv6yf4zr4xv5icksmj59qxfzz80y0k5y10mzh7qgyxf88"; + version = "0.4.4.1"; + sha256 = "12mrgjhms4m9zjax6zqlzn9cisdr482sa642xh5p9h6hdp86ay59"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail hashable mtl scientific @@ -34242,8 +34330,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.68.2"; - sha256 = "1frinivjzyyjn9w3xqyr659wrjniv5598frdf9526g7ab484di8w"; + version = "0.5.68.3"; + sha256 = "1373ymh25ybaszfb0d6vs11zh9hw41a0x1gw9wxi18f5hk5jmbsk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34324,8 +34412,8 @@ self: { }: mkDerivation { pname = "backprop"; - version = "0.2.6.1"; - sha256 = "1rn72fawix00byz7kyvn65g0h16mh8msiw6lx9l3xi1927hn28nj"; + version = "0.2.6.2"; + sha256 = "10w3fb25jw7s3bal6hd0a7g5hzbdd4b3whzxkm9b3g0y36i713dm"; libraryHaskellDepends = [ base containers deepseq microlens primitive reflection transformers vector vinyl @@ -34670,22 +34758,6 @@ self: { }: mkDerivation { pname = "barbies"; - version = "1.1.1.0"; - sha256 = "1rlrsxddnlrhx15ki3pwh2hpvcawl5gd6x6i8n9n716ra2p6ca90"; - libraryHaskellDepends = [ base bifunctors ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Classes for working with types that can change clothes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "barbies_1_1_2_1" = callPackage - ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "barbies"; version = "1.1.2.1"; sha256 = "0svcdjs03i4ryhg3qzrp3l7ck0ilgnhxwc2h69qnzknqjklz7p1y"; libraryHaskellDepends = [ base bifunctors ]; @@ -34694,7 +34766,6 @@ self: { ]; description = "Classes for working with types that can change clothes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barchart" = callPackage @@ -34943,20 +35014,6 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.8"; - sha256 = "05s8s9zbnvcwnnd8z23jbdcjpd1h07c8fgaw0g9jl8mlpxbcdvmc"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Backwards-compatible orphan instances for base"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-orphans_0_8_1" = callPackage - ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck - }: - mkDerivation { - pname = "base-orphans"; version = "0.8.1"; sha256 = "1nwr9av27i9p72k0sn96mw3ywdczw65dy5gd5wxpabhhxlxdcas4"; libraryHaskellDepends = [ base ghc-prim ]; @@ -34964,7 +35021,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-prelude" = callPackage @@ -35015,6 +35071,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base32-z-bytestring" = callPackage + ({ mkDerivation, base, bytestring, cpu, criterion, hedgehog, tasty + , tasty-fail-fast, tasty-hedgehog, tasty-hspec, z-base32-bytestring + }: + mkDerivation { + pname = "base32-z-bytestring"; + version = "1.0.0.0"; + sha256 = "1r0235a2qqnavsm7jl807m555yd2k2vi2kfacw878v83zdr5qyix"; + libraryHaskellDepends = [ base bytestring cpu ]; + testHaskellDepends = [ + base bytestring hedgehog tasty tasty-fail-fast tasty-hedgehog + tasty-hspec z-base32-bytestring + ]; + benchmarkHaskellDepends = [ + base bytestring criterion z-base32-bytestring + ]; + description = "Fast z-base32 and z-base32hex codec for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {z-base32-bytestring = null;}; + "base32string" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }: mkDerivation { @@ -35102,30 +35180,6 @@ self: { "base64-bytestring-type" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty - , tasty-quickcheck, text - }: - mkDerivation { - pname = "base64-bytestring-type"; - version = "1"; - sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl"; - revision = "4"; - editedCabalFile = "0yfhy4a9n67l9w3amqrzzy79q47yyj6qbv5i5lqym5z7ygwmlzn6"; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring binary bytestring cereal - deepseq hashable QuickCheck text - ]; - testHaskellDepends = [ - aeson base binary bytestring cereal tasty tasty-quickcheck - ]; - description = "A newtype around ByteString, for base64 encoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "base64-bytestring-type_1_0_1" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring , binary, bytestring, cereal, deepseq, hashable, http-api-data , QuickCheck, serialise, tasty, tasty-quickcheck, text }: @@ -38499,8 +38553,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.0.1"; - sha256 = "1xnv6zg9rc8klsjvaqf524pvplhizydjdrfybxnfjsi4d3kp612g"; + version = "0.1.1.1"; + sha256 = "0gr7hqjdv9c5adghzf6jakwkhhpmza9a28bdcgrll02lsz8yb44g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38513,9 +38567,9 @@ self: { text-show typed-spreadsheet vector ]; executableHaskellDepends = [ - aeson base cassava colour diagrams diagrams-cairo diagrams-lib - hierarchical-spectral-clustering lens optparse-generic - sparse-linear-algebra text text-show vector + aeson base bytestring cassava colour containers diagrams + diagrams-cairo diagrams-lib hierarchical-spectral-clustering lens + optparse-generic sparse-linear-algebra text text-show vector ]; description = "Plot a colorful tree"; license = stdenv.lib.licenses.gpl3; @@ -39241,8 +39295,8 @@ self: { }: mkDerivation { pname = "bitvec"; - version = "0.2.0.0"; - sha256 = "024g2177c7br7spqqk6y61b3b7svyl9ghikx0rfydm0sl2dd9rii"; + version = "0.2.0.1"; + sha256 = "0mgmf60gy3nzp66mf4bydls46bddk76rz40zkdfp0hhsspasia9b"; libraryHaskellDepends = [ base primitive vector ]; testHaskellDepends = [ base HUnit primitive QuickCheck quickcheck-classes test-framework @@ -42746,8 +42800,8 @@ self: { }: mkDerivation { pname = "bv-sized"; - version = "0.6.0"; - sha256 = "0bhci00l4946z3b6ynzpi3k17bnawir88kqpp36jai8filb0znc5"; + version = "0.7.0"; + sha256 = "04fiqpd5kcq7lyas40axqn6mcngr1yymi1aiqgzip519qmdg73vl"; libraryHaskellDepends = [ base containers lens mtl parameterized-utils pretty QuickCheck random @@ -44292,15 +44346,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "cabal-rpm_0_13_1" = callPackage + "cabal-rpm_0_13_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , http-client, http-client-tls, http-conduit, process, simple-cmd , time, unix }: mkDerivation { pname = "cabal-rpm"; - version = "0.13.1"; - sha256 = "1k61jknk99hrw1h4kfkpl0905lgybidvlqn5ny6d54kr5f7fn9d3"; + version = "0.13.2"; + sha256 = "1q4nqmxd0cn023nm8dnlh40wqk3n7cd5v873bawhv6gmysgyxhn7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -45049,8 +45103,8 @@ self: { }: mkDerivation { pname = "cairo-core"; - version = "1.16.6"; - sha256 = "1rm3n46qlilnwxddnlz6gd3gglp7068h2fi90wm6xm6s9gpff2p8"; + version = "1.16.7"; + sha256 = "1v3zdhvhn5iv2i7k2pmwd6jfdb7h1zsa8px7xjlhar5n0p131vzr"; setupHaskellDepends = [ base bytestring Cabal directory filepath haskell-src-exts http-client http-client-tls hxt hxt-xpath @@ -46607,6 +46661,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "caster" = callPackage + ({ mkDerivation, base, bytestring, directory, fast-builder + , QuickCheck, quickcheck-instances, stm, tasty, tasty-discover + , tasty-hunit, tasty-quickcheck, text, unix-time + }: + mkDerivation { + pname = "caster"; + version = "0.0.1.0"; + sha256 = "0yybmrlqfki2v2952gf5xhfh5nr4dj0ldq780landjwh2ywrdcvq"; + libraryHaskellDepends = [ + base bytestring fast-builder stm text unix-time + ]; + testHaskellDepends = [ + base bytestring directory fast-builder QuickCheck + quickcheck-instances tasty tasty-discover tasty-hunit + tasty-quickcheck text + ]; + testToolDepends = [ tasty-discover ]; + description = "Multicast, thread-safe, and fast logger"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "castle" = callPackage ({ mkDerivation, base, containers, optparse-applicative, shelly , system-fileio, system-filepath, text @@ -46698,8 +46774,8 @@ self: { ({ mkDerivation, alg, base, transformers }: mkDerivation { pname = "category"; - version = "0.2.2.0"; - sha256 = "1a01i1jxvgwcvmg3n4zpsp1f9pfaj3h6kzv3as0l3dyrky7ma8r3"; + version = "0.2.4.0"; + sha256 = "0c1507vl3r91f401ccsnphhis8krrzj789vzx9ynlg2lfalkvnni"; libraryHaskellDepends = [ alg base transformers ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; @@ -48302,8 +48378,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.1.0.0"; - sha256 = "1rxna3jy50fddw33cjg603gdcmq89qr21q8syz60lm8rri0rg6bh"; + version = "0.2.0.0"; + sha256 = "01vgr2h1m5ww9j0239lv4k75sshhaa42kzi0bg8134j64i5k8ghd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51140,6 +51216,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark_0_6" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark"; + version = "0.6"; + sha256 = "1p41z6z8dqxk62287lvhhg4ayy9laai9ljh4azsnzb029v6mbv0d"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate CommonMark (Markdown) parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-gfm" = callPackage ({ mkDerivation, base, blaze-html, bytestring, cheapskate , criterion, discount, HUnit, markdown, sundown, text @@ -51157,6 +51251,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-gfm_0_2_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.2.0"; + sha256 = "03xflrkyw84qv3yjly5iks9311bqv5cmrmsylr763v4ph0fn7rjq"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -51555,8 +51667,8 @@ self: { }: mkDerivation { pname = "coalpit"; - version = "0.1.1.0"; - sha256 = "0adays54vg3pyrc3hsdmir0cj7h4r4vvm3a4zakia82gd8bz99iq"; + version = "0.1.1.1"; + sha256 = "0fv5xr71yldqwsm5n69akdc7jm1v9xhskjq5sjq7y72ghblcs6jl"; libraryHaskellDepends = [ base megaparsec network-uri scientific time ]; @@ -53539,8 +53651,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "2.0.4.0"; - sha256 = "1siz9jbwp33i32qwqyyz4yydbmsg35jfw7x7c82arpy401kmk1hk"; + version = "2.0.5.0"; + sha256 = "1iiqv3wkkqijdg9nxmc8c539wflc5yhp9b9d0g5nfkg01s376c98"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -53593,6 +53705,18 @@ self: { broken = true; }) {}; + "comprehensions-ghc" = callPackage + ({ mkDerivation, base, base-unicode-symbols, ghc, syb, util }: + mkDerivation { + pname = "comprehensions-ghc"; + version = "0.1.0.1"; + sha256 = "04s83q9mvsdnxy9glc15n1nbqk6imbdzi40skvvhasjppgb9ysbm"; + libraryHaskellDepends = [ base base-unicode-symbols ghc syb util ]; + testHaskellDepends = [ base ]; + description = "Plugin to generalize comprehensions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compressed" = callPackage ({ mkDerivation, base, comonad, containers, fingertree, hashable , keys, pointed, reducers, semigroupoids, semigroups @@ -56647,8 +56771,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.0"; - sha256 = "0i28vqzg7pgff0y8ill8zj8qbf1vqk3yfscvhrv5mcywp2fm6f31"; + version = "3.0.1"; + sha256 = "0sfvrk8ik6zaim6xlkvlnz3rnrqbiqvq7i6yxjiba74qx5w8yv4m"; libraryHaskellDepends = [ base copilot-c99 copilot-core copilot-language copilot-libraries copilot-theorem directory filepath optparse-applicative @@ -56666,8 +56790,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.0"; - sha256 = "11v8py8hgp76dlp2n3nw4gqw4s0jnq51vd26y8vi5k71jiwwp0k9"; + version = "3.0.1"; + sha256 = "11vrin2d0zfqzn3c9ikn1ra76m2083nlrk3l8j4hk0pnssy9kjvp"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -56700,8 +56824,8 @@ self: { ({ mkDerivation, base, containers, dlist, mtl, pretty, random }: mkDerivation { pname = "copilot-core"; - version = "3.0"; - sha256 = "0n6vczrc56hlgkya53apg0g64mvm648xhqqi174gxs45zlb23n9y"; + version = "3.0.1"; + sha256 = "0gq55db39fsg3kim83s86nw58f9wbg59nlrhi4ic70864iv55zs8"; libraryHaskellDepends = [ base containers dlist mtl pretty random ]; @@ -56717,8 +56841,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.0"; - sha256 = "094yfrg0szfmskznznlsiqi8ms6pbny7agc2w2qvsmlxn6rdhsk9"; + version = "3.0.1"; + sha256 = "1vx656vdjvdbsd3zv5cpb9xjvj85ylfqbbk8iibkbdgbq6sm11f6"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -57238,6 +57362,21 @@ self: { broken = true; }) {}; + "coya" = callPackage + ({ mkDerivation, base, groups, primitive, refined, semirings }: + mkDerivation { + pname = "coya"; + version = "0.1"; + sha256 = "1s5si8w7s16l6s89gnhzmpyr555njb0gws7xipp017m7130pwgx3"; + libraryHaskellDepends = [ + base groups primitive refined semirings + ]; + description = "Coya monoids"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "cparsing" = callPackage ({ mkDerivation, base, containers, directory, either, filepath , HUnit, lens, mtl, parsec, split, template-haskell, transformers @@ -57289,6 +57428,8 @@ self: { pname = "cpkg"; version = "0.1.1.1"; sha256 = "06nwkys90i0rdhg1nvwzii88z5f3ijn9kjwrg6lgy2m973zr8668"; + revision = "1"; + editedCabalFile = "0dqfgr06mv9xmqs2whzklzgj9ny17ncm6202bhykh9xp8qvzfbyy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57984,6 +58125,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crc32c" = callPackage + ({ mkDerivation, base, bytestring, c2hs, hspec, hspec-core + , QuickCheck + }: + mkDerivation { + pname = "crc32c"; + version = "0.0.0"; + sha256 = "1y008mi1livbm6rpc4rj4nnrkwqqm7xk92sdf14r5iqwj8nnh209"; + libraryHaskellDepends = [ base bytestring ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck + ]; + description = "Haskell bindings for crc32c"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "crdt" = callPackage ({ mkDerivation, base, binary, bytestring, containers, Diff , hashable, mtl, network-info, safe, stm, time, vector @@ -59112,8 +59270,6 @@ self: { ]; description = "Cryptol: The Language of Cryptography"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cryptonite" = callPackage @@ -62767,16 +62923,17 @@ self: { }) {}; "datadog-tracing" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, ffunctor - , generic-random, hspec-golden-aeson, http-media, msgpack, mtl - , prettyprinter, QuickCheck, quickcheck-text, refined, scientific - , servant, servant-client, servant-server, tasty, tasty-discover - , tasty-hspec, text, time, unordered-containers, vector, warp + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , ffunctor, generic-random, hspec-golden-aeson, http-media, msgpack + , mtl, prettyprinter, QuickCheck, quickcheck-text, refined + , scientific, servant, servant-client, servant-server, tasty + , tasty-discover, tasty-hspec, text, time, unordered-containers + , vector, wai-extra, warp }: mkDerivation { pname = "datadog-tracing"; - version = "1.3.2"; - sha256 = "0gag5cga8an4hd63n3vyjxrvgw309a8iw5if22j1dlc972qrzgs1"; + version = "1.4.0"; + sha256 = "02gdkh7yxjh2lnjjm4cgpabl0ywwqs145gd5in6s22999chf0hif"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62786,8 +62943,8 @@ self: { vector ]; executableHaskellDepends = [ - aeson base bytestring containers mtl servant servant-server text - warp + aeson base bytestring containers data-default mtl servant + servant-server text wai-extra warp ]; testHaskellDepends = [ aeson base bytestring containers hspec-golden-aeson mtl servant @@ -63309,8 +63466,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.4"; - sha256 = "1lzpvl4lfl84j56cdyn64gxm6zkgbjaczc41g235fikyx83vci88"; + version = "1.2.5"; + sha256 = "0s4j3j02iggvhzys9rnhr7m49dq8f5asv398jvsaibarjpdicnib"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -67454,6 +67611,26 @@ self: { broken = true; }) {}; + "dino" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, errors + , exceptions, hashable, monad-loops, mtl, tasty, tasty-quickcheck + , tasty-th, text, transformers, tree-view, unordered-containers + }: + mkDerivation { + pname = "dino"; + version = "0.1.1"; + sha256 = "05n0zsl9wvwilnmh28s89cda8a72qfbnhwkbbnw9yihpbamx59z9"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers errors exceptions hashable + monad-loops mtl text transformers tree-view unordered-containers + ]; + testHaskellDepends = [ + base tasty tasty-quickcheck tasty-th text unordered-containers + ]; + description = "A convenient tagless EDSL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "diophantine" = callPackage ({ mkDerivation, array, base, happy }: mkDerivation { @@ -68999,25 +69176,12 @@ self: { ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.8.0.5"; - sha256 = "0hqvjld86vna9m0za4g37nv2gml2s8q01208igp4l3dl76l8ma4q"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dlist_0_8_0_6" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: - mkDerivation { - pname = "dlist"; version = "0.8.0.6"; sha256 = "0gy70df86pfmqwbmnafdw2w5jnflvn5mca8npxzfg23f3p4ll2vq"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dlist-instances" = callPackage @@ -71354,8 +71518,8 @@ self: { }: mkDerivation { pname = "dynamic"; - version = "0.0.6"; - sha256 = "0z2mc09iffwh2wxp8j0kqpfh5nflnf3wzk554rx0l54sbszvxvw1"; + version = "0.1.0"; + sha256 = "186c1y2qh6fdc72icf3pcqcyp8g3yz4shsch24zfz0r7zhya5xza"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cassava containers http-conduit text unordered-containers vector @@ -72483,10 +72647,8 @@ self: { ({ mkDerivation, base, containers, newtype-generics, void }: mkDerivation { pname = "effects"; - version = "0.2.3"; - sha256 = "174mlzs1n2zw2jzxn95lkr8f2m2rjigvgpqljrvim9bsb991dhc0"; - revision = "1"; - editedCabalFile = "1vwywcrvb4qm3z7smxd9snvcwikyifl7fn8pxgiwchihm0ajnbvw"; + version = "0.2.4"; + sha256 = "06cx0l9vxpjpgc1cxai19hw9rxfq89m61qvf7wxp1w2xd6yqa7xk"; libraryHaskellDepends = [ base containers newtype-generics void ]; description = "Computational Effects"; license = stdenv.lib.licenses.bsd3; @@ -73713,22 +73875,6 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.10"; - sha256 = "0wfk5dkpaw0gk4p0vwdpb24c6kz4gjx0z4am79v5c3k38gmb3rak"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3_2_11" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; version = "2.3.2.11"; sha256 = "051h1l6x4dpk2jg1bsxy32zswf8ridlix3k78k0h237gcassrfpb"; libraryHaskellDepends = [ @@ -73737,7 +73883,6 @@ self: { testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -76373,8 +76518,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.2.2"; - sha256 = "0p2qz8z44mdlswan9cp9xpxwbbq345g9r4kh777q18x1k5jbf61j"; + version = "1.2.4"; + sha256 = "057nxlq78v3fzby9b0506gb85rlsv3j7q98y5asnv92n5i2barxm"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -76460,8 +76605,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exact-combinatorics"; - version = "0.2.0.8"; - sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j"; + version = "0.2.0.9"; + sha256 = "1ay98m9prmd1pi85v2n0rs2432hzb7mxizzg79sv0ln24an8amvj"; libraryHaskellDepends = [ base ]; description = "Efficient exact computation of combinatoric functions"; license = stdenv.lib.licenses.bsd3; @@ -76658,29 +76803,6 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.10.0"; - sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y"; - revision = "2"; - editedCabalFile = "0aiihbjfrlmxzw9q8idvr6mihhs7kbx9s3w1vj8x3pz27p0ncq7g"; - libraryHaskellDepends = [ - base mtl stm template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ - base mtl QuickCheck stm template-haskell test-framework - test-framework-hunit test-framework-quickcheck2 transformers - transformers-compat - ]; - description = "Extensible optionally-pure exceptions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "exceptions_0_10_1" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers, transformers-compat - }: - mkDerivation { - pname = "exceptions"; version = "0.10.1"; sha256 = "17fz74bi6qy3w7li7ifkcvsy3f9zyj69956jvaqvl5diyqnh791v"; libraryHaskellDepends = [ @@ -76693,7 +76815,6 @@ self: { ]; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exchangerates" = callPackage @@ -77518,8 +77639,8 @@ self: { pname = "extended-reals"; version = "0.2.3.0"; sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw"; - revision = "2"; - editedCabalFile = "020aliazf97zrhkcdpblmh9xakabdd8wdxg0667j4553rsijwqcy"; + revision = "3"; + editedCabalFile = "0v80m6cnpx1d43cfykz5jbiqkk7l51vmrd48sb8s1h8f2pp9v3dq"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -77595,30 +77716,32 @@ self: { }) {}; "extensible-effects-concurrent" = callPackage - ({ mkDerivation, async, base, containers, data-default, deepseq - , directory, exceptions, extensible-effects, filepath, HUnit, lens - , monad-control, mtl, parallel, process, QuickCheck - , safe-exceptions, stm, tasty, tasty-discover, tasty-hunit, time - , transformers-base + ({ mkDerivation, async, base, bytestring, containers, data-default + , deepseq, directory, exceptions, extensible-effects, filepath + , hostname, HUnit, lens, monad-control, mtl, network, parallel + , process, QuickCheck, safe-exceptions, stm, tasty, tasty-discover + , tasty-hunit, text, time, transformers-base }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.18.1"; - sha256 = "14kx3ipwz51g2qvdmz97v4mckglh6hajw6yzbzllqysgljs243cl"; + version = "0.21.1"; + sha256 = "1ijk6z4g6y5bfif5rv3w3ld2rfm1ad1sqqicpx9n6lkvh0awc3vp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base containers data-default deepseq exceptions - extensible-effects filepath lens monad-control mtl parallel process - QuickCheck safe-exceptions stm time transformers-base + async base bytestring containers data-default deepseq directory + exceptions extensible-effects filepath hostname lens monad-control + mtl network parallel process QuickCheck safe-exceptions stm text + time transformers-base ]; executableHaskellDepends = [ base data-default deepseq directory extensible-effects filepath - lens + lens text ]; testHaskellDepends = [ - async base containers data-default deepseq extensible-effects HUnit - lens QuickCheck stm tasty tasty-discover tasty-hunit + async base containers data-default deepseq extensible-effects + filepath hostname HUnit lens QuickCheck stm tasty tasty-discover + tasty-hunit text time ]; testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; @@ -77796,6 +77919,8 @@ self: { libraryHaskellDepends = [ base transformers z3 ]; description = "Z3 bonds with pure interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "f-ree-hack-cheats-free-v-bucks-generator" = callPackage @@ -77969,8 +78094,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "failable"; - version = "1.2.0.1"; - sha256 = "18lb0g4fi02mffhi61wd4rfcfx2ilrbrpl5wkyianw5mixjqlxms"; + version = "1.2.2.0"; + sha256 = "0cwnqipq23mhcadhxgqghsh5br8lrny7r3zlxiz05l7s3in5vsdk"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; @@ -78325,17 +78450,19 @@ self: { "fast-logger" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory - , easy-file, filepath, hspec, text, unix-compat, unix-time + , easy-file, filepath, hspec, hspec-discover, text, unix-compat + , unix-time }: mkDerivation { pname = "fast-logger"; - version = "2.4.13"; - sha256 = "1ciji847kcpg8zfld964wd20c5n554y3ak5340rn07k6dx0fzm2b"; + version = "2.4.15"; + sha256 = "1mf2awyvc336wmcjr7v99zvx6spz8fw5xzpn19x0fldy33dr89yf"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time ]; testHaskellDepends = [ base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79069,6 +79196,17 @@ self: { broken = true; }) {}; + "feather" = callPackage + ({ mkDerivation, base, containers, microlens-platform, mtl }: + mkDerivation { + pname = "feather"; + version = "0.1.0.0"; + sha256 = "03jpdg50g43lb3akfyfs0yh630igqfm0dg62bk4s5yv23cmbn8vf"; + libraryHaskellDepends = [ base containers microlens-platform mtl ]; + testHaskellDepends = [ base containers microlens-platform mtl ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "feature-flags" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -79182,6 +79320,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fedora-img-dl" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, http-client + , http-client-tls, http-directory, http-types, optparse-applicative + , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs + }: + mkDerivation { + pname = "fedora-img-dl"; + version = "0.2"; + sha256 = "0jk9wljmqszfjr4alhx13112bbdgi84662v1f1fslq8w0q17y3m2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath http-client http-client-tls + http-directory http-types optparse-applicative simple-cmd + simple-cmd-args text unix xdg-userdirs + ]; + description = "Fedora image download tool"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -79247,6 +79407,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed_1_1_0_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, HUnit + , markdown-unlit, old-locale, old-time, safe, test-framework + , test-framework-hunit, text, time, time-locale-compat, utf8-string + , xml-conduit, xml-types + }: + mkDerivation { + pname = "feed"; + version = "1.1.0.0"; + sha256 = "05hiasa6k13v1pzp9cs991zh04njda0ax9868rc7k906b19qqkjg"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat bytestring old-locale old-time safe text time + time-locale-compat utf8-string xml-conduit xml-types + ]; + testHaskellDepends = [ + base base-compat HUnit old-time test-framework test-framework-hunit + text time xml-conduit xml-types + ]; + testToolDepends = [ markdown-unlit ]; + description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "feed-cli" = callPackage ({ mkDerivation, base, directory, feed, old-locale, old-time, time , xml @@ -79725,20 +79910,20 @@ self: { }) {inherit (pkgs) fftw;}; "ffunctor" = callPackage - ({ mkDerivation, aeson, base, composition, http-client, mtl - , servant, servant-client, tasty, tasty-discover, tasty-hspec - , tasty-quickcheck, time + ({ mkDerivation, aeson, base, exceptions, generic-lens, http-client + , mtl, servant, servant-client, tasty, tasty-discover, tasty-hspec + , tasty-quickcheck, time, transformers, universum }: mkDerivation { pname = "ffunctor"; - version = "1.1.0"; - sha256 = "0y9x6xhpizg07d7nc3adk8x4ccy331w7if6jvq2p7hbyr57gbid7"; - revision = "1"; - editedCabalFile = "1x74grqgsjrbncpkz6iyyalfkhbs3vw0lfzv6s1bfd6zx0j4lggv"; - libraryHaskellDepends = [ base ]; + version = "1.1.99"; + sha256 = "0b6r72921cr6xrwwnvlw7ndnhfyavrk5a4vsgz3xvisf3i0slb4c"; + revision = "2"; + editedCabalFile = "0772irhfscf3bkxgiy33g7np8wrkdc8pzc7pnap362qvd8v2xkjj"; + libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ - aeson base composition http-client mtl servant servant-client tasty - tasty-hspec tasty-quickcheck time + aeson base exceptions generic-lens http-client mtl servant + servant-client tasty tasty-hspec tasty-quickcheck time universum ]; testToolDepends = [ tasty-discover ]; description = "FFunctor typeclass"; @@ -81772,25 +81957,12 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.17"; - sha256 = "06adx3drx4b283v0aawhzyigvjizbhig8lqxw9cgqfn1pvc1kv46"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_18" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; version = "1.0.18"; sha256 = "1cyac1la7pg7hkpdd2lhk4clh6g1zd2n0f479xvgn14ibs6ki3ph"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -81974,8 +82146,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.7.0.4"; - sha256 = "1v130jcya7qhm29byfz8wazbi4yvv5pmmwp07fhpaffm1hq8v03k"; + version = "0.8.0.0"; + sha256 = "0gidczc4d3gi97w7ck3xp7q4amvnhkyzfpksyxc8r6cyfz29n9ic"; configureFlags = [ "-fopengl" ]; isLibrary = true; isExecutable = true; @@ -82058,8 +82230,8 @@ self: { }: mkDerivation { pname = "fltkhs-themes"; - version = "0.1.0.7"; - sha256 = "1x6250avaa14dqnhf6gzbgvxqvb1gpsx279aazgn7rjaz5r018d3"; + version = "0.2.0.0"; + sha256 = "1hmyr5vnv7inkjnffadfjiwp9fwsw9jr0c45dcbk5gs9kwpa77zz"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -82357,12 +82529,18 @@ self: { }) {}; "focus" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, transformers + }: mkDerivation { pname = "focus"; - version = "1.0.1.2"; - sha256 = "00kfc71cvkrpckmhn8qi90vzc4x0mqdqha088n558hd44kyygx5d"; + version = "1.0.1.3"; + sha256 = "1g10fzy76k5bjn8ysym8ywvrqrvxvhdi4b99wabhzznhzmankddx"; libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; description = "A general abstraction for manipulating elements of container data structures"; license = stdenv.lib.licenses.mit; }) {}; @@ -85593,6 +85771,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fused-effects-exceptions" = callPackage + ({ mkDerivation, base, fused-effects, safe-exceptions }: + mkDerivation { + pname = "fused-effects-exceptions"; + version = "0.1.0.0"; + sha256 = "0ga4cjlmrc577gps0mhy37n1np2ds0wcfnq3nbhvz3fy3m5fzylz"; + libraryHaskellDepends = [ base fused-effects safe-exceptions ]; + description = "Handle exceptions thrown in IO with fused-effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fused-effects-lens" = callPackage ({ mkDerivation, base, fused-effects, hspec, lens }: mkDerivation { @@ -85630,13 +85821,13 @@ self: { , megaparsec, mtl, neat-interpolation, parallel, parser-combinators , process, process-extras, QuickCheck, random, regex-tdfa, srcloc , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary - , text, time, transformers, utf8-string, vector + , terminal-size, text, time, transformers, utf8-string, vector , vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.10.1"; - sha256 = "03lmzl9z75vfy0phr1vkcxjkqhl1n9avkib7awflib90a6jhpl15"; + version = "0.10.2"; + sha256 = "0mff8kdjihakaf2gmy3a1ln9ghnqis72gqldssp9b4ahn2xni1v8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85646,8 +85837,9 @@ self: { http-client-tls http-conduit language-c-quote mainland-pretty markdown megaparsec mtl neat-interpolation parallel parser-combinators process process-extras random regex-tdfa srcloc - template-haskell temporary text time transformers utf8-string - vector vector-binary-instances versions zip-archive zlib + template-haskell temporary terminal-size text time transformers + utf8-string vector vector-binary-instances versions zip-archive + zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; @@ -88426,35 +88618,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_6_1" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers + "ghc_8_6_4" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap - , ghci, happy, hpc, process, template-haskell, terminfo, time + , ghci, hpc, process, template-haskell, terminfo, time , transformers, unix }: mkDerivation { pname = "ghc"; - version = "8.6.1"; - sha256 = "1s4iggkyki6fd1wv9l5qgpnkyf1wgyf2mcncj6jwl4whrii3r7br"; + version = "8.6.4"; + sha256 = "1ninm000qkpvvfgfrlvj0259451wwmfayh46px3zg6mkr19x64yi"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell terminfo time transformers unix ]; - libraryToolDepends = [ alex happy ]; description = "The GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot_8_6_1" = callPackage + "ghc-boot_8_6_4" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.6.1"; - sha256 = "0dy9p2vz7ccwrhk9l4vs4fhfg6w9p7pk88iy44i46089svzx0wja"; + version = "8.6.4"; + sha256 = "1clk84l47bdyj74jykyzqzlwxgpwhs2r9x9bxfnw6f7c24xiv4xp"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -88463,12 +88654,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_6_1" = callPackage + "ghc-boot-th_8_6_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.6.1"; - sha256 = "0z3d9niqzsv1zihazs1ghdwag53fcmdigj77z37licc5q0g0lc49"; + version = "8.6.4"; + sha256 = "15hvcns1vpagx0bdpzgm1cgwnxvz4cbbhbzsvdzpl8zf4y0jd8jz"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = stdenv.lib.licenses.bsd3; @@ -88563,14 +88754,15 @@ self: { }) {}; "ghc-dump-core" = callPackage - ({ mkDerivation, base, bytestring, filepath, ghc, serialise, text + ({ mkDerivation, base, bytestring, directory, filepath, ghc + , serialise, text }: mkDerivation { pname = "ghc-dump-core"; - version = "0.1.0.0"; - sha256 = "036hpykq1ibnnb4sm0k4ljcqj2m7qf8kdycdmids9qfhz3kldms2"; + version = "0.1.1.0"; + sha256 = "0mksk6qhsnjd19yx79nw3dygfsfkyq52mdywikg21s67j8d4dxv5"; libraryHaskellDepends = [ - base bytestring filepath ghc serialise text + base bytestring directory filepath ghc serialise text ]; description = "An AST and compiler plugin for dumping GHC's Core representation"; license = stdenv.lib.licenses.bsd3; @@ -88611,8 +88803,8 @@ self: { }: mkDerivation { pname = "ghc-dump-util"; - version = "0.1.0.0"; - sha256 = "0d8d5nc9nnfk0qnxjg7mdfc1cfalycwi1bb8x3m1f9ndy29hzrb1"; + version = "0.1.1.0"; + sha256 = "0x93y0ymf3fl977j3c3liz1c52q5b2fw5h1ivsw3dazpmrm62n7m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88891,19 +89083,19 @@ self: { "ghc-lib" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-prim, happy, haskeline, hpc - , pretty, process, time, transformers, unix + , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy + , haskeline, hpc, pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "0.20190204"; - sha256 = "1983wg1in81b2wvqgl8431rgfdzzafqzl2x5bzlanvhiv0vjwcqy"; + version = "0.20190402"; + sha256 = "1w91n0bh5xyfgzk4kgn43s3wnx4a0h2la9phwf11327ajiacch4l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - ghc-prim hpc pretty process time transformers unix + ghc-lib-parser ghc-prim hpc pretty process time transformers unix ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -88914,6 +89106,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 = "0.20190402"; + sha256 = "0ppp7grcmbml472yi766hsmzlnwvb6dawr4f72k41s3xwkfpjmpg"; + 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-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -89303,20 +89514,6 @@ self: { ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.3.0"; - sha256 = "077cvrx25qdl04qgp3wl7c3jxrakw1k873dwgybfwkhgfj2g8dx1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ghc text ]; - testHaskellDepends = [ base hspec text ]; - testToolDepends = [ hspec-discover ]; - description = "Syntax highlighter for Haskell using lexer of GHC itself"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-syntax-highlighter_0_0_3_1" = callPackage - ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: - mkDerivation { - pname = "ghc-syntax-highlighter"; version = "0.0.3.1"; sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7"; enableSeparateDataOutput = true; @@ -89325,7 +89522,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Syntax highlighter for Haskell using lexer of GHC itself"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -89501,15 +89697,15 @@ self: { broken = true; }) {}; - "ghci_8_6_1" = callPackage + "ghci_8_6_4" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap , template-haskell, transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.6.1"; - sha256 = "0ffv5xmq63y53fhfldx37g6881l07nvlgdsp9kfqz70flh0c1wm8"; + version = "8.6.4"; + sha256 = "0gjl2bs2alv56j45khylcdjm3cl71kfcadc83lw3b1zpiinhkb7m"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th ghc-heap template-haskell transformers unix @@ -89526,8 +89722,8 @@ self: { }: mkDerivation { pname = "ghci-dap"; - version = "0.0.11.0"; - sha256 = "19skxwhv5lgm4vs53y7gckrdrqhcsp7p47gc3lxfkdjqrvskvzks"; + version = "0.0.12.0"; + sha256 = "1a5jcwvxw7fsjdn3p8lrn3ww24bwdjj6x09zi0pc6fzwwjrjkk2d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89671,6 +89867,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_7_3" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.7.3"; + sha256 = "00af44r0y4n8nz9sc8mgbydgwzjmp32yrnf1k15lrlyahqrixhfl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs directory extra filepath process time + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -89744,17 +89967,20 @@ self: { }) {}; "ghcjs-dom" = callPackage - ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: + ({ mkDerivation, base, containers, ghcjs-dom-jsaddle, text + , transformers + }: mkDerivation { pname = "ghcjs-dom"; - version = "0.9.2.0"; - sha256 = "0yhvnxrh68rc33h3m6zg6vzc4byr1yg09zfxn7g39skzn1mrj0aa"; + version = "0.9.4.0"; + sha256 = "0vw3b45shbj1xvx729rrzjanb2wy49l182j11kv8hid1jcb9mwnl"; libraryHaskellDepends = [ - base ghcjs-dom-jsaddle text transformers + base containers ghcjs-dom-jsaddle text transformers ]; - doHaddock = false; description = "DOM library that supports both GHCJS and GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghcjs-dom-hello" = callPackage @@ -89783,20 +90009,22 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.9.2.0"; - sha256 = "05ings3n2zlgnwg9a17s21yzh4pnag1cz62yyddaxbqpxn4xkj6l"; + version = "0.9.4.0"; + sha256 = "059qhv1y0q5cgk72fl9spc2l2mxwyw8wzkbmhyliwr6869az48f7"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghcjs-dom-jsffi" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.9.2.0"; - sha256 = "1xj94izrypxnb91lgsq0lfzqqs11sxbs24nkw8sn2wkmmh5pd8vd"; + version = "0.9.4.0"; + sha256 = "02m0qszdl3kxyhjrzj1ph9gwbr9jkzak2v1b47v6ywsm7hmjgn7w"; description = "DOM library using JSFFI and GHCJS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -90511,8 +90739,8 @@ self: { }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.15"; - sha256 = "1znsrbzin2fxdb7gkip0qhr335f9pinaszn2r320j05sz6k8qdfw"; + version = "2.0.16"; + sha256 = "11wfmvjgl6lmmdanz5jmmvf4289c9jiylxfn006shc4pby7ay6i8"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk @@ -91874,6 +92102,22 @@ self: { broken = true; }) {}; + "gitlab-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, text, transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.1.0.1"; + sha256 = "1gvhfdlh6x500qms0kfqsyf0c934rm0xw1z1gv8zzb7nssndiann"; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types text + transformers unliftio unliftio-core + ]; + description = "A Haskell library for the GitLab web API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -97403,27 +97647,6 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.2.4"; - sha256 = "11agvhvpv94rnylc5ch5cg90w5z1i0ywdw47yca83503lmv3y790"; - libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector - ]; - description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-core_0_1_2_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, QuickCheck, scientific - , semigroups, text, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "greskell-core"; version = "0.1.2.5"; sha256 = "1lxz9l968f8jgyyqvph3rvsfnh0kqdmnam95cn97jrfwcndc0wmp"; libraryHaskellDepends = [ @@ -97436,7 +97659,6 @@ self: { ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-websocket" = callPackage @@ -100799,8 +101021,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.2.1.2"; - sha256 = "0jzyf5mqmigsjmif1nxysqk2rg1ad9d3590qmw71gx6d83qm4w2z"; + version = "0.2.3.0"; + sha256 = "12g7nlfci2hrsqi19z8mi7i8vqd1s7a8c3sr8k43f0hhzk6b528i"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -104373,8 +104595,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.29.0"; - sha256 = "1m4lirrlgw1vavk1rnr22lcbzasa0sd90mn1ghzwhij86dmfxldr"; + version = "0.0.30.0"; + sha256 = "0vr5bc3qkd0h6rb3s4bihg4m9g9z0vzjz6w4m4m2gkw7c1pnirvs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104774,8 +104996,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.8.1.0"; - sha256 = "1imy96hhhs2fcbs34pln0l430j19n4nqsgir4hww95wbl0058kcx"; + version = "0.8.2.0"; + sha256 = "18qkrybwvmyz5h03xj9wjigpqs6s6rw9wi1lqcla4ppg1pkd5zyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104825,8 +105047,8 @@ self: { }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.8.0.1"; - sha256 = "0czh6fqrzzp5xkawwiia5n437pmch41rnkp166lpvglfqg4gx8y8"; + version = "0.8.2.0"; + sha256 = "13pgjm1pm1hp7bln115cn75ig6w3mj7g7rvnvpszlrg9lzmk3ip7"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri scientific text unordered-containers @@ -105429,8 +105651,8 @@ self: { }: mkDerivation { pname = "haskell-src-exts-util"; - version = "0.2.4"; - sha256 = "1xbf28aisqizy3a0sy42p3rwib2s7jaqi6dcr6lp4b1j54xazf5y"; + version = "0.2.5"; + sha256 = "0fvqi72m74p7q5sbpy8m2chm8a1lgy10mfrcxcz8wrh59vngj0n8"; libraryHaskellDepends = [ base containers data-default haskell-src-exts semigroups transformers uniplate @@ -106763,6 +106985,33 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "haskoin-core_0_9_0" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring + , cereal, conduit, containers, cryptonite, entropy, hashable, hspec + , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck + , safe, scientific, secp256k1-haskell, split, string-conversions + , text, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "haskoin-core"; + version = "0.9.0"; + sha256 = "1kwk3ycb4hjybsj43fg5khg2i5rgfrlwcmp7hknyzgzyshmwj1bx"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bytestring cereal conduit + containers cryptonite entropy hashable memory mtl murmur3 network + QuickCheck scientific secp256k1-haskell split string-conversions + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring cereal containers hspec HUnit mtl QuickCheck + safe split string-conversions text unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Bitcoin & Bitcoin Cash library for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskoin-crypto" = callPackage ({ mkDerivation, base, binary, byteable, bytestring, containers , cryptohash, haskoin-util, HUnit, mtl, QuickCheck, test-framework @@ -106797,8 +107046,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.9.6"; - sha256 = "1mcncj4j5xa650y36irffrbpb5r79xna84vpjyc21nkdqag0yqa3"; + version = "0.9.9"; + sha256 = "0d4bv1wr3c89x7r6aakvvwklwzk8g90bl21bc52k4d88znyclqvm"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -106876,8 +107125,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.13.0"; - sha256 = "0b34x0z44dw7k9dqn9qx66sy33jfgg7ky1ysh7cv25g1w6v7slqy"; + version = "0.14.0"; + sha256 = "0d508vs1rhj54iixh1m4s7jcszav83bwbxd7g6d4hgn0vwf2l1wh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107990,16 +108239,16 @@ self: { }) {}; "hasql-transaction" = callPackage - ({ mkDerivation, async, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, contravariant-extras - , hasql, mtl, rebase, transformers + ({ mkDerivation, async, base, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, hasql, mtl, rebase + , transformers }: mkDerivation { pname = "hasql-transaction"; - version = "0.7"; - sha256 = "1kvzj16mw471z2vgm27k0nfwfgf5cq3w6qaqwqz4247p11dkrjyy"; + version = "0.7.1"; + sha256 = "02isgjzx3dhp5a7zgz2pbvm6fwmgbnwbqz7k01argf4pawckb8s9"; libraryHaskellDepends = [ - base base-prelude bytestring bytestring-tree-builder contravariant + base bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers ]; testHaskellDepends = [ async hasql rebase ]; @@ -109787,6 +110036,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heavy-log-shortcuts" = callPackage + ({ mkDerivation, base, fast-logger, heavy-logger, monad-control + , text, text-format-heavy + }: + mkDerivation { + pname = "heavy-log-shortcuts"; + version = "1.0.1"; + sha256 = "1fgfsp4999cdzwx6h945wj75fnmg0gw8iqs4xgah4255ld42a28r"; + libraryHaskellDepends = [ + base fast-logger heavy-logger monad-control text text-format-heavy + ]; + description = "Simle api for heavy logger"; + license = stdenv.lib.licenses.mit; + }) {}; + "heavy-logger" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default, fast-logger, hsyslog, lifted-base, monad-control @@ -110056,7 +110320,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_0" = callPackage + "hedis_0_12_1" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -110064,8 +110328,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.0"; - sha256 = "0p4blmyilc4piw9riripsix5v61r24y4ikr58b9gwwnvxdm99190"; + version = "0.12.1"; + sha256 = "01l8fmwwanw00bj3rzyv8k9swgvvzbvh920li67w10w5qlwvmgri"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -112518,6 +112782,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "higgledy" = callPackage + ({ mkDerivation, barbies, base, doctest, generic-lens, hspec, lens + , QuickCheck + }: + mkDerivation { + pname = "higgledy"; + version = "0.1.1.0"; + sha256 = "0qkmf8bjg311a01qwb20vcihk1w8q4avy3lcfz0rj7qqhmfp6542"; + libraryHaskellDepends = [ barbies base generic-lens QuickCheck ]; + testHaskellDepends = [ base doctest hspec lens QuickCheck ]; + description = "Partial types as a type constructor"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "highWaterMark" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -113712,8 +113992,8 @@ self: { }: mkDerivation { pname = "hjugement"; - version = "2.0.1.20190208"; - sha256 = "10921dk9y460dmgy5dhkfxcsc96cxkw2xxziykizp8zhmzrdlwz6"; + version = "2.0.2.20190414"; + sha256 = "0w9qmsy7b118wzdhz8ggyw2608sjhsaxzaw121lhzr8vbaznh6pi"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -113948,6 +114228,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hledger-flow" = callPackage + ({ mkDerivation, base, containers, foldl, HUnit, stm, text, time + , turtle + }: + mkDerivation { + pname = "hledger-flow"; + version = "0.11.0.0"; + sha256 = "1zjmy80r7iifj4cw53jskxqnnhrn8ysall5nx7xxhzfx4mwixq6f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers foldl stm text time turtle + ]; + executableHaskellDepends = [ base text turtle ]; + testHaskellDepends = [ + base containers foldl HUnit stm text turtle + ]; + description = "An hledger workflow focusing on automated statement import and classification"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hledger-iadd" = callPackage ({ mkDerivation, base, brick, containers, directory, free , hledger-lib, hspec, hspec-discover, megaparsec, microlens @@ -114059,8 +114360,8 @@ self: { }: mkDerivation { pname = "hledger-makeitso"; - version = "0.9.0.1"; - sha256 = "1114yxv9n7zpay1yn962jjrdmaryv3f4p4aiqph1h0b2zj4bli0r"; + version = "0.10.0.0"; + sha256 = "1gwlrh248vd9m07388ijvd1dxrsbhlf6jj5s0715ph9h1hrlb1jq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114230,8 +114531,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.15"; - sha256 = "0xvr9b0ys0il0g0z145pxwyr3vq6fj571gad4858mpmqdvjh4b0i"; + version = "2.1.16"; + sha256 = "027v3aigghmghwbiwkhv9iadwv15fa40brkin489ahi6jwrlnp32"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -118081,23 +118382,11 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "hs-functors"; - version = "0.1.3.0"; - sha256 = "1j7g5s82f8c1j4hans28m63bwi612j8kfrb7n9cdqqzlc1r804ik"; - libraryHaskellDepends = [ base transformers ]; - description = "Functors from products of Haskell and its dual to Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hs-functors_0_1_4_0" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "hs-functors"; version = "0.1.4.0"; sha256 = "0crih1v1zg0w1m4xcsz1v00j4x2w82fdd17bkhiqa1d56kx3d1af"; libraryHaskellDepends = [ base transformers ]; description = "Functors from products of Haskell and its dual to Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-gchart" = callPackage @@ -123028,7 +123317,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_6_2" = callPackage + "http-client_0_6_4" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -123037,8 +123326,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.6.2"; - sha256 = "1w22n2jqbwwzgljaw9frhhmkm7bq6xzdcmd4z6mhx35n3a4nshlv"; + version = "0.6.4"; + sha256 = "1n9rnbp8lwkd4whi2anniywi4y1bn9kx6nzfigfvz28d7pn7i4in"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -123300,7 +123589,7 @@ self: { }) {}; "http-conduit" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, hspec, http-client, http-client-tls , http-types, HUnit, mtl, network, resourcet, streaming-commons @@ -123309,10 +123598,10 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.3.6.1"; - sha256 = "0rjrs6kx9dzgln5k0rfjlrwvrk7ixfppmq1qaq574kxw3ry3snj4"; + version = "2.3.7"; + sha256 = "18pj7f5gl72ry2mq2dqbm21spacn5ig14yr0xsdyq7yzs64kq17y"; libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra http-client + aeson attoparsec base bytestring conduit conduit-extra http-client http-client-tls http-types mtl resourcet transformers unliftio-core ]; testHaskellDepends = [ @@ -123391,6 +123680,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-directory" = callPackage + ({ mkDerivation, base, bytestring, html-conduit, http-client + , http-date, http-types, text, time, xml-conduit + }: + mkDerivation { + pname = "http-directory"; + version = "0.1.1"; + sha256 = "1wv92w3dfsxp4y9qai6qxxv7fq807p9vcmm844ggcc9xblmmcr4r"; + libraryHaskellDepends = [ + base bytestring html-conduit http-client http-date http-types text + time xml-conduit + ]; + description = "http directory listing library"; + license = stdenv.lib.licenses.mit; + }) {}; + "http-dispatch" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-client, http-client-tls, http-types @@ -123696,8 +124001,8 @@ self: { }: mkDerivation { pname = "http-proxy"; - version = "0.1.0.6"; - sha256 = "0ixj9bcz8pw6rgdlzbp7p12v43vrkajbmr5b8fnsmzwcz6s3i3zg"; + version = "0.1.1.0"; + sha256 = "1nzihn2qxm066avzgill1nxa0174ggv54bacsn871a0ai7n03079"; libraryHaskellDepends = [ async base blaze-builder bytestring bytestring-lexing case-insensitive conduit conduit-extra http-client http-conduit @@ -123911,15 +124216,16 @@ self: { }) {}; "http2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , case-insensitive, containers, criterion, directory, doctest - , filepath, Glob, heaps, hex, hspec, mwc-random, network-byte-order - , psqueues, stm, text, unordered-containers, vector, word8 + ({ mkDerivation, aeson, aeson-pretty, array, base + , base16-bytestring, bytestring, case-insensitive, containers + , criterion, directory, doctest, filepath, Glob, heaps, hspec + , mwc-random, network-byte-order, psqueues, stm, text + , unordered-containers, vector, word8 }: mkDerivation { pname = "http2"; - version = "1.6.4"; - sha256 = "0rhy7z67bmbb15kxq9fmpgvqmc3npsbf1ym04cg07ymq9ihxvjig"; + version = "1.6.5"; + sha256 = "1vlmy8vnp6ml2n2pr11aa5fzigldsscgzmibrni64ykgfvpd3sqn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123927,8 +124233,8 @@ self: { network-byte-order psqueues stm ]; testHaskellDepends = [ - aeson aeson-pretty array base bytestring case-insensitive - containers directory doctest filepath Glob hex hspec + aeson aeson-pretty array base base16-bytestring bytestring + case-insensitive containers directory doctest filepath Glob hspec network-byte-order psqueues stm text unordered-containers vector word8 ]; @@ -124007,6 +124313,8 @@ self: { ]; description = "Types for gRPC over HTTP2 common for client and servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "httpd-shed" = callPackage @@ -124803,6 +125111,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hvega_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, text, vector }: + mkDerivation { + pname = "hvega"; + version = "0.2.0.0"; + sha256 = "07ynsm2karz34wyrszkcmk6xm2pw684isgc7gjnlnn1wq2gbyj9k"; + libraryHaskellDepends = [ aeson base text vector ]; + description = "Create Vega-Lite visualizations in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-aeson" = callPackage ({ mkDerivation, aeson, base, hedgehog, hspec, text }: mkDerivation { @@ -124840,13 +125160,13 @@ self: { "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec - , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, QuickCheck - , safe, vector + , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim + , hw-string-parse, QuickCheck, safe, vector }: mkDerivation { pname = "hw-bits"; - version = "0.7.0.5"; - sha256 = "1p3bqkzsmmz66chrwykj8pawgg7m5dvzsqmr9lrsdxldgqq62i8s"; + version = "0.7.0.6"; + sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm"; libraryHaskellDepends = [ base bytestring hw-int hw-prim hw-string-parse safe vector ]; @@ -124854,35 +125174,33 @@ self: { base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck vector ]; - benchmarkHaskellDepends = [ base criterion hw-prim vector ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion vector ]; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; - "hw-bits_0_7_0_6" = callPackage - ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim - , hw-string-parse, QuickCheck, safe, vector + "hw-ci-assist" = callPackage + ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog + , hw-hspec-hedgehog, optparse-applicative }: mkDerivation { - pname = "hw-bits"; - version = "0.7.0.6"; - sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm"; - libraryHaskellDepends = [ - base bytestring hw-int hw-prim hw-string-parse safe vector - ]; + pname = "hw-ci-assist"; + version = "0.1.0.0"; + sha256 = "0r7ng4is9y2d9bh2fmww2b66zc7m7a8k98g9nw7fwbvb5z02q8yd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ - base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck - vector + base hedgehog hspec hw-hedgehog hw-hspec-hedgehog ]; testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Bit manipulation"; + doHaddock = false; + description = "CI Assistant for Haskell projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hw-conduit" = callPackage @@ -124937,15 +125255,15 @@ self: { "hw-dsv" = callPackage ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion - , deepseq, directory, ghc-prim, hedgehog, hspec, hw-bits - , hw-hspec-hedgehog, hw-prim, hw-rankselect, hw-rankselect-base - , hw-simd, lens, mmap, optparse-applicative, resourcet, text - , vector, weigh + , deepseq, directory, generic-lens, ghc-prim, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim + , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap + , optparse-applicative, resourcet, text, vector, weigh }: mkDerivation { pname = "hw-dsv"; - version = "0.3.4"; - sha256 = "0bp9c2023iyalsgf5ih9aray1ifbmarqkl88whwrkh333lys946f"; + version = "0.3.5"; + sha256 = "15dy96ah7frs79g102vvsrihzlk2qc5c773y7bqdcm66mjhin3x2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124953,8 +125271,8 @@ self: { hw-rankselect hw-rankselect-base hw-simd vector ]; executableHaskellDepends = [ - base bits-extra bytestring deepseq ghc-prim hedgehog hw-bits - hw-prim hw-rankselect hw-rankselect-base hw-simd lens + base bits-extra bytestring deepseq generic-lens ghc-prim hedgehog + hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd lens optparse-applicative resourcet vector ]; testHaskellDepends = [ @@ -124962,6 +125280,7 @@ self: { hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base hw-simd text vector weigh ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bits-extra bytestring cassava criterion deepseq directory ghc-prim hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd @@ -125214,18 +125533,18 @@ self: { broken = true; }) {}; - "hw-json_1_0_0_1" = callPackage + "hw-json_1_0_0_2" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bits-extra, bytestring, criterion, directory, dlist, hedgehog - , hspec, hspec-discover, hw-balancedparens, hw-bits + , bits-extra, bytestring, criterion, directory, dlist, generic-lens + , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits , hw-hspec-hedgehog, hw-json-simd, hw-mquery, hw-parser, hw-prim , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap , optparse-applicative, text, transformers, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "1.0.0.1"; - sha256 = "1svynix1vilp6w5azm0nlkx3b92m5x8plnj8jnw4k6ybr4mdw32b"; + version = "1.0.0.2"; + sha256 = "0lb38kfxhamvdhp6z3aw4as57nc6jxf6wj7nr3lmiry6h2gx15js"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125234,8 +125553,8 @@ self: { hw-rankselect-base hw-simd mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring dlist hw-balancedparens hw-json-simd hw-mquery - hw-prim hw-rankselect hw-rankselect-base lens mmap + base bytestring dlist generic-lens hw-balancedparens hw-json-simd + hw-mquery hw-prim hw-rankselect hw-rankselect-base lens mmap optparse-applicative vector ]; testHaskellDepends = [ @@ -125279,8 +125598,8 @@ self: { }: mkDerivation { pname = "hw-json-simd"; - version = "0.1.0.1"; - sha256 = "0pi67lyx9ysvgfsk75a4yzmfrn65f7i65pp2m6z5hd5svali37sw"; + version = "0.1.0.2"; + sha256 = "13i41ppi3ncisfyl3jvpgf4cbx86gyy0maq1xm0jipplkr78844w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -125452,31 +125771,6 @@ self: { "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups - , transformers, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.6.2.22"; - sha256 = "16dfajzylki7g7p8q2a79dvx3xymxkrpckajdks9k3q4rxsc6k0i"; - libraryHaskellDepends = [ - base bytestring mmap semigroups transformers vector - ]; - testHaskellDepends = [ - base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector - ]; - benchmarkHaskellDepends = [ - base bytestring criterion mmap semigroups transformers vector - ]; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-prim_0_6_2_23" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, mmap , QuickCheck, semigroups, transformers, vector }: @@ -125622,13 +125916,13 @@ self: { "hw-simd" = callPackage ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava , containers, criterion, deepseq, directory, hedgehog, hspec - , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, text, vector + , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim + , hw-rankselect, hw-rankselect-base, lens, mmap, text, vector }: mkDerivation { pname = "hw-simd"; - version = "0.1.1.3"; - sha256 = "0wryx86ycpcyw1dyp2ks1j0rk7pk6yqihmwsa1sij1pf36qdkbrq"; + version = "0.1.1.4"; + sha256 = "1rc4zzp3h87zqrdsgwvc9vxydv200jk7q02vcqfk23wqg0sxvpw0"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base vector @@ -125639,6 +125933,7 @@ self: { hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base lens text vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bits-extra bytestring cassava containers criterion deepseq directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap @@ -127996,8 +128291,8 @@ self: { ({ mkDerivation, aeson, base, hvega, ihaskell, text }: mkDerivation { pname = "ihaskell-hvega"; - version = "0.1.0.3"; - sha256 = "0dkqw6hs2388jgghpq5xgdsh3gwvv274axj84nawg2blpqf3d4fb"; + version = "0.2.0.0"; + sha256 = "01y03r7jwxwvcs0hy8jjxz4lxg9hl5088g060w2c6pcnbz6zj7zj"; libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; @@ -128952,25 +129247,6 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.3.2.1"; - sha256 = "07banm2lnrhjvihs0iaij0kqgff198qcbah02s3cjyyl70cmllfr"; - libraryHaskellDepends = [ base monoid-subclasses ]; - 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_3_2_2" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "incremental-parser"; version = "0.3.2.2"; sha256 = "0mnqi0fnh5sl1fp74gcwvfm6mxhzrs1x7yl235yl0dhcyjp3vfx7"; libraryHaskellDepends = [ base monoid-subclasses ]; @@ -128982,7 +129258,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 @@ -129415,30 +129690,6 @@ self: { "influxdb" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, QuickCheck, scientific - , tagged, template-haskell, text, time, unordered-containers - , vector - }: - mkDerivation { - pname = "influxdb"; - version = "1.6.1.2"; - sha256 = "1bzy78amw6k02bi2fjm2i8vah9lwxpy2fdlq35gdsffhwrif29mg"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_6_1_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, lens, network, optional-args, scientific, tagged , template-haskell, text, time, unordered-containers, vector }: @@ -129457,7 +129708,6 @@ self: { testHaskellDepends = [ base doctest template-haskell ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -132444,8 +132694,8 @@ self: { }: mkDerivation { pname = "ivory"; - version = "0.1.0.8"; - sha256 = "0nwn5h1fnnh9a6fkznscix50yvzqpw50hai7rslfzgizpbnzckrk"; + version = "0.1.0.9"; + sha256 = "1gml49dhjjciw71h0g7pn9bw5irghs5kkl6zgabyk4isfh9dllr1"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-abstraction th-lift @@ -132520,8 +132770,8 @@ self: { }: mkDerivation { pname = "ivory-eval"; - version = "0.1.0.5"; - sha256 = "0qpn6iaixispg6fzhmpx63fl859skacr05n2nm5prxz1ryl13605"; + version = "0.1.0.6"; + sha256 = "0009sndrv9m672wzkd8klmi10yc8ckzcszx1d224xm0qs2hhy0v3"; libraryHaskellDepends = [ base base-compat containers ivory monadLib ]; @@ -132619,8 +132869,8 @@ self: { }: mkDerivation { pname = "ivory-serialize"; - version = "0.1.0.5"; - sha256 = "16hsvfrcrvqwcj75d1xdpb9njh0j66wy7vf4yv7q6vk7papvrwsf"; + version = "0.1.0.6"; + sha256 = "1v8gf92z7g8ihcbnqalpjbbsm1z24242ysar9cg0dfq8n5if226a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat filepath ivory ivory-artifact monadLib @@ -132982,19 +133232,18 @@ self: { "jammittools" = callPackage ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio - , containers, directory, filepath, HPDF, JuicyPixels, process - , resourcet, temporary, text, transformers, vector, xml + , containers, directory, filepath, JuicyPixels, process, resourcet + , text, transformers, vector, xml }: mkDerivation { pname = "jammittools"; - version = "0.5.5.1"; - sha256 = "1q660fvnvrj8cb9rzj7b5qmrbmqy8krq2w1bg824mf6pmvlw52z6"; + version = "0.5.5.2"; + sha256 = "0x7zyyn7q9j5d74bkvf5pbm5i6kcxv7v107j1z26x5m42gibs9kv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring conduit conduit-audio containers directory filepath - HPDF JuicyPixels process resourcet temporary text transformers - vector xml + JuicyPixels process resourcet text transformers vector xml ]; executableHaskellDepends = [ base boxes directory filepath ]; description = "Export sheet music and audio from Windows/Mac app Jammit"; @@ -133890,6 +134139,8 @@ self: { ]; description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsaddle-hello" = callPackage @@ -136694,14 +136945,13 @@ self: { }: mkDerivation { pname = "keycloak-hs"; - version = "0.0.0.4"; - sha256 = "1b4h0qn5gmc3h7k301f6fg4dh56w91fbi6jmk06mh8mqwg15qbdl"; + version = "0.1.1"; + sha256 = "1ags7q66g37qr2l3cd5bzhvy4i2q1knwjaswx49v2r50klqxbzyd"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring containers exceptions hslogger http-api-data http-client http-types jwt lens mtl string-conversions text word8 wreq ]; - testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -138585,15 +138835,16 @@ self: { }) {}; "language-asn" = callPackage - ({ mkDerivation, base, bytestring, contravariant, hashable, pretty - , primitive, text, vector + ({ mkDerivation, aeson, base, bytestring, contravariant, hashable + , pretty, primitive, text, vector }: mkDerivation { pname = "language-asn"; - version = "0.1.0.0"; - sha256 = "0pjzcnw5d9j8nif0w8ibh3rnsgpv710ng8w8hsrcsbq7qm02sp7f"; + version = "0.1.1.0"; + sha256 = "0ynqpfws2ga2v79cmlxxg1nl7w228mz9znbxj4mxpsbqyc9j25zg"; libraryHaskellDepends = [ - base bytestring contravariant hashable pretty primitive text vector + aeson base bytestring contravariant hashable pretty primitive text + vector ]; description = "ASN.1 encoding and decoding"; license = stdenv.lib.licenses.bsd3; @@ -143150,16 +143401,16 @@ self: { "line-bot-sdk" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base64-bytestring - , bytestring, cryptohash-sha256, errors, hspec, hspec-expectations - , hspec-wai, http-api-data, http-client, http-client-tls - , http-types, scientific, servant, servant-client + , bytestring, cryptohash-sha256, errors, free, hspec + , hspec-expectations, hspec-wai, http-api-data, http-client + , http-client-tls, http-types, scientific, servant, servant-client , servant-client-core, servant-server, string-conversions, text , time, transformers, wai, wai-extra, warp }: mkDerivation { pname = "line-bot-sdk"; - version = "0.4.0.0"; - sha256 = "0gi3k6wlcp6q01nxwrsamqkwqfl42sa11nf7bg37kdw0xqsam68s"; + version = "0.5.0.0"; + sha256 = "135l32xf28ric12ya9mfis6rixd4cyfp3801dr6q8di4vvfgblm4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143174,9 +143425,9 @@ self: { ]; testHaskellDepends = [ aeson aeson-qq base base64-bytestring bytestring cryptohash-sha256 - hspec hspec-expectations hspec-wai http-client http-types servant - servant-client servant-client-core servant-server text transformers - wai warp + free hspec hspec-expectations hspec-wai http-client 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; @@ -144050,23 +144301,22 @@ self: { ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "liquidhaskell-cabal"; - version = "0.1.1.0"; - sha256 = "0qwpssjq2xiajhkx4jdmzkcvlhi6921dkgplih5jiq4i64av50zy"; + version = "0.2.0.0"; + sha256 = "1kxdl46m4fzv9d1c74b4xqgbw4qqah4sm4z296kb5cz2fmij4hmk"; libraryHaskellDepends = [ base Cabal filepath ]; - description = "Liquid Haskell integration for Cabal and stack"; + description = "Liquid Haskell integration for Cabal and Stack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquidhaskell-cabal-demo" = callPackage - ({ mkDerivation, base, liquidhaskell-cabal }: + ({ mkDerivation, base, Cabal, liquidhaskell-cabal }: mkDerivation { pname = "liquidhaskell-cabal-demo"; - version = "0.1.1.0"; - sha256 = "08hyyh2sjamb7qsmy85j4dg0szvifkzazhi8v9qi1pxw1mivc727"; + version = "0.2.0.1"; + sha256 = "0pwmdzdkidrbz8sgx0qs9kq4i5jrb7nlrlhjkp7v4lb1wr7vgjy9"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal liquidhaskell-cabal ]; libraryHaskellDepends = [ base liquidhaskell-cabal ]; executableHaskellDepends = [ base liquidhaskell-cabal ]; description = "Demo of Liquid Haskell integration for Cabal and stack"; @@ -145498,6 +145748,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-base_0_8_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, mmorph, monad-control, monad-time, mtl, semigroups + , stm, text, time, transformers-base, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "log-base"; + version = "0.8.0.0"; + sha256 = "15539v6y6s46kgb86ns13rh17c1qnidwdajk26yaxyqky58yx2m6"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq exceptions mmorph + monad-control monad-time mtl semigroups stm text time + transformers-base unliftio-core unordered-containers + ]; + description = "Structured logging solution (base package)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving @@ -146679,8 +146949,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.0.2"; - sha256 = "0g5kw8y59bdyzj7zzwif1810q7wk87d7q53idpw250g6s4dwycxa"; + version = "0.5.1.0"; + sha256 = "1kmffpfq6cnby3gij5sd1p2fp8hhn7gjk1nm5a4hs2gfhlyik57y"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -149413,7 +149683,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_3_0_0" = callPackage + "massiv_0_3_0_1" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest , containers, data-default, data-default-class, deepseq, doctest , exceptions, hspec, primitive, QuickCheck, scheduler @@ -149421,8 +149691,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.3.0.0"; - sha256 = "17hi5n8jg15kljnhbl3crqpkqfm4wj2rdz6r9fyqqh2ky8l50c6j"; + version = "0.3.0.1"; + sha256 = "175dhcpv9gki3rb9vr1xig1sw6hams20clxql9y61xfhv0hryj0v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -149430,7 +149700,7 @@ self: { ]; testHaskellDepends = [ async base bytestring containers data-default deepseq doctest hspec - QuickCheck scheduler template-haskell unliftio vector + QuickCheck template-haskell unliftio vector ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; @@ -149443,22 +149713,6 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.1.5.0"; - sha256 = "1vgq6rdmnh3v2rgch9k46sw9jfwhfpngxxl4cz0w1pjsjq7sp2fw"; - libraryHaskellDepends = [ - base bytestring data-default deepseq directory filepath JuicyPixels - massiv netpbm process vector - ]; - description = "Import/export of Image files into massiv Arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv-io_0_1_6_0" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq, directory - , filepath, JuicyPixels, massiv, netpbm, process, vector - }: - mkDerivation { - pname = "massiv-io"; version = "0.1.6.0"; sha256 = "0ggl24w7y9bhlf0dh379raiq8fi2gb29whypp3jy37h8m6ldsngn"; libraryHaskellDepends = [ @@ -149467,7 +149721,6 @@ self: { ]; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-scheduler" = callPackage @@ -149954,8 +150207,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.2.0"; - sha256 = "04nw298cv880svk211gf5lzbv2wmr5cz01h0qwzdgjg4v43s49kp"; + version = "50200.3.1"; + sha256 = "0szcdiva6b4xkgjpxyvm200n8y5bdc3lk1yw06y3i907fz573q2i"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -149985,22 +150238,22 @@ self: { "mattermost-api" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, connection - , containers, gitrev, hashable, HTTP, HUnit, memory, microlens - , microlens-th, mtl, network-uri, pretty-show, process + , containers, gitrev, hashable, HTTP, http-media, HUnit, memory + , microlens, microlens-th, mtl, network-uri, pretty-show, process , resource-pool, stm, tasty, tasty-hunit, template-haskell, text , time, unordered-containers, websockets }: mkDerivation { pname = "mattermost-api"; - version = "50200.1.2"; - sha256 = "130cv44ajyraxxf41llydmnfzybl747ly1gip31xsrkicrzm20bs"; + version = "50200.1.4"; + sha256 = "10z6h0d629i89yrlx7rww6j274dr57y6inlay3211k1vbfp25b62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring connection containers gitrev hashable - HTTP memory microlens microlens-th network-uri pretty-show process - resource-pool stm template-haskell text time unordered-containers - websockets + HTTP http-media memory microlens microlens-th network-uri + pretty-show process resource-pool stm template-haskell text time + unordered-containers websockets ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit @@ -150016,8 +150269,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.1.2"; - sha256 = "1r11n7zkqi6ph58zhgcrxjjapawmhlk4dcg4ixs420qkdpr45q11"; + version = "50200.1.4"; + sha256 = "057m7i55bp1d5fs9imcfqbzwb54q8pqz7pvmjwkbf0w5kd111kly"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -151277,22 +151530,6 @@ self: { }: mkDerivation { pname = "menshen"; - version = "0.0.2"; - sha256 = "05z6vmxgxfsl4s5bsxrkd929mfml0yk51gwinhwv9c090f5yvbli"; - libraryHaskellDepends = [ base regex-tdfa scientific text ]; - testHaskellDepends = [ - aeson base hspec QuickCheck regex-tdfa scientific text - ]; - description = "Data Validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "menshen_0_0_3" = callPackage - ({ mkDerivation, aeson, base, hspec, QuickCheck, regex-tdfa - , scientific, text - }: - mkDerivation { - pname = "menshen"; version = "0.0.3"; sha256 = "0zx530ksb0zmczbl6k70xg6pxgr2wfga2pg0ghgmpgd9f307xrwb"; libraryHaskellDepends = [ base regex-tdfa scientific text ]; @@ -151301,7 +151538,6 @@ self: { ]; description = "Data Validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mercury-api" = callPackage @@ -151580,20 +151816,21 @@ self: { }) {}; "metar" = callPackage - ({ mkDerivation, base, checkers, deriving-compat, HTTP, lens - , network-uri, QuickCheck, semigroupoids, semigroups, tagsoup - , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck - , transformers + ({ mkDerivation, base, bytestring, checkers, deriving-compat, HTTP + , http-client, lens, network-uri, QuickCheck, semigroupoids + , semigroups, tagsoup, tagsoup-selection, tasty, tasty-hunit + , tasty-quickcheck, transformers, wreq }: mkDerivation { pname = "metar"; - version = "0.0.2"; - sha256 = "1iaqjzy1a7hkvcni6ijkwwcsb433j3gkx9f7z8ng1yhlbcr9a556"; + version = "0.0.3"; + sha256 = "15irfjx9knfy977b0ka2hiwl6gh7cl3x39by4zkbc0njnqk68vvh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deriving-compat HTTP lens network-uri semigroupoids semigroups - tagsoup tagsoup-selection transformers + base bytestring deriving-compat HTTP http-client lens network-uri + semigroupoids semigroups tagsoup tagsoup-selection transformers + wreq ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -152535,6 +152772,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-mail_0_5_0" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring + , filepath, hspec, process, random, text + }: + mkDerivation { + pname = "mime-mail"; + version = "0.5.0"; + sha256 = "0vs302vbdf8y58nxky0m2w7cbqs4laljk969sfnbxl8zq7k3ic0h"; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder bytestring filepath process + random text + ]; + testHaskellDepends = [ base blaze-builder bytestring hspec text ]; + description = "Compose MIME email messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mime-mail-ses" = callPackage ({ mkDerivation, base, base64-bytestring, byteable, bytestring , conduit, cryptohash, http-client, http-client-tls, http-conduit @@ -152689,6 +152944,36 @@ self: { broken = true; }) {}; + "minilight" = callPackage + ({ mkDerivation, aeson, base, containers, exceptions, FontyFruity + , hashable, linear, microlens, microlens-mtl, mtl, mwc-random + , scientific, sdl2, sdl2-gfx, sdl2-image, sdl2-ttf, tasty + , tasty-discover, tasty-hspec, template-haskell, text, trifecta + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "minilight"; + version = "0.1.1"; + sha256 = "0wl37m7wz5jdq4hwcbrnd0m5lhz9mgfk6p8ysinjwfc1458g8v91"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers exceptions FontyFruity hashable linear + microlens microlens-mtl mtl mwc-random scientific sdl2 sdl2-gfx + sdl2-image sdl2-ttf template-haskell text trifecta + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + base linear microlens mtl mwc-random sdl2 sdl2-ttf text vector + ]; + testHaskellDepends = [ + aeson base tasty tasty-hspec trifecta yaml + ]; + testToolDepends = [ tasty-discover ]; + description = "A SDL2-based graphics library, batteries-included"; + license = stdenv.lib.licenses.mit; + }) {}; + "minimal-configuration" = callPackage ({ mkDerivation, base, containers, directory, filepath, tconfig }: mkDerivation { @@ -152884,6 +153169,20 @@ self: { broken = true; }) {}; + "minitypeset-opengl" = callPackage + ({ mkDerivation, base, containers, filepath, OpenGL, stb-truetype + }: + mkDerivation { + pname = "minitypeset-opengl"; + version = "0.1.0.0"; + sha256 = "06fh4j0sfpd8w576s04a6bg6h4c7lsk7zm85dlcfhlghyg2gwri1"; + libraryHaskellDepends = [ + base containers filepath OpenGL stb-truetype + ]; + description = "Layout and render text with TrueType fonts using OpenGL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "miniutter" = callPackage ({ mkDerivation, base, binary, containers, HUnit, minimorph , test-framework, test-framework-hunit, text @@ -153277,16 +153576,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mixed-types-num_0_3_2" = callPackage - ({ mkDerivation, base, convertible, hspec, hspec-smallcheck - , QuickCheck, smallcheck, template-haskell + "mixed-types-num_0_4_0_1" = callPackage + ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck + , smallcheck, template-haskell }: mkDerivation { pname = "mixed-types-num"; - version = "0.3.2"; - sha256 = "1jr9kdsrv90laspiy5l99apd1rd197jzlvlsz8xdgcm8rpffizs9"; + version = "0.4.0.1"; + sha256 = "10fkqb4d534nr5yqdybmvrbg3alfjvki4qxg20ma8mwxyiz4wc5g"; libraryHaskellDepends = [ - base convertible hspec hspec-smallcheck QuickCheck smallcheck + base hspec hspec-smallcheck mtl QuickCheck smallcheck template-haskell ]; testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; @@ -155121,6 +155420,8 @@ self: { pname = "monadLib"; version = "3.9"; sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm"; + revision = "1"; + editedCabalFile = "1vxd4ncwbg77vvny77b771lbh0xjdwim3lmpd14zcfqqpy0gn9bj"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -156057,24 +156358,26 @@ self: { ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude , base16-bytestring, base58-bytestring, bifunctors, bytestring , containers, cryptonite, data-default, directory, filepath, fmt - , formatting, hspec, hspec-golden-aeson, HUnit, lens, megaparsec - , memory, morley-prelude, mtl, named, optparse-applicative - , parser-combinators, pretty-simple, QuickCheck - , quickcheck-arbitrary-adt, quickcheck-instances, singletons, text - , time, timerep, transformers-compat, universum, vinyl + , formatting, hex-text, hspec, hspec-golden-aeson, HUnit, lens + , megaparsec, memory, morley-prelude, mtl, named + , optparse-applicative, parser-combinators, pretty-simple + , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances + , singletons, text, time, timerep, transformers-compat, universum + , vinyl, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "0.1.0.5"; - sha256 = "1ymkr805wmwd3vpsyjwbfwryvixz3lpl8g24ygsv1ipc4v3cvxj4"; + version = "0.2.0.1"; + sha256 = "1mkc3hfhm9isnw2m2zvdpmjcxw8fh2s7gzcp5r532spy2pv82wiz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-options aeson-pretty base-noprelude base16-bytestring base58-bytestring bifunctors bytestring containers cryptonite - data-default directory fmt formatting hspec lens megaparsec memory - morley-prelude mtl named parser-combinators QuickCheck singletons - text time timerep transformers-compat vinyl + data-default directory fmt formatting hex-text hspec lens + megaparsec memory morley-prelude mtl named parser-combinators + QuickCheck singletons text time timerep transformers-compat vinyl + wl-pprint-text ]; executableHaskellDepends = [ base-noprelude fmt megaparsec morley-prelude named @@ -156096,8 +156399,8 @@ self: { ({ mkDerivation, base-noprelude, universum }: mkDerivation { pname = "morley-prelude"; - version = "0.1.0.3"; - sha256 = "0rrh3zdrdyxi8hhf4iw6rxgz4cfbfm25a906k9lfxlp668nbn2si"; + version = "0.1.0.4"; + sha256 = "0k96m27ix80awh6cg7qncps6nn2gd0yr423b5gc22rw4ayqsdlr1"; libraryHaskellDepends = [ base-noprelude universum ]; description = "A custom prelude used in Morley"; license = stdenv.lib.licenses.agpl3Plus; @@ -157558,8 +157861,8 @@ self: { }: mkDerivation { pname = "multipool"; - version = "0.1.0.1"; - sha256 = "1mcdsn4ja9w8bnxrz4dglwbzq6bxg5xq2iik8da49n8l8ah2xq78"; + version = "0.2.0.0"; + sha256 = "18yqwwys9rf65zshc7wzxzs5x3viq6a9cvdx09k40sxywj5253xx"; libraryHaskellDepends = [ base bytestring hashable monad-logger mtl persistent resource-pool text unordered-containers @@ -157573,18 +157876,20 @@ self: { }) {}; "multipool-persistent" = callPackage - ({ mkDerivation, base, mtl, multipool, persistent, unliftio-core - , unordered-containers + ({ mkDerivation, base, mtl, multipool, persistent, resource-pool + , unliftio-core, unordered-containers }: mkDerivation { pname = "multipool-persistent"; - version = "0.1.0.1"; - sha256 = "0nw56wpgwvzk8ib3av42zkpj5xviw3m3qlig791rl4074yj60wn2"; + version = "0.2.0.0"; + sha256 = "0n5q2yhyf2w6v1abxlaqai8i62r1vxjcka1lnq50ci9b2l9q7sdm"; libraryHaskellDepends = [ - base mtl multipool persistent unliftio-core unordered-containers + base mtl multipool persistent resource-pool unliftio-core + unordered-containers ]; testHaskellDepends = [ - base mtl multipool persistent unliftio-core unordered-containers + base mtl multipool persistent resource-pool unliftio-core + unordered-containers ]; description = "Read and write from appropriate persistent sql instances in replicated environments"; license = stdenv.lib.licenses.bsd3; @@ -157598,8 +157903,8 @@ self: { }: mkDerivation { pname = "multipool-persistent-postgresql"; - version = "0.1.1.0"; - sha256 = "0hna597qbsa81rly8cmxj45ix6iyw83w9v4ai9gpm5yb5g21bdf9"; + version = "0.2.0.0"; + sha256 = "1wc4wl471lnz0v04jzl3f8kdx59bw0ylb1hp544afxvpmp44q1gr"; libraryHaskellDepends = [ base monad-logger mtl multipool multipool-persistent persistent persistent-postgresql persistent-qq postgresql-common-persistent @@ -157621,8 +157926,8 @@ self: { }: mkDerivation { pname = "multipool-postgresql-simple"; - version = "0.1.0.2"; - sha256 = "0hm31i06pvx0yj5in44wqsxrghjb4m1rkf9ccmdy0x2g7643rlv5"; + version = "0.2.0.0"; + sha256 = "05l8a06jjdz8j789axpf5w9mpzv1q2jpjvsi4sf75ysrkgaqbwyh"; libraryHaskellDepends = [ base bytestring mtl multipool postgresql-simple resource-pool unliftio-core unordered-containers @@ -165740,8 +166045,8 @@ self: { ({ mkDerivation, aeson, base, data-default, text, time }: mkDerivation { pname = "opench-meteo"; - version = "0.2.0.2"; - sha256 = "0xj9v7xl11j6p4kk5dz64kqpmyc5d68sldakiaby0j8qvyw7sf9r"; + version = "0.2.0.3"; + sha256 = "1cvcqv6fx9jszrlv46xn7b3rfxk4bymzc42ndzzvnpwj592yd55i"; libraryHaskellDepends = [ aeson base data-default text time ]; description = "A Haskell implementation of the Swiss Meteo Net data API"; license = stdenv.lib.licenses.bsd3; @@ -167194,6 +167499,25 @@ self: { broken = true; }) {}; + "orion-hs" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, aeson-casing, base + , base64-bytestring, bytestring, containers, exceptions, hslogger + , http-api-data, http-client, http-types, iso8601-time, lens, mtl + , string-conversions, text, time, unordered-containers, word8, wreq + }: + mkDerivation { + pname = "orion-hs"; + version = "0.1.3"; + sha256 = "1q99s1yd4qk51lxv6ahbcw9wmy1asd9aymw2yw2802c3yvzyypx4"; + libraryHaskellDepends = [ + aeson aeson-better-errors aeson-casing base base64-bytestring + bytestring containers exceptions hslogger http-api-data http-client + http-types iso8601-time lens mtl string-conversions text time + unordered-containers word8 wreq + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "orizentic" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, jwt , mtl, optparse-applicative, random, text, time, uuid @@ -168117,37 +168441,40 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_7_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , binary, blaze-html, blaze-markup, bytestring, case-insensitive - , cmark-gfm, containers, criterion, data-default, deepseq, Diff - , directory, doctemplates, exceptions, executable-path, filepath - , Glob, haddock-library, hslua, hslua-module-text, HsYAML, HTTP - , http-client, http-client-tls, http-types, ipynb, JuicyPixels, mtl - , network, network-uri, pandoc-types, parsec, process, QuickCheck - , random, safe, SHA, skylighting, split, syb, tagsoup, tasty + "pandoc_2_7_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, cmark-gfm, containers, criterion, data-default + , deepseq, Diff, directory, doctemplates, exceptions + , executable-path, filepath, Glob, haddock-library, hslua + , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls + , http-types, ipynb, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, split, syb, tagsoup, tasty , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath , text, time, unicode-transforms, unix, unordered-containers , vector, weigh, xml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.7.1"; - sha256 = "1f0yipnf46hdj0f1x9z41pimc88mirgp1fgp2pv3kyz063qm2ajy"; + version = "2.7.2"; + sha256 = "1qjla7zk8whx17qapmv3zji6b98qdpd464gwhi4zv8g4hfzv7010"; + revision = "1"; + editedCabalFile = "0xxnb1arycrlxjqnnka4gsz7nff70ahvr6zbrladhigian4mpk9z"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring binary blaze-html - blaze-markup bytestring case-insensitive cmark-gfm containers - data-default deepseq directory doctemplates exceptions filepath - Glob haddock-library hslua hslua-module-text HsYAML HTTP + aeson aeson-pretty attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive cmark-gfm + containers data-default deepseq directory doctemplates exceptions + filepath Glob haddock-library hslua hslua-module-text HsYAML HTTP http-client http-client-tls http-types ipynb JuicyPixels mtl - network network-uri pandoc-types parsec process random safe SHA - skylighting split syb tagsoup temporary texmath text time - unicode-transforms unix unordered-containers vector xml zip-archive - zlib + network network-uri pandoc-types parsec process random safe + scientific SHA skylighting split syb tagsoup temporary texmath text + time unicode-transforms unix unordered-containers vector xml + zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -168510,25 +168837,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_2_0_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hashable - , hspec, hspec-expectations, pandoc-types, random, tasty - , tasty-hspec, tasty-hunit, temporary, text, typed-process + "pandoc-pyplot_2_1_0_1" = callPackage + ({ mkDerivation, base, containers, data-default-class, directory + , filepath, hashable, hspec, hspec-expectations, pandoc + , pandoc-types, tasty, tasty-hspec, tasty-hunit, temporary, text + , typed-process, yaml }: mkDerivation { pname = "pandoc-pyplot"; - version = "2.0.0.0"; - sha256 = "0mh934ab65fbncva9nmgs8mifsjkh57ay952wl5rn9s6037fj5m5"; + version = "2.1.0.1"; + sha256 = "0hhsy90chq3ap54816qhpplxg4c8iwdvx8xrcrn2n0p3yi2ma0yi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath hashable pandoc-types random - temporary text typed-process + base containers data-default-class directory filepath hashable + pandoc pandoc-types temporary text typed-process yaml + ]; + executableHaskellDepends = [ + base data-default-class directory pandoc-types ]; - executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ - base directory filepath hspec hspec-expectations pandoc-types tasty - tasty-hspec tasty-hunit temporary text + base data-default-class directory filepath hspec hspec-expectations + pandoc-types tasty tasty-hspec tasty-hunit temporary text ]; description = "A Pandoc filter for including figures generated from Matplotlib"; license = stdenv.lib.licenses.mit; @@ -169343,18 +169673,18 @@ self: { }) {}; "parameterized-utils" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, hashable - , hashtables, lens, mtl, QuickCheck, tasty, tasty-ant-xml + ({ mkDerivation, base, constraints, containers, deepseq, ghc-prim + , hashable, hashtables, lens, mtl, QuickCheck, tasty, tasty-ant-xml , tasty-hunit, tasty-quickcheck, template-haskell, text , th-abstraction, vector }: mkDerivation { pname = "parameterized-utils"; - version = "1.0.1"; - sha256 = "0pcn1jiv5rhdm5nk6lg1xcr7cx7vsbl25n8slpf257khq23fjp6m"; + version = "2.0"; + sha256 = "0wbgjpwmiqll5pjfcf3p2ds3jaqvwx4m2v12a4r658fv18s9c14n"; libraryHaskellDepends = [ - base containers deepseq ghc-prim hashable hashtables lens mtl - template-haskell text th-abstraction vector + base constraints containers deepseq ghc-prim hashable hashtables + lens mtl template-haskell text th-abstraction vector ]; testHaskellDepends = [ base ghc-prim hashable hashtables lens mtl QuickCheck tasty @@ -169849,8 +170179,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "1.0.1"; - sha256 = "0cpa1j1r7gpyj1n9b1kam4wq6fjn6qh2a1w7m95k614sls7spxgd"; + version = "1.0.2"; + sha256 = "1wb6xbx3p9fyisza9d7svnby4makv2bkp0yh7lfi2bg3kybg41ry"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -169991,8 +170321,8 @@ self: { }: mkDerivation { pname = "parsix"; - version = "0.1.0.4"; - sha256 = "0ay3a07sj52r413s921519crvd3kf7i4zdmpqy6k1spzqnwzc9nc"; + version = "0.2.0.0"; + sha256 = "07azgir8gkjbr2if8cvcmlqf3v9bi27w4xh922j0r9q1c3ry7k5i"; libraryHaskellDepends = [ base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers @@ -171939,8 +172269,8 @@ self: { }: mkDerivation { pname = "persist"; - version = "0.1.1.1"; - sha256 = "1r14xfaa4rncv7sgrm6lznab8yyj6wh65yvzh2j2prwpjqswy5b7"; + version = "0.1.1.2"; + sha256 = "08l59z7jc1ij7y497yjvv0q9bcd100l3bkdj4zwjl3dx6fhz2gq2"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -172051,10 +172381,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.9.1"; - sha256 = "1b6shb1d8p7dapj428glmsy7w69424bxrvgf7ws8jd266h4gshk7"; - revision = "1"; - editedCabalFile = "1ing9cdpafmfx0mpvrl3xzfvmw5aw2lpiq69nnhrsmlhb9pi8ni0"; + version = "2.9.2"; + sha256 = "1wsa3kn427v88a6r0vwr6mz23snik2krbsgc8zqp18xajqn5szj9"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers fast-logger http-api-data @@ -172347,10 +172675,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.9.0"; - sha256 = "1rqlbdz7wwjl1d3xqp01sz5xnn8hff35hgkhx6c66lzrfyl9q0mx"; - revision = "1"; - editedCabalFile = "0xrnww7n6kwr2371fj5xklslbx0114yj3pxcpdzwalmin5wm8vah"; + version = "2.9.1"; + sha256 = "02i5lq6j79cv1y6n7c3lzipngkwaqfa96i4nvnkrs535x9xbxlpq"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger persistent postgresql-libpq postgresql-simple resource-pool @@ -172385,10 +172711,8 @@ self: { }: mkDerivation { pname = "persistent-qq"; - version = "2.9.0"; - sha256 = "02dvsmlamfy93490qhb9qq25vq8wrqhzzza5q5shvak1n7wgjvh0"; - revision = "1"; - editedCabalFile = "15zkam90rfq33549kqpwyllrjpdvgkcpwnv16y6n439xd96vyyci"; + version = "2.9.1"; + sha256 = "1zwvdm94sl4wlycyz5xm41p8g4b10qra53g9pxcfq6b7gl15cggd"; libraryHaskellDepends = [ base haskell-src-meta mtl persistent template-haskell text ]; @@ -172532,8 +172856,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.9.2"; - sha256 = "1pmmy1a1zi64c0v9sfawd3mz8qfidrrc3i9ghdhrmfqq1d0kir8g"; + version = "2.9.3"; + sha256 = "13wbn88ixv4d4dfjl1gabm1q60fbcnygbmixz57pi3z84drrynwq"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -173807,8 +174131,8 @@ self: { }: mkDerivation { pname = "ping"; - version = "0.1.0.1"; - sha256 = "0zrs98927wfnxw00125pssgw8i8yz7hlrd9043dmw7fviajay6n0"; + version = "0.1.0.2"; + sha256 = "1cjgs571q5p5r5j94w8cax20r951v08x3cq5a2wd5r852bbgg9ww"; libraryHaskellDepends = [ base cpu ip posix-api primitive primitive-containers stm transformers @@ -176167,6 +176491,8 @@ self: { pname = "pointful"; version = "1.0.11.0"; sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; + revision = "1"; + editedCabalFile = "1a7fc03c586w011amjq770ifvf7ajbp9x3xp2w2yz1da9rkga2qv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176527,6 +176853,30 @@ self: { license = "LGPL"; }) {}; + "polysemy" = callPackage + ({ mkDerivation, base, criterion, free, freer-simple, hspec + , inspection-testing, mtl, random, syb, template-haskell + , transformers + }: + mkDerivation { + pname = "polysemy"; + version = "0.1.1.0"; + sha256 = "02x99b3pral2sclx4zizib9a7yrnahg0d5kc4w37yk15mpr5lmys"; + libraryHaskellDepends = [ + base mtl random syb template-haskell transformers + ]; + testHaskellDepends = [ + base hspec inspection-testing mtl random syb template-haskell + transformers + ]; + benchmarkHaskellDepends = [ + base criterion free freer-simple mtl random syb template-haskell + transformers + ]; + description = "Higher-order, low-boilerplate, zero-cost free monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "polyseq" = callPackage ({ mkDerivation, array, base, bytestring, cgi, containers , free-theorems, haskell-src, mtl, network, old-locale, old-time @@ -178859,8 +179209,8 @@ self: { pname = "presburger"; version = "1.3.1"; sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6"; - revision = "1"; - editedCabalFile = "0pabxck7iyhyj7wf1bflg86xb2jip4vaspf080rfdc5s2cg0d23w"; + revision = "2"; + editedCabalFile = "0295mpzywmg6qrp90fnl51pvr7nwzc2n5p51w90j735il0pqpa3q"; libraryHaskellDepends = [ base containers pretty ]; testHaskellDepends = [ base QuickCheck ]; description = "A decision procedure for quantifier-free linear arithmetic"; @@ -180901,8 +181251,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.6.1"; - sha256 = "1wbh9vc0jkdqsrqfnxvz2498awqkr0jph9qv6c0zwbqm7zbjzn04"; + version = "5.7.0"; + sha256 = "0a46lqc77l4dlimvqf57n48zf0qschk04xyjbvyhcj4yw9jn9jdn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182408,38 +182758,38 @@ self: { "purescript" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal - , ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes - , bytestring, Cabal, cheapskate, clock, containers, data-ordlist - , deepseq, directory, dlist, edit-distance, file-embed, filepath - , fsnotify, gitrev, Glob, haskeline, hspec, hspec-discover - , http-types, HUnit, language-javascript, lifted-base - , microlens-platform, monad-control, monad-logger, mtl, network - , optparse-applicative, parallel, parsec, pattern-arrows, process - , protolude, regex-tdfa, safe, scientific, semigroups, sourcemap - , split, stm, stringsearch, syb, tasty, tasty-hspec, text, time - , transformers, transformers-base, transformers-compat + , ansi-wl-pprint, array, base, base-compat, blaze-html, bower-json + , boxes, bytestring, Cabal, cheapskate, clock, containers + , data-ordlist, deepseq, directory, dlist, edit-distance + , file-embed, filepath, fsnotify, gitrev, Glob, haskeline, hspec + , hspec-discover, http-types, HUnit, language-javascript + , lifted-base, microlens-platform, monad-control, monad-logger, mtl + , network, optparse-applicative, parallel, parsec, pattern-arrows + , process, protolude, regex-tdfa, safe, scientific, semigroups + , sourcemap, split, stm, stringsearch, syb, tasty, tasty-hspec + , text, time, transformers, transformers-base, transformers-compat , unordered-containers, utf8-string, vector, wai, wai-websockets , warp, websockets }: mkDerivation { pname = "purescript"; - version = "0.12.3"; - sha256 = "0h4216x80cgqdvl7l0glw9xxhnpakh8272p65yc2d5zwbvvfra6k"; + version = "0.12.4"; + sha256 = "1lkicclh9gm3lwgi2vl7qqa2vzf763rw06m79mr1j291z4h2ym76"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-better-errors ansi-terminal base base-compat blaze-html - bower-json boxes bytestring Cabal cheapskate clock containers - data-ordlist deepseq directory dlist edit-distance file-embed - filepath fsnotify Glob haskeline language-javascript lifted-base - microlens-platform monad-control monad-logger mtl parallel parsec - pattern-arrows process protolude regex-tdfa safe scientific - semigroups sourcemap split stm stringsearch syb text time - transformers transformers-base transformers-compat + aeson aeson-better-errors ansi-terminal array base base-compat + blaze-html bower-json boxes bytestring Cabal cheapskate clock + containers data-ordlist deepseq directory dlist edit-distance + file-embed filepath fsnotify Glob haskeline language-javascript + lifted-base microlens-platform monad-control monad-logger mtl + parallel parsec pattern-arrows process protolude regex-tdfa safe + scientific semigroups sourcemap split stm stringsearch syb text + time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson aeson-better-errors ansi-terminal ansi-wl-pprint base + aeson aeson-better-errors ansi-terminal ansi-wl-pprint array base base-compat blaze-html bower-json boxes bytestring Cabal cheapskate clock containers data-ordlist deepseq directory dlist edit-distance file-embed filepath fsnotify gitrev Glob haskeline http-types @@ -182452,14 +182802,14 @@ self: { websockets ]; testHaskellDepends = [ - aeson aeson-better-errors ansi-terminal base base-compat blaze-html - bower-json boxes bytestring Cabal cheapskate clock containers - data-ordlist deepseq directory dlist edit-distance file-embed - filepath fsnotify Glob haskeline hspec hspec-discover HUnit - language-javascript lifted-base microlens-platform monad-control - monad-logger mtl parallel parsec pattern-arrows process protolude - regex-tdfa safe scientific semigroups sourcemap split stm - stringsearch syb tasty tasty-hspec text time transformers + aeson aeson-better-errors ansi-terminal array base base-compat + blaze-html bower-json boxes bytestring Cabal cheapskate clock + containers data-ordlist deepseq directory dlist edit-distance + file-embed filepath fsnotify Glob haskeline hspec hspec-discover + HUnit language-javascript lifted-base microlens-platform + monad-control monad-logger mtl parallel parsec pattern-arrows + process protolude regex-tdfa safe scientific semigroups sourcemap + split stm stringsearch syb tasty tasty-hspec text time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; @@ -182579,6 +182929,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "push-notifications" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring + , casing, conduit, convertible, data-default, HsOpenSSL + , http-conduit, http-types, network, resourcet, text, time + , transformers + }: + mkDerivation { + pname = "push-notifications"; + version = "0.2.1"; + sha256 = "004f947kmj5qq3hhs21ydgrpdh0g2cd0hk4cflabqjlxix2bs65f"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary bytestring casing conduit + convertible data-default HsOpenSSL http-conduit http-types network + resourcet text time transformers + ]; + description = "Push notifications for Android and iOS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "push-notify" = callPackage ({ mkDerivation, aeson, async, attoparsec-conduit, base , base16-bytestring, bytestring, cereal, certificate, conduit @@ -184419,8 +184788,8 @@ self: { }: mkDerivation { pname = "quickspec"; - version = "2.1"; - sha256 = "0xzb442pjm26khdp46vjkzza1gyb01jzhghv3hxff2pwjs3jjsyy"; + version = "2.1.1"; + sha256 = "185sivnl9zwkzrsqknlpkm3mkl5irk6nawbwgm67x1y08d2wvmc4"; libraryHaskellDepends = [ base constraints containers data-lens-light dlist QuickCheck quickcheck-instances random spoon template-haskell transformers @@ -184752,6 +185121,32 @@ self: { broken = true; }) {}; + "r3x-haskell-sdk" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, cookie, http-types, mtl, regex-pcre + , text, transformers, wai, warp + }: + mkDerivation { + pname = "r3x-haskell-sdk"; + version = "0.1.0.0"; + sha256 = "0yf9id71g4nkgmncplv3irs4aww1yd1il9i1gfl63266wy9h871k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers cookie + http-types mtl regex-pcre text transformers wai warp + ]; + executableHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers cookie + http-types mtl regex-pcre text transformers wai warp + ]; + testHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers cookie + http-types mtl regex-pcre text transformers wai warp + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "raaz" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, criterion , deepseq, hspec, hspec-discover, HUnit, optparse-applicative @@ -185770,6 +186165,8 @@ self: { pname = "rapid"; version = "0.1.4"; sha256 = "0f86j4r3sm74w49v9x9s58wahgcgick6z7awl6piq83iqaiy4sh7"; + revision = "1"; + editedCabalFile = "1np33ba4d7crwsknw91igrrmkvzwsfmfijirsa7dxmap5npvn3ap"; libraryHaskellDepends = [ async base containers foreign-store stm ]; @@ -186111,24 +186508,26 @@ self: { "rating-chgk-info" = callPackage ({ mkDerivation, aeson, base-noprelude, bytestring, cassava - , containers, gauge, http-client, iconv, lens, network - , optparse-generic, relude, servant, servant-client, servant-js - , servant-server, servant-swagger, swagger2, text, time, vector - , wai, warp, wreq + , containers, directory, gauge, http-client, http-client-tls, iconv + , lens, network, optparse-generic, relude, servant, servant-client + , servant-js, servant-server, servant-swagger, swagger2, tagsoup + , text, time, vector, wai, warp, wreq }: mkDerivation { pname = "rating-chgk-info"; - version = "0.3.6.3"; - sha256 = "0mwivwh33lmm7a0h2kc06n3453vbbkxzhjvm0xrb8qrrjk8mi1df"; + version = "0.3.6.4"; + sha256 = "0sfrsjlxlg08k0g8g65v21i2qr1ibq0cfgy7sayb1xbkqc319jvr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base-noprelude bytestring cassava containers http-client - iconv lens network optparse-generic relude servant servant-client - servant-js servant-server servant-swagger swagger2 text time vector - wai warp wreq + http-client-tls iconv lens network optparse-generic relude servant + servant-client servant-js servant-server servant-swagger swagger2 + tagsoup text time vector wai warp wreq + ]; + executableHaskellDepends = [ + aeson base-noprelude directory relude text time ]; - executableHaskellDepends = [ base-noprelude relude text time ]; testHaskellDepends = [ base-noprelude relude ]; benchmarkHaskellDepends = [ base-noprelude gauge relude ]; description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; @@ -187241,8 +187640,8 @@ self: { }: mkDerivation { pname = "reanimate-svg"; - version = "0.8.2.0"; - sha256 = "1bry53rhiqdcckn92k2l2n31c3lfcvzqr7k1pm75kqwcf7wy0pwq"; + version = "0.9.0.0"; + sha256 = "0x4d06vsxz3845w05d4qnfbmws2bc7vxpny8hiqbv1wwgjwig327"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -187289,29 +187688,6 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.3"; - sha256 = "02g14vv4qbzq9vakkr55960r386jmkivgm5ld782b1bqyvpfsfh7"; - revision = "1"; - editedCabalFile = "1yz51pghns6xanzdnlkagghpzwnkl7wjqnqcp5gs0zs1iywrbl45"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_3_1" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, stm, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; version = "1.3.1"; sha256 = "1vnwc12dp8w1sbh4z8wh451nqrlp94jml4kakvj4vscsv6c14dy4"; libraryHaskellDepends = [ @@ -187322,7 +187698,6 @@ self: { ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -188101,8 +188476,8 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.4"; - sha256 = "1cq06zlrfk2rbpbwxqqybqs5474gfvgx1dmqvzriha7zmd68wcx2"; + version = "0.4.1"; + sha256 = "1n3mdnknii99kvac4mmvjwi1nwk5527kci211w5n6z796dx56n8v"; libraryHaskellDepends = [ aeson base deepseq exceptions mtl prettyprinter QuickCheck template-haskell these transformers @@ -188207,6 +188582,28 @@ self: { broken = true; }) {}; + "reflex-backend-wai" = callPackage + ({ mkDerivation, base, containers, http-types, mtl, reflex + , reflex-basic-host, stm, wai, warp + }: + mkDerivation { + pname = "reflex-backend-wai"; + version = "0.1.0.0"; + sha256 = "1x8lagl5p7jgrzivar35l4gcsfisskvh4dnxfiqwd5vd9ghibpia"; + revision = "1"; + editedCabalFile = "199p3v0gmp5yah30jb6z9s7cv3w8cc356wh7f6nagkg76kg25p43"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl reflex reflex-basic-host stm wai warp + ]; + executableHaskellDepends = [ base http-types reflex wai ]; + description = "Reflex interface to `wai`"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-basic-host" = callPackage ({ mkDerivation, base, dependent-map, dependent-sum, mtl, primitive , ref-tf, reflex, stm @@ -188215,6 +188612,8 @@ self: { pname = "reflex-basic-host"; version = "0.1"; sha256 = "0fxd46i6jp71dcdmgl1r5hbd9a85fkl5bxhi0dr1gzhy1b9aqc1g"; + revision = "1"; + editedCabalFile = "0pqp4fi1qxcivm61x9lsvwny5yv0vrnb1n2v9zx06rqw914yriam"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189297,31 +189696,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, containers, exceptions, hashable - , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl - , protolude, random, resourcet, semigroupoids, semigroups, tasty - , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base - }: - mkDerivation { - pname = "registry"; - version = "0.1.2.6"; - sha256 = "0szzmk7rclzisz0ihs7cz6180wsfv6rkrfvvqk1v6das444y1bw3"; - libraryHaskellDepends = [ - base containers exceptions hashable mtl protolude resourcet - semigroupoids semigroups text transformers-base - ]; - testHaskellDepends = [ - async base containers exceptions hashable hedgehog hedgehog-corpus - io-memoize MonadRandom mtl protolude random resourcet semigroupoids - semigroups tasty tasty-discover tasty-hedgehog tasty-th text - transformers-base - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - }) {}; - - "registry_0_1_3_1" = callPackage ({ mkDerivation, async, base, containers, exceptions, generic-lens , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl , multimap, protolude, random, resourcet, semigroupoids, semigroups @@ -189330,8 +189704,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.3.1"; - sha256 = "0qwylp0ajmpz17qiah8cpp6c4jl9bc9040vkm0v45afg0paanp7i"; + version = "0.1.3.4"; + sha256 = "1l26b1isxqfax7c91l23fqx2kyl5cw4j2b6i0jiiz8lcn71qy0ha"; libraryHaskellDepends = [ base containers exceptions hashable mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -189347,6 +189721,7 @@ self: { description = "data structure for assembling components"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "regress" = callPackage @@ -190799,23 +191174,11 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.3"; - sha256 = "16c5r69shz9zg01awjpwh7jpw3hqy81p4hh22rwdm0scdc45n5fa"; - libraryHaskellDepends = [ rebase ]; - description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rerebase_1_3_1" = callPackage - ({ mkDerivation, rebase }: - mkDerivation { - pname = "rerebase"; version = "1.3.1"; sha256 = "076gzpgkw19lknk8z7qidxwvg9n432934bnvc843chif075g6r0y"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reroute" = callPackage @@ -192253,6 +192616,19 @@ self: { broken = true; }) {}; + "ring-buffers" = callPackage + ({ mkDerivation, base, contiguous, primitive, semirings }: + mkDerivation { + pname = "ring-buffers"; + version = "0.1.0.1"; + sha256 = "1k67nsphmk6x3lvym5n6i1vbv1rfzwgrcxszivjjsy6nxsl00m52"; + libraryHaskellDepends = [ base contiguous primitive semirings ]; + description = "mutable ring buffers with atomic updates in GHC Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rio" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, hashable, hspec, microlens, mtl, primitive @@ -192277,6 +192653,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio_0_1_9_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, microlens, mtl, primitive + , process, QuickCheck, text, time, typed-process, unix, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.9.2"; + sha256 = "14ai4z9d490bwh7xfvv3a5v4ykmfly0xli2srz98i6rg3ngv1nac"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens mtl primitive process text time typed-process + unix unliftio unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens mtl primitive process QuickCheck text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + description = "A standard library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rio-orphans" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base @@ -193856,8 +194258,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.36"; - sha256 = "0gvkah51mnqpy20v2f3n1gvad1abmbkxljm4pz3yh3x9mkscnc2m"; + version = "0.2.39"; + sha256 = "1hqsbi1bazdsy62qp1rmwmrqsp3dhm9i9iksj7d5iyfndciijpjs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194900,21 +195302,24 @@ self: { }) {}; "salak" = callPackage - ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen - , mtl, QuickCheck, scientific, stm, text, transformers - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, attoparsec, base, containers, data-default + , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck + , scientific, text, transformers, unordered-containers, vector + , yaml }: mkDerivation { pname = "salak"; - version = "0.1.8"; - sha256 = "1y8vssnp8q9hmhf3jckj8c7pgjmvz4wmvm8m5xwlnn9ll8csxs0q"; + version = "0.1.11"; + sha256 = "03l6vadg5wzz2pf1kaxl0h7qndkspymamfdm27ifpwz3vwfy7m1p"; libraryHaskellDepends = [ - aeson base directory filepath menshen mtl scientific stm text - transformers unordered-containers vector yaml + aeson attoparsec base containers data-default directory filepath + menshen mtl pqueue scientific text transformers + unordered-containers vector yaml ]; testHaskellDepends = [ - aeson base directory filepath hspec menshen mtl QuickCheck - scientific stm text transformers unordered-containers vector yaml + aeson attoparsec base containers data-default directory filepath + hspec menshen mtl pqueue QuickCheck scientific text transformers + unordered-containers vector yaml ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; @@ -194922,15 +195327,15 @@ self: { broken = true; }) {}; - "salak_0_2_8" = callPackage + "salak_0_2_9" = callPackage ({ mkDerivation, attoparsec, base, containers, data-default , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck , scientific, text, time }: mkDerivation { pname = "salak"; - version = "0.2.8"; - sha256 = "094avciwjwqvgs8d9779w0bbr7vx46dyqq2lwkk5w55k812pndxd"; + version = "0.2.9"; + sha256 = "1zq8sr5m10bkglwiscadprs4rdj5irpkgpd4ya72r4f61waba5fd"; libraryHaskellDepends = [ attoparsec base containers data-default directory filepath menshen mtl pqueue scientific text time @@ -194951,8 +195356,8 @@ self: { }: mkDerivation { pname = "salak-toml"; - version = "0.2.8"; - sha256 = "02bnynil1b9y1fhk3h40iqgc8r151i112r90nwfbqsgdrzbhwfss"; + version = "0.2.9"; + sha256 = "1v5lc98dva6y2d6pqbwipnan2hyrhisx6c57r1rbw0lsalh7vpqx"; libraryHaskellDepends = [ base mtl salak text time tomland unordered-containers ]; @@ -194962,25 +195367,26 @@ self: { ]; description = "Configuration Loader for toml"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "salak-yaml" = callPackage - ({ mkDerivation, aeson, base, hspec, mtl, QuickCheck, salak, text - , unordered-containers, vector, yaml + ({ mkDerivation, base, conduit, hspec, libyaml, mtl, QuickCheck + , salak, text }: mkDerivation { pname = "salak-yaml"; - version = "0.2.8"; - sha256 = "0nbn0n19651r5hv3qbxg6ym354sm5170mi99pi60xgb4jgw2zjbw"; - libraryHaskellDepends = [ - aeson base mtl salak unordered-containers vector yaml - ]; + version = "0.2.9"; + sha256 = "162gz0rs73ls1r3y9dfg3pz47nnc7mk5hmvxms814jspac27c1h5"; + libraryHaskellDepends = [ base conduit libyaml mtl salak text ]; testHaskellDepends = [ - aeson base hspec mtl QuickCheck salak text unordered-containers - vector yaml + base conduit hspec libyaml mtl QuickCheck salak text ]; description = "Configuration Loader for yaml"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "saltine" = callPackage @@ -195654,7 +196060,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; - "sbv_8_1" = callPackage + "sbv_8_2" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , crackNum, deepseq, directory, doctest, filepath, generic-deriving , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb @@ -195663,8 +196069,10 @@ self: { }: mkDerivation { pname = "sbv"; - version = "8.1"; - sha256 = "1lwd4j2bi9hw3549k0d3bmgssprsz9l62kjl02whh7qcjq19ws9y"; + version = "8.2"; + sha256 = "11jvjgcbipnk65yxv758p5cja89fpjf3nkf8nvqi69lyx1jgb72q"; + revision = "1"; + editedCabalFile = "1bn2k9ydx5vyy4z91y22lc6yhnv299y7z2cyzp1prxpvb1dgh5xv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath @@ -196153,14 +196561,15 @@ self: { }) {}; "scheduler" = callPackage - ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest - , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell - , unliftio, unliftio-core + ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest + , criterion, deepseq, doctest, exceptions, fib, hspec, monad-par + , parallel, QuickCheck, streamly, template-haskell, unliftio + , unliftio-core }: mkDerivation { pname = "scheduler"; - version = "1.0.0"; - sha256 = "1l8ifgdfzn8w6sd0d9pmlhipbmqs16krzicixf4rxxvr2pl8a2ld"; + version = "1.1.0"; + sha256 = "1q4nj0ahhxcz0zzcfj58vgh1apid8hk13i5faxmqc52g9px464zd"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ atomic-primops base deepseq exceptions unliftio-core @@ -196168,6 +196577,10 @@ self: { testHaskellDepends = [ base deepseq doctest hspec QuickCheck template-haskell unliftio ]; + benchmarkHaskellDepends = [ + async base criterion deepseq fib monad-par parallel streamly + unliftio + ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -198151,14 +198564,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semirings_0_3_1_1" = callPackage + "semirings_0_3_1_2" = callPackage ({ mkDerivation, base, containers, hashable, integer-gmp , unordered-containers, vector }: mkDerivation { pname = "semirings"; - version = "0.3.1.1"; - sha256 = "050vs4dn20llsj1nkf6jyni8798vj2bdxfp6d5icdr6xm2hlpkn4"; + version = "0.3.1.2"; + sha256 = "1zh5fgm1xidd03c00wh9llscx529qd1n6cnpv7k172xp4rd2w261"; libraryHaskellDepends = [ base containers hashable integer-gmp unordered-containers vector ]; @@ -199397,6 +199810,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-checked-exceptions_2_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, hspec-wai, http-types, servant + , servant-checked-exceptions-core, servant-client + , servant-client-core, servant-server, tasty, tasty-hspec + , tasty-hunit, wai, world-peace + }: + mkDerivation { + pname = "servant-checked-exceptions"; + version = "2.1.0.0"; + sha256 = "0dbbixk3852phxhfcj84v3525yp5nl5krcrw53wsgc91r0w529s7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-types servant servant-checked-exceptions-core + servant-client servant-client-core servant-server wai world-peace + ]; + testHaskellDepends = [ + base hspec-wai http-types servant servant-server tasty tasty-hspec + tasty-hunit wai + ]; + description = "Checked exceptions for Servant APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-checked-exceptions-core" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob , http-media, http-types, profunctors, servant, servant-docs @@ -199419,6 +199857,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-checked-exceptions-core_2_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, Glob, http-media + , http-types, profunctors, servant, servant-docs, tagged, text + , world-peace + }: + mkDerivation { + pname = "servant-checked-exceptions-core"; + version = "2.1.0.0"; + sha256 = "1qmmbqniipx7bpinbjh9z0i2n0v71y6p3jak629aw0403rhq92pz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-media http-types profunctors servant + servant-docs tagged text world-peace + ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Checked exceptions for Servant APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-client" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover @@ -199799,6 +200258,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-fiat-content" = callPackage + ({ mkDerivation, base, bytestring, http-media, servant, text }: + mkDerivation { + pname = "servant-fiat-content"; + version = "1.0.0"; + sha256 = "1108npqddwsbplxzf65hq0w3aqnyfrk8lcdffkszwx3g8s8xblg7"; + libraryHaskellDepends = [ + base bytestring http-media servant text + ]; + description = "Fiat content types"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-flatten" = callPackage ({ mkDerivation, base, servant }: mkDerivation { @@ -202278,10 +202750,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.17.7"; - sha256 = "09gp3469lljgqmlkznpxl87l1wc91vdv2q6phh65jpkfjdhjp0rv"; - revision = "1"; - editedCabalFile = "1ld0k6vv8v8znnihps4z93555hs2n77ga6xk8g642bmrg67fnb7j"; + version = "0.17.8"; + sha256 = "18j9xhl7h3sc6jswac4dz78i4rq7004150b98kq49w20flpidr5d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -202326,8 +202796,8 @@ self: { ({ mkDerivation, base, cdeps, composition-prelude, shake }: mkDerivation { pname = "shake-c"; - version = "0.4.2.0"; - sha256 = "13ma1mavah98rmxisd4hw5ja96kzbcd36gzxlrsdsjz72i7k9xlh"; + version = "0.4.3.0"; + sha256 = "1cnmwn63kx43khgy3n00sqla8pw11h7almir31zm0dzgld11znix"; libraryHaskellDepends = [ base cdeps composition-prelude shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; @@ -203040,8 +203510,8 @@ self: { ({ mkDerivation, base, markdown-unlit, process, text }: mkDerivation { pname = "shellmet"; - version = "0.0.0"; - sha256 = "1mn9m1jdbfb9p273wb9jvdnflhp6569ix6sa1z7yzqr91g7w4017"; + version = "0.0.1"; + sha256 = "11c53h3dvhmnkjhcjw1xjr1kx6pvdmayf86i5b6zhpl4q3q2ixlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -203196,18 +203666,18 @@ self: { }) {}; "shh" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath - , hashable, mtl, process, split, tasty, tasty-hunit + ({ mkDerivation, async, base, containers, deepseq, directory + , filepath, hashable, mtl, process, split, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, unix }: mkDerivation { pname = "shh"; - version = "0.3.0.0"; - sha256 = "15w2izm0wmxqh5f0343rj42vq2dg4xp77a11qp4q10yj7r5cbp52"; + version = "0.3.1.3"; + sha256 = "0dsb4q83zsxx78xa4cx5vgkkyrbj50567vlvxk8g10pwah0lkr4c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base deepseq directory filepath mtl process split + async base containers deepseq directory filepath mtl process split template-haskell unix ]; executableHaskellDepends = [ @@ -204028,8 +204498,8 @@ self: { ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; - version = "0.1.3.1"; - sha256 = "075fcidyq93cm1y8ag5z50n7zvv0fmi9c6j1wmrzj2972cr16g9p"; + version = "0.1.4"; + sha256 = "1g63c0bdm3231aqf12i45nsfpy6bvl1w3nn0jcbbg2hij377y9rg"; libraryHaskellDepends = [ base directory filepath process unix ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; @@ -204039,8 +204509,10 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.0.1"; - sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d"; + version = "0.1.1"; + sha256 = "0rgg8aqgq98yq9h5v29r0g2qjhr70gl1sgv713ihlpm7b7bykilz"; + revision = "1"; + editedCabalFile = "127m5x1k5c5ymxcxlbhjghlymdyci847qxq1ydfd8sf2m4qc4ffq"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; @@ -204550,6 +205022,8 @@ self: { pname = "simple-smt"; version = "0.9.4"; sha256 = "0sbwgyw2a5p85yddvmvzk85709qjqny3xgps7zg9k17m9d5bwdm0"; + revision = "1"; + editedCabalFile = "13y564gh7qndkdxnrdx5zbqnkcb5bgg074al92c9rqxd9c66wx4k"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -208146,8 +208620,8 @@ self: { }: mkDerivation { pname = "snmp"; - version = "0.3.0.0"; - sha256 = "1lpmwl74hg1x5065r1jhgi6rfmyasjmhqaghnckg6rzii0nxym9d"; + version = "0.3.1.0"; + sha256 = "0lkvhghrcmjfy2dhwybx04j5rip0d1dpyv62f8n3viad8x2djhkr"; libraryHaskellDepends = [ base bytestring containers cryptonite ip language-asn memory network stm vector @@ -209797,22 +210271,31 @@ self: { }) {}; "spiros" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , deepseq, directory, hashable, mtl, process, safe, semigroups - , split, stm, text, time, transformers, unordered-containers - , vector, vinyl, wl-pprint-text + ({ mkDerivation, base, bytestring, case-insensitive, containers + , cpuinfo, data-default-class, deepseq, directory, doctest + , exceptions, filepath, generic-deriving, hashable, mtl + , prettyprinter, process, safe, semigroups, split, stm, string-conv + , template-haskell, text, th-lift-instances, time, transformers + , unix-compat, unordered-containers }: mkDerivation { pname = "spiros"; - version = "0.0.0"; - sha256 = "06j9wcc6zcnbpf11356b64ikq1irdmp60h0bihf1bsgg0lh7mcff"; + version = "0.4.2"; + sha256 = "0wgyqy2kdjzb481c24hcgbsc8wllb3z1w3kk2nqv3isj5kbjr3c3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring containers data-default-class deepseq directory - hashable mtl process safe semigroups split stm text time - transformers unordered-containers vector vinyl wl-pprint-text + base bytestring case-insensitive containers cpuinfo + data-default-class deepseq directory exceptions filepath + generic-deriving hashable mtl prettyprinter process safe semigroups + split stm string-conv template-haskell text th-lift-instances time + transformers unix-compat unordered-containers ]; - description = "my custom prelude"; - license = stdenv.lib.licenses.bsd3; + testHaskellDepends = [ base doctest ]; + description = "Spiros Boosalis's Custom Prelude"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "splay" = callPackage @@ -209989,29 +210472,6 @@ self: { }: mkDerivation { pname = "splitmix"; - version = "0.0.1"; - sha256 = "0bvpx3hnyhz449s2c2mi5h78024yysnqldfwp7m0qr21m41q0v1a"; - revision = "1"; - editedCabalFile = "0c38sajdpqcmicdh4lfy6vpg8wnzpiyamvbximdsqs605frs3mqs"; - libraryHaskellDepends = [ base deepseq random time ]; - testHaskellDepends = [ - async base base-compat-batteries bytestring deepseq process random - tf-random vector - ]; - benchmarkHaskellDepends = [ - base containers criterion random tf-random - ]; - description = "Fast Splittable PRNG"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "splitmix_0_0_2" = callPackage - ({ mkDerivation, async, base, base-compat-batteries, bytestring - , containers, criterion, deepseq, process, random, tf-random, time - , vector - }: - mkDerivation { - pname = "splitmix"; version = "0.0.2"; sha256 = "1y9vlik5icwimw6c8zh9pzgp0pbxvwxg48r54qsypnn1p4dbgaz6"; libraryHaskellDepends = [ base deepseq random time ]; @@ -210024,7 +210484,6 @@ self: { ]; description = "Fast Splittable PRNG"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splitter" = callPackage @@ -211059,8 +211518,8 @@ self: { pname = "stack"; version = "1.9.3"; sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf"; - revision = "6"; - editedCabalFile = "1gz2p16jdbx27kd7p7xfbplviqvv9ybhzjfyjaxh9f9z9gj0n8gr"; + revision = "7"; + editedCabalFile = "0gc09yfhrphzn6r2g1ifx6l5k3g78q38myg83f2djjmy9vp047bl"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -212535,8 +212994,8 @@ self: { ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { pname = "stb-truetype"; - version = "0.1.2"; - sha256 = "1hbbi7hax5fw5zb7ashfs5paixqzqrrr64lwisda80dskdazld4m"; + version = "0.1.4"; + sha256 = "1fk9qkra5f18wql76vakdq9796z0dbg1d4apv2zjj47rla43ii38"; libraryHaskellDepends = [ array base bytestring containers ]; description = "A wrapper around Sean Barrett's TrueType rasterizer library"; license = stdenv.lib.licenses.publicDomain; @@ -212887,6 +213346,8 @@ self: { pname = "stm-containers"; version = "1.1.0.2"; sha256 = "1yhivblfxycr2vk09gwg904n6fqkzn5g5rvg3whm40fnabdfa9av"; + revision = "1"; + editedCabalFile = "14dy3rxa009bgx534583g11i8986pjcgygzh8l15fk3rv9q1iwb8"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t stm-hamt transformers ]; @@ -215074,10 +215535,8 @@ self: { }: mkDerivation { pname = "strongswan-sql"; - version = "1.2.2.0"; - sha256 = "0dv52cf6v84f8q6kckwbgw85iqckd17q3gqif6fh7xrx1z4vhimb"; - revision = "1"; - editedCabalFile = "138pksvpff0qggfsiv8s9r45z1ph4779flfm5hxb9br7bh5klslc"; + version = "1.3.0.0"; + sha256 = "0dxl6j73hmw9la2ivbgxm6wr12dd79nh2315k517zlgiq4q1yir7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215803,6 +216262,55 @@ self: { broken = true; }) {}; + "summoner_1_3_0_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base-noprelude + , bytestring, directory, filepath, generic-deriving, gitrev + , hedgehog, hspec, neat-interpolation, optparse-applicative + , process, relude, shellmet, text, time, tomland, tree-diff + }: + mkDerivation { + pname = "summoner"; + version = "1.3.0.1"; + sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base-noprelude bytestring directory filepath + generic-deriving gitrev neat-interpolation optparse-applicative + process relude shellmet text time tomland + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base-noprelude directory filepath hedgehog hspec neat-interpolation + relude tomland tree-diff + ]; + description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "summoner-tui" = callPackage + ({ mkDerivation, base, base-noprelude, brick, directory, filepath + , microlens, microlens-th, relude, summoner, text, vty + }: + mkDerivation { + pname = "summoner-tui"; + version = "0.1.0"; + sha256 = "0ic9faw55qjljwz8r0nz8jmdw2pcc40nqc0zp07hshqh8qbiswl9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base-noprelude brick directory filepath microlens microlens-th + relude summoner text vty + ]; + executableHaskellDepends = [ base ]; + description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sump" = callPackage ({ mkDerivation, base, bytestring, data-default, lens, serialport , transformers, vector @@ -216223,8 +216731,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.3.0.1"; - sha256 = "0h6qibvkmslil9jvbzminhpxgz7z95qak3zv5dxj8sfpc3p3lk7g"; + version = "1.3.1"; + sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -216290,7 +216798,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sv-core_0_4" = callPackage + "sv-core_0_4_1" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bytestring , containers, contravariant, deepseq, double-conversion, lens, mtl , parsec, profunctors, QuickCheck, readable, semigroupoids @@ -216299,10 +216807,8 @@ self: { }: mkDerivation { pname = "sv-core"; - version = "0.4"; - sha256 = "0m87rffkv5716dh6v00p4gc257fdc81fahjafs02kkf8fbiivmkh"; - revision = "1"; - editedCabalFile = "0qzklsb21ha7jgfgx3h565pc3659hd3h1l0ci1yr0mdmj08ignbs"; + version = "0.4.1"; + sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -216966,15 +217472,15 @@ self: { "symantic-http" = callPackage ({ mkDerivation, base, bytestring, http-api-data, http-media - , http-types, network-uri, stm, text, time, transformers + , http-types, network-uri, stm, text, transformers }: mkDerivation { pname = "symantic-http"; - version = "0.0.0.20190324"; - sha256 = "0fvj527b5wjq0wfvzd0n8zna4cy5x1ngj47ysrvyv30ddvh94r4c"; + version = "0.1.1.20190410"; + sha256 = "15lqcvz5l3rkmzrsdzbm4sd06gkbfbx2vxilzhxgsy9b1micr5c8"; libraryHaskellDepends = [ base bytestring http-api-data http-media http-types network-uri stm - text time transformers + text transformers ]; description = "Symantic combinators for deriving clients or a server from an HTTP API"; license = stdenv.lib.licenses.gpl3; @@ -216987,8 +217493,8 @@ self: { }: mkDerivation { pname = "symantic-http-client"; - version = "0.0.0.20190324"; - sha256 = "0y7va5gnf285h2hv82jfjq63k141mwgy8h4s1wbdqmjirrh75d1d"; + version = "0.0.1.20190410"; + sha256 = "0nzah75fbfq696k3r7sgxxykwp924dv6zmxn8ni6s1qra5r989wy"; libraryHaskellDepends = [ base base64-bytestring bytestring containers http-api-data http-client http-media http-types monad-classes network-uri stm @@ -217052,8 +217558,8 @@ self: { }: mkDerivation { pname = "symantic-http-server"; - version = "0.0.0.20190324"; - sha256 = "0drng8xsafq5xm08frjg4fc206lxwb7wq2jj6n7zlv8k3nfnzvzy"; + version = "0.1.1.20190410"; + sha256 = "00573566hxngsly5gknrn7vjvpspia6bz2f8zjzz591dw2169i7i"; libraryHaskellDepends = [ base base64-bytestring bytestring containers http-api-data http-media http-types monad-classes network-uri stm symantic-http @@ -217074,8 +217580,8 @@ self: { }: mkDerivation { pname = "symantic-http-test"; - version = "0.0.0.20190324"; - sha256 = "0ppxdy1m1a0y3jbkbcaf1syknk5ybri1scs5vhkphvm50fa21qcj"; + version = "0.0.1.20190410"; + sha256 = "1nqvg801wbh2w1minb4hrfjasia823lqdyyh8dr3287wvdkwb74v"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -217328,8 +217834,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.8"; - sha256 = "1vwr2wfa9b4782k3v4bp0p5qqy14mwx9mmlax0jskpqwzx0azxvi"; + version = "3.8.1"; + sha256 = "0560h3k360316q05wwylpbcvadp9dxzywbp206xm2wslpl1d9m8v"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -218442,8 +218948,6 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -220337,15 +220841,15 @@ self: { }) {}; "telega" = callPackage - ({ mkDerivation, aeson, base, http-client, lens, text, transformers - , wreq + ({ mkDerivation, aeson, base, http-client, lens, tagged, text, time + , transformers, wreq }: mkDerivation { pname = "telega"; - version = "0.1.0"; - sha256 = "1ixdac26mkd98apfq3h4xihlwdj8y1mjrcz8f17pkxkb4cmra3cd"; + version = "0.2.0"; + sha256 = "1q2prviwbnwhi0xfwwblhncnpz2l0829i3zp2v573w9h91qc5yjn"; libraryHaskellDepends = [ - aeson base http-client lens text transformers wreq + aeson base http-client lens tagged text time transformers wreq ]; description = "Telegram Bot API binding"; license = stdenv.lib.licenses.mit; @@ -221149,37 +221653,22 @@ self: { }) {}; "tensors" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, reflection, singletons - , vector + ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck + , reflection, vector }: mkDerivation { pname = "tensors"; - version = "0.1.2"; - sha256 = "19r1jjpb8vbjmjbcs0sgnn83mniihw2v1dwhpkm6alrxqdai1637"; - libraryHaskellDepends = [ base reflection singletons vector ]; + version = "0.1.4"; + sha256 = "1wiq38px85ypnfpvbr3hcawrag457z0jvd4jr1bh7jf6qw6jqpfn"; + libraryHaskellDepends = [ base deepseq vector ]; testHaskellDepends = [ - base hspec QuickCheck reflection singletons vector + base deepseq hspec QuickCheck reflection vector ]; + benchmarkHaskellDepends = [ base criterion deepseq vector ]; description = "Tensor in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; - "tensors_0_1_3" = callPackage - ({ mkDerivation, base, criterion, hspec, QuickCheck, reflection - , vector - }: - mkDerivation { - pname = "tensors"; - version = "0.1.3"; - sha256 = "1ca289878jfwhwlawdwbf0mii8y117ha7hyqrlqx651qsswlwwcf"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ base hspec QuickCheck reflection vector ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Tensor in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "term-rewriting" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit , mtl, multiset, parsec, QuickCheck, union-find-array @@ -222967,6 +223456,23 @@ self: { broken = true; }) {}; + "text-trie" = callPackage + ({ mkDerivation, base, binary, bytestring, bytestring-trie, HUnit + , microbench, QuickCheck, silently, smallcheck, text + }: + mkDerivation { + pname = "text-trie"; + version = "0.2.5.0"; + sha256 = "00i92zlhcn31ll163alm1s1j3f6bkc80nhz3vpqcivjdg7cwy5nj"; + libraryHaskellDepends = [ base binary text ]; + testHaskellDepends = [ + base binary bytestring bytestring-trie HUnit microbench QuickCheck + silently smallcheck text + ]; + description = "An efficient finite map from Text to values, based on bytestring-trie"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-utf7" = callPackage ({ mkDerivation, base, bytestring, quickcheck-instances, tasty , tasty-hunit, tasty-quickcheck, text @@ -223610,23 +224116,6 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell - , th-lift, th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.6"; - sha256 = "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-lift-instances th-reify-many - ]; - testHaskellDepends = [ base hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_7" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many }: @@ -223643,7 +224132,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-pprint" = callPackage @@ -224186,18 +224674,18 @@ self: { }) {}; "threads-supervisor" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, retry, stm, tasty - , tasty-hunit, tasty-quickcheck, time, transformers + ({ mkDerivation, base, bytestring, clock, QuickCheck, retry, stm + , tasty, tasty-hunit, tasty-quickcheck, time, transformers , unordered-containers }: mkDerivation { pname = "threads-supervisor"; - version = "1.1.0.0"; - sha256 = "0vnf6rwghhfvj4cq6d46dhhydyqqrj6jd0dwkg2vqj150y6mg5r2"; + version = "1.2.0.1"; + sha256 = "013j28ma6bwmf50n05ywli9pf5r4vyg8w4liv4yibr459207k31m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base retry stm time unordered-containers + base clock retry stm time transformers unordered-containers ]; executableHaskellDepends = [ base stm time unordered-containers ]; testHaskellDepends = [ @@ -226342,6 +226830,22 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "token-limiter" = callPackage + ({ mkDerivation, async, base, clock, ghc-prim, QuickCheck, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "token-limiter"; + version = "0.1.0.0"; + sha256 = "1ypvc44h68kshy4nsngxhqip6040cabrf6nf6p48ccav3s5497a2"; + libraryHaskellDepends = [ base clock ghc-prim ]; + testHaskellDepends = [ + async base clock QuickCheck tasty tasty-hunit text + ]; + description = "Fast rate limiting using the token bucket algorithm (BSD)"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "tokenify" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -226742,8 +227246,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.4.0"; - sha256 = "1wg5gx7iydwhnp8xj72lmgpa7n5dd62cxjswlkplj944c2szdmdp"; + version = "0.1.5.0"; + sha256 = "0896l7zk6avkcxi2s3q2bch0bjclk4lafbm2vzmpygkscz7kqv9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227084,6 +227588,8 @@ self: { pname = "toysolver"; version = "0.5.0"; sha256 = "0dr34aknbh8p500zj4lcll5mi1km16jxyvjx1gdrp63csdfi1ich"; + revision = "1"; + editedCabalFile = "19qbl75mn7kwyvygwc0ad73vj4vkaj5mnkmwpx9mavwl7px2kzps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227588,23 +228094,11 @@ self: { ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; - version = "0.6.2"; - sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - description = "A small compatibility shim for the transformers library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "transformers-compat_0_6_3" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "transformers-compat"; - version = "0.6.3"; - sha256 = "08gpfib5s92rxq50y1in9zw2nbi2wm8k3xq7y6s0iahsn4vl5i5i"; + version = "0.6.4"; + sha256 = "036f7qnzhxjbflypgggkd3v0gjpbcqbb1ryagyiknlrnsrav8zxd"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A small compatibility shim for the transformers library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-compose" = callPackage @@ -231180,8 +231674,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20181026.0"; - sha256 = "0b531ydcb63q44zjpcd2l70xp2hgkxqppnfld7n16ifh9vrxm6gf"; + version = "0.1.20190325.0"; + sha256 = "0vxisw10a414kh2rn0maj6zvcs8vi5kacfwxs0smjspvm513bkb2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector @@ -233073,8 +233567,8 @@ self: { }: mkDerivation { pname = "unliftio-streams"; - version = "0.1.0.0"; - sha256 = "0ylyk1g00isqzr7nbhrkf3m0yc36lfjb020lb1ip4s3ymlvkkp22"; + version = "0.1.1.0"; + sha256 = "0qp78c610anqpgpd13pz24x68kcpc69z2wjrz6a3qixvqjvp72bw"; libraryHaskellDepends = [ base bytestring io-streams text unliftio-core ]; @@ -234002,8 +234496,8 @@ self: { pname = "urlencoded"; version = "0.4.2.0"; sha256 = "1i88qf5dq52ra7hl29ka1i0bhyfic3sg7ksm1n6bpb2hj38hr139"; - revision = "4"; - editedCabalFile = "0sq16qnc50hh4gyylm3vz1rdvx94ypmw08hsgjv30mcfzfsq6ch5"; + revision = "5"; + editedCabalFile = "1c9af5bzz5lkppqgd4bfynjxdqwps59n391fiw73nx3aq2nr7m0i"; libraryHaskellDepends = [ base mtl network network-uri split ]; testHaskellDepends = [ base network network-uri QuickCheck ]; description = "Generate or process x-www-urlencoded data"; @@ -235022,8 +235516,8 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.10"; - sha256 = "04rdjhc1ny2xwmwvbf70bwjgyv5kzl8s83m79qr3i04vicax14gd"; + version = "0.0.11"; + sha256 = "1cx8qdzfg2wn6q6q3vhkh6lmwqfkyf8ypvbbv6kyjai1smb1qfac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239017,17 +239511,17 @@ self: { , case-insensitive, containers, cookie, data-default-class , filepath, hspec, hspec-wai, hspec-wai-json, http-types , mime-types, monad-loops, mtl, path-pieces, random - , template-haskell, text, vault, wai, wai-extra + , safe-exceptions, template-haskell, text, vault, wai, wai-extra }: mkDerivation { pname = "wai-routes"; - version = "0.10.3"; - sha256 = "0q7928i2y0j0z68qz1ixgzh3cx2rmyp44vpzc5jxqrrbfsb0z56k"; + version = "0.10.4"; + sha256 = "04qmwq29iqkpz1j5ffwqxlf5afxiw3ng8akwydcpdx7xlcxf72i4"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types - monad-loops mtl path-pieces random template-haskell text vault wai - wai-extra + monad-loops mtl path-pieces random safe-exceptions template-haskell + text vault wai wai-extra ]; testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json text wai @@ -239561,6 +240055,8 @@ self: { ]; description = "A minimal gRPC server on top of Warp"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "warp-static" = callPackage @@ -240335,8 +240831,8 @@ self: { }: mkDerivation { pname = "webby"; - version = "0.1.0.1"; - sha256 = "0xscyd06zc4sjmhrf4l8cc9qmpw2vx2vydvlv0mw47hk660as67v"; + version = "0.1.0.2"; + sha256 = "1yndypl1x5pcxhc1mp2midbidbzvgvjy3s7h076lxpra1dvi6h7r"; libraryHaskellDepends = [ aeson base binary bytestring fast-logger formatting http-api-data http-types monad-logger protolude resourcet text unliftio @@ -240813,6 +241309,27 @@ self: { broken = true; }) {}; + "webshow" = callPackage + ({ mkDerivation, base, directory, file-embed, filepath, hscolour + , http-types, lucid, optparse-applicative, optparse-simple + , pretty-show, text, wai, warp + }: + mkDerivation { + pname = "webshow"; + version = "0.0.0"; + sha256 = "1a3ccj8q174n3b9l01a56jj9fnzyx0za9mzp97i7g0jsjwn9fxbs"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory file-embed filepath hscolour http-types lucid + optparse-applicative optparse-simple pretty-show text wai warp + ]; + description = "Show programming language printed values in a web UI"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "websnap" = callPackage ({ mkDerivation, base, filepath, gtk, webkit }: mkDerivation { @@ -242045,8 +242562,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.46"; - sha256 = "1d0i1611458dpqih73x8gcxq7lkwpxdc1c3pgj3hqb6gwjhjnxyj"; + version = "0.3.47"; + sha256 = "1p6d61zk0yr55f7mk7cv1fyjs23aximsy1ayjknvc3rwsijqx264"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242973,6 +243490,8 @@ self: { ]; description = "Unagi chan based websocket client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wsdl" = callPackage @@ -245864,41 +246383,8 @@ self: { }: mkDerivation { pname = "yam"; - version = "0.5.14"; - sha256 = "1ynd1ak1zljmvfsviz1mkpngm56ifwklfinbsgwn7qqivc7kdhl7"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary bytestring data-default - fast-logger http-client http-types lens menshen monad-logger mtl - mwc-random reflection salak scientific servant-client - servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault vector wai warp - ]; - testHaskellDepends = [ - aeson base base16-bytestring binary bytestring data-default - fast-logger hspec http-client http-types lens menshen monad-logger - mtl mwc-random QuickCheck reflection salak scientific - servant-client servant-server servant-swagger servant-swagger-ui - swagger2 text unliftio-core unordered-containers vault vector wai - warp - ]; - description = "Yam Web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "yam_0_5_16" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring - , data-default, fast-logger, hspec, http-client, http-types, lens - , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection - , salak, scientific, servant-client, servant-server - , servant-swagger, servant-swagger-ui, swagger2, text - , unliftio-core, unordered-containers, vault, vector, wai, warp - }: - mkDerivation { - pname = "yam"; - version = "0.5.16"; - sha256 = "107wnnb8q47kl78gl92b6w6z6pvjqqwpisvwcw0xipmisk5d6nzv"; + version = "0.5.17"; + sha256 = "128h0j2v9jsr8hpk43hd75i62xasq3g40v0fk20yzp82avyirqzq"; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring data-default fast-logger http-client http-types lens menshen monad-logger mtl @@ -245965,25 +246451,8 @@ self: { }: mkDerivation { pname = "yam-datasource"; - version = "0.5.14"; - sha256 = "0yc1hrpqpvfvn5ldnnyrj7l49b9v20f24c5k8lcf70wh7bxmwx1i"; - libraryHaskellDepends = [ - base conduit persistent resource-pool resourcet unliftio-core yam - ]; - description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "yam-datasource_0_5_16" = callPackage - ({ mkDerivation, base, conduit, persistent, resource-pool - , resourcet, unliftio-core, yam - }: - mkDerivation { - pname = "yam-datasource"; - version = "0.5.16"; - sha256 = "0361nlw1fy8kb7wmkksp42zfx7fd7vdjxwvmx5j8mac4mgwyarzq"; + version = "0.5.17"; + sha256 = "1ah2y614l0a3mkdrv6a4arbsy0a2wz7w7dwmkdf4rfl9zpm1lfsf"; libraryHaskellDepends = [ base conduit persistent resource-pool resourcet unliftio-core yam ]; @@ -247587,8 +248056,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.13"; - sha256 = "0a7rsm71d8a0snbx6x9hj4ba0f0vg51rwzchsgvrh6fdfm0clkgq"; + version = "1.6.14"; + sha256 = "1p7rm95fb3d27khzq6c10mvqffj8jwiirgfy53hvi3x27w9hqg6s"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -247657,27 +248126,6 @@ self: { }: mkDerivation { pname = "yesod-csp"; - version = "0.2.4.0"; - sha256 = "19cjmjg2byyswdcxa9llqarclzi6jslbd0yxxkn8l3kdgn2k2pg0"; - libraryHaskellDepends = [ - attoparsec base case-insensitive mono-traversable network-uri - semigroups syb template-haskell text wai yesod yesod-core - ]; - testHaskellDepends = [ - attoparsec base hspec network-uri semigroups template-haskell yesod - yesod-test - ]; - description = "Add CSP headers to Yesod apps"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-csp_0_2_5_0" = callPackage - ({ mkDerivation, attoparsec, base, case-insensitive, hspec - , mono-traversable, network-uri, semigroups, syb, template-haskell - , text, wai, yesod, yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-csp"; version = "0.2.5.0"; sha256 = "16b569jwxw7rim9fmjkl3slddclcp1x75jf8czjj89d1wp202x15"; libraryHaskellDepends = [ @@ -247690,7 +248138,6 @@ self: { ]; description = "Add CSP headers to Yesod apps"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-datatables" = callPackage @@ -249565,6 +250012,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp; inherit (pkgs) yices;}; + "yiyd" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec + , hspec-discover, mtl, optparse-applicative, random, yaml + }: + mkDerivation { + pname = "yiyd"; + version = "1.0.1"; + sha256 = "15rf8mgd938pdqn88cyc77wr8gs1siqz78g7f657wcq49sksypl0"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring containers mtl optparse-applicative random yaml + ]; + testHaskellDepends = [ + base bytestring containers hspec mtl optparse-applicative random + yaml + ]; + testToolDepends = [ hspec-discover ]; + license = stdenv.lib.licenses.gpl3; + }) {}; + "yjftp" = callPackage ({ mkDerivation, base, directory, ftphs, haskeline, hsConfigure , mtl, process, unix @@ -250374,7 +250843,6 @@ self: { description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) zeromq;}; "zeromq4-patterns" = callPackage diff --git a/nixpkgs/pkgs/development/interpreters/clisp/default.nix b/nixpkgs/pkgs/development/interpreters/clisp/default.nix index f850a9f57b80..5dcfa42c92fc 100644 --- a/nixpkgs/pkgs/development/interpreters/clisp/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clisp/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/development/interpreters/jython/default.nix b/nixpkgs/pkgs/development/interpreters/jython/default.nix index e7bcef7bc3e0..3d82535d29aa 100644 --- a/nixpkgs/pkgs/development/interpreters/jython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/jython/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Python interpreter written in Java"; - homepage = http://jython.org/; + homepage = https://jython.org/; license = stdenv.lib.licenses.psfl; platforms = jre.meta.platforms; }; diff --git a/nixpkgs/pkgs/development/interpreters/mujs/default.nix b/nixpkgs/pkgs/development/interpreters/mujs/default.nix index 918b2c2515e2..f071aab94c78 100644 --- a/nixpkgs/pkgs/development/interpreters/mujs/default.nix +++ b/nixpkgs/pkgs/development/interpreters/mujs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://mujs.com/; + homepage = https://mujs.com/; description = "A lightweight, embeddable Javascript interpreter"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix index 9adc72f941a2..e03777b0fb35 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPackages +{ config, lib, stdenv, fetchurl, buildPackages, callPackage , enableThreading ? stdenv ? glibc, makeWrapper }: @@ -22,7 +22,8 @@ let libcInc = lib.getDev libc; libcLib = lib.getLib libc; crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; - common = { version, sha256 }: stdenv.mkDerivation (rec { + + common = { self, version, sha256 }: stdenv.mkDerivation (rec { inherit version; name = "perl-${version}"; @@ -104,7 +105,19 @@ let setupHook = ./setup-hook.sh; - passthru.libPrefix = "lib/perl5/site_perl"; + passthru = rec { + interpreter = "${self}/bin/perl"; + libPrefix = "lib/perl5/site_perl"; + pkgs = callPackage ../../../top-level/perl-packages.nix { + perl = self; + overrides = config.perlPackageOverrides or (p: {}); # TODO: (self: super: {}) like in python + }; + buildEnv = callPackage ./wrapper.nix { + perl = self; + inherit (pkgs) requiredPerlModules; + }; + withPackages = f: buildEnv.override { extraLibs = f pkgs; }; + }; doCheck = false; # some tests fail, expensive @@ -179,12 +192,14 @@ let in rec { # the latest Maint version perl528 = common { + self = perl528; version = "5.28.1"; sha256 = "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry"; }; # the latest Devel version perldevel = common { + self = perldevel; version = "5.29.9"; sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm"; }; diff --git a/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix new file mode 100644 index 000000000000..9142a1f4fc36 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/perl/wrapper.nix @@ -0,0 +1,55 @@ +{ stdenv, perl, buildEnv, makeWrapper +, extraLibs ? [] +, extraOutputsToInstall ? [] +, postBuild ? "" +, ignoreCollisions ? false +, lib +, requiredPerlModules +, makeWrapperArgs ? [] +}: + +# Create a perl executable that knows about additional packages. +let + env = let + paths = requiredPerlModules (extraLibs ++ [ perl ] ); + in buildEnv { + name = "${perl.name}-env"; + + inherit paths; + inherit ignoreCollisions; + extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; + + # we create wrapper for the binaries in the different packages + postBuild = '' + + . "${makeWrapper}/nix-support/setup-hook" + + if [ -L "$out/bin" ]; then + unlink "$out/bin" + fi + mkdir -p "$out/bin" + + # take every binary from perl packages and put them into the env + for path in ${stdenv.lib.concatStringsSep " " paths}; do + if [ -d "$path/bin" ]; then + cd "$path/bin" + for prg in *; do + if [ -f "$prg" ]; then + rm -f "$out/bin/$prg" + if [ -x "$prg" ]; then + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PERL5LIB "$out/${perl.libPrefix}" + fi + fi + done + fi + done + '' + postBuild; + + meta = perl.meta // { outputsToInstall = ["out"]; }; # remove "man" from meta.outputsToInstall. pkgs.buildEnv produces no "man", it puts everything to "out" + + passthru = perl.passthru // { + interpreter = "${env}/bin/perl"; + inherit perl; + }; + }; +in env diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix index 274e24a0e1e1..0b6611f16054 100644 --- a/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -258,24 +258,24 @@ let in { php71 = generic { - version = "7.1.27"; - sha256 = "0jzcyilvdy05w30vz5ln46lqm9hi36h5bibiwhl1b4a1179yrmys"; + version = "7.1.28"; + sha256 = "1jal5kr3h9krgb4x46l7wg9czfiigax6vni6cagfdi8zzqrqg7kk"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch; }; php72 = generic { - version = "7.2.16"; - sha256 = "0f3zkv803banqdrhj5ixfg973fnrsvn4hcij2k6r91nmac0d22ic"; + version = "7.2.17"; + sha256 = "0xag1735q92kj8p09gyydxknisgz7h56pksr44qwnykddymi3a4i"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.3"; - sha256 = "1riw0a1mzc5ymaj02rni57l5pyfkxl0ygf1l39q7ksnz7aa9x5k1"; + version = "7.3.4"; + sha256 = "0y1bl4nwpr0z11wsdizrs3nvkx1xs3xzy7mn8gj4jdn82a13sb1f"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index 249c4ac9cf79..505929df8ef0 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -79,20 +79,6 @@ let sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; }) - # "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self". - # In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor." - # https://github.com/python/cpython/pull/6118 - (fetchpatch { - name = "type_getattro.patch"; - url = "file://${./type_getattro.patch}"; - sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd"; - }) - - (fetchpatch { - name = "CVE-2018-1000802.patch"; - url = "https://github.com/python/cpython/pull/8985.patch"; - sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97"; - }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch deleted file mode 100644 index c69c86b642b4..000000000000 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/Objects/typeobject.c -+++ b/Objects/typeobject.c -@@ -3137,6 +3137,7 @@ - PyTypeObject *metatype = Py_TYPE(type); - PyObject *meta_attribute, *attribute; - descrgetfunc meta_get; -+ PyObject* res; - - if (!PyUnicode_Check(name)) { - PyErr_Format(PyExc_TypeError, -@@ -3158,6 +3159,7 @@ - meta_attribute = _PyType_Lookup(metatype, name); - - if (meta_attribute != NULL) { -+ Py_INCREF(meta_attribute); - meta_get = Py_TYPE(meta_attribute)->tp_descr_get; - - if (meta_get != NULL && PyDescr_IsData(meta_attribute)) { -@@ -3165,10 +3167,11 @@ - * writes. Assume the attribute is not overridden in - * type's tp_dict (and bases): call the descriptor now. - */ -- return meta_get(meta_attribute, (PyObject *)type, -- (PyObject *)metatype); -+ res = meta_get(meta_attribute, (PyObject *)type, -+ (PyObject *)metatype); -+ Py_DECREF(meta_attribute); -+ return res; - } -- Py_INCREF(meta_attribute); - } - - /* No data descriptor found on metatype. Look in tp_dict of this -@@ -3176,6 +3179,7 @@ - attribute = _PyType_Lookup(type, name); - if (attribute != NULL) { - /* Implement descriptor functionality, if any */ -+ Py_INCREF(attribute); - descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get; - - Py_XDECREF(meta_attribute); -@@ -3183,11 +3187,12 @@ - if (local_get != NULL) { - /* NULL 2nd argument indicates the descriptor was - * found on the target object itself (or a base) */ -- return local_get(attribute, (PyObject *)NULL, -- (PyObject *)type); -+ res = local_get(attribute, (PyObject *)NULL, -+ (PyObject *)type); -+ Py_DECREF(attribute); -+ return res; - } - -- Py_INCREF(attribute); - return attribute; - } - ---- /dev/null -+++ b/Misc/NEWS.d/next/Core and Builtins/2018-03-14-21-42-17.bpo-25750.lxgkQz.rst -@@ -0,0 +1,2 @@ -+Fix rare Python crash due to bad refcounting in ``type_getattro()`` if a -+descriptor deletes itself from the class. diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch new file mode 100644 index 000000000000..ceb6047d31dd --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch @@ -0,0 +1,248 @@ +--- a/Lib/_osx_support.py ++++ b/Lib/_osx_support.py +@@ -14,13 +14,13 @@ __all__ = [ + # configuration variables that may contain universal build flags, + # like "-arch" or "-isdkroot", that may need customization for + # the user environment +-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', +- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', +- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', +- 'PY_CORE_CFLAGS', 'PY_CORE_LDFLAGS') ++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', ++ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', ++ 'PY_CPPFLAGS', 'PY_CORE_LDFLAGS', 'PY_CORE_CFLAGS') + + # configuration variables that may contain compiler calls +-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') ++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') + + # prefix added to original configuration variable names + _INITPRE = '_OSX_SUPPORT_INITIAL_' +--- a/Lib/distutils/cygwinccompiler.py ++++ b/Lib/distutils/cygwinccompiler.py +@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): + # dllwrap 2.10.90 is buggy + if self.ld_version >= "2.10.90": + self.linker_dll = "gcc" ++ self.linker_dll_cxx = "g++" + else: + self.linker_dll = "dllwrap" ++ self.linker_dll_cxx = "dllwrap" + + # ld_version >= "2.13" support -shared so use it instead of + # -mdll -static +@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler): + self.set_executables(compiler='gcc -mcygwin -O -Wall', + compiler_so='gcc -mcygwin -mdll -O -Wall', + compiler_cxx='g++ -mcygwin -O -Wall', ++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', + linker_exe='gcc -mcygwin', + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='g++ -mcygwin', ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll_cxx, shared_option))) + + # cygwin and mingw32 need different sets of libraries + if self.gcc_version == "2.91.57": +@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler): + raise CompileError(msg) + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): + self.set_executables(compiler='gcc -O -Wall', + compiler_so='gcc -mdll -O -Wall', + compiler_cxx='g++ -O -Wall', ++ compiler_so_cxx='g++ -mdll -O -Wall', + linker_exe='gcc', + linker_so='%s %s %s' + % (self.linker_dll, shared_option, ++ entry_point), ++ linker_exe_cxx='g++', ++ linker_so_cxx='%s %s %s' ++ % (self.linker_dll_cxx, shared_option, + entry_point)) + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -170,9 +170,11 @@ def customize_compiler(compiler): + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ ++ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ ++ cxxflags = cflags + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -187,19 +189,27 @@ def customize_compiler(compiler): + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -208,13 +218,17 @@ def customize_compiler(compiler): + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + + compiler.shared_lib_extension = shlib_suffix +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler): + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = self.compiler_so ++ compiler_so_cxx = self.compiler_so_cxx + if sys.platform == 'darwin': + compiler_so = _osx_support.compiler_fixup(compiler_so, + cc_args + extra_postargs) ++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, ++ cc_args + extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler): + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: +- if target_desc == CCompiler.EXECUTABLE: +- linker = self.linker_exe[:] ++ if target_lang == "c++": ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe_cxx[:] ++ else: ++ linker = self.linker_so_cxx[:] + else: +- linker = self.linker_so[:] +- if target_lang == "c++" and self.compiler_cxx: +- # skip over environment variable settings if /usr/bin/env +- # is used to set up the linker's environment. +- # This is needed on OSX. Note: this assumes that the +- # normal and C++ compiler have the same environment +- # settings. +- i = 0 +- if os.path.basename(linker[0]) == "env": +- i = 1 +- while '=' in linker[i]: +- i += 1 +- +- if os.path.basename(linker[i]) == 'ld_so_aix': +- # AIX platforms prefix the compiler with the ld_so_aix +- # script, so we need to adjust our linker index +- offset = 1 ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe[:] + else: +- offset = 0 +- +- linker[i+offset] = self.compiler_cxx[i] ++ linker = self.linker_so[:] + + if sys.platform == 'darwin': + linker = _osx_support.compiler_fixup(linker, ld_args) +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -584,10 +584,10 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o + *\ -s*|s*) quiet="-q";; \ + *) quiet="";; \ + esac; \ +- echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ +- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build + diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 6fbeae381363..64021672276d 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -104,6 +104,8 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch + else if isPy37 then + ./3.7/python-3.x-distutils-C++.patch else fetchpatch { url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch"; diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix index ea755b234cfb..15af58be6fc9 100644 --- a/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -50,10 +50,10 @@ in { sourceVersion = { major = "2"; minor = "7"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; + sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -89,10 +89,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "2"; + patch = "3"; suffix = ""; }; - sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq"; + sha256 = "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s"; inherit (darwin) CF configd; inherit passthruFun; }; diff --git a/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/nixpkgs/pkgs/development/interpreters/renpy/default.nix index 1b40c71e2ea5..16434837dd14 100644 --- a/nixpkgs/pkgs/development/interpreters/renpy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "7.2.0"; + version = "7.2.2"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "1pnzxmh37zzldvlyklk2wgc8xbh3hm3wwmbl70zdphybjrxvc7i5"; + sha256 = "0b8pky0npi4gw59cnjicyrc9q1x2zsxa7x68y74dbgjg9r0dgkd7"; }; patches = [ diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix index ea96e5ed334a..1d7a11df5a41 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr, buildPackages }: let version = "52.9.0"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { setOutputFlags = false; # Configure script only understands --includedir buildInputs = [ readline icu zlib nspr ]; - nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; + nativeBuildInputs = [ autoconf213 pkgconfig perl which buildPackages.python2 zip ]; # Apparently this package fails to build correctly with modern compilers, which at least # on ARMv6 causes polkit testsuite to break with an assertion failure in spidermonkey. @@ -31,10 +31,12 @@ in stdenv.mkDerivation rec { }) ]; + configurePlatforms = [ "host" "target" ]; + preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out - export PYTHON="${python2.interpreter}" + export PYTHON="${buildPackages.python2.interpreter}" configureFlagsArray+=("--includedir=$dev/include") cd js/src @@ -43,7 +45,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-system-nspr" + "--with-nspr-prefix=${nspr}" "--with-system-zlib" "--with-system-icu" "--with-intl-api" @@ -51,6 +53,12 @@ in stdenv.mkDerivation rec { "--enable-shared-js" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc"; + makeFlags = [ + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + ]; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + enableParallelBuilding = true; postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/nixpkgs/pkgs/development/libraries/CGAL/default.nix index 787c54c1b0a3..95984c970018 100644 --- a/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.13"; + version = "4.14"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "1gzfz0fz7q5qyhzwfl3n1f5jrqa1ijq9kjjms7hb0ywpagipq6ax"; + sha256 = "0p0s1dl5a261zwy0hxa7ylkypk45rwc6n84lx507dwdhfz4ihv12"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/nixpkgs/pkgs/development/libraries/SDL/default.nix b/nixpkgs/pkgs/development/libraries/SDL/default.nix index e2ff66a47084..007cd02957ba 100644 --- a/nixpkgs/pkgs/development/libraries/SDL/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL/default.nix @@ -1,8 +1,9 @@ { stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv , openglSupport ? libGLSupported, libGL, libGLU -, alsaSupport ? stdenv.isLinux, alsaLib -, x11Support ? !stdenv.isCygwin, libXext, libICE, libXrandr -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid +, libXext, libICE, libXrandr +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa , cf-private }: @@ -12,9 +13,6 @@ with stdenv.lib; -assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null); - stdenv.mkDerivation rec { name = "SDL-${version}"; version = "1.2.15"; @@ -30,18 +28,18 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ optionals x11Support [ libXext libICE libXrandr ] - ++ optional stdenv.isLinux libcap ++ optionals openglSupport [ libGL libGLU ] ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; buildInputs = [ ] - ++ optional (!stdenv.hostPlatform.isMinGW) audiofile + ++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL # Needed for NSDefaultRunLoopMode symbols. diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index d82b25fb8926..8f1b7d93d002 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -1,12 +1,16 @@ { stdenv, config, libGLSupported, fetchurl, pkgconfig , openglSupport ? libGLSupported, libGL -, alsaSupport ? stdenv.isLinux, alsaLib -, x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr -, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon -, dbusSupport ? stdenv.isLinux, dbus +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid +, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor +, libXinerama, libXext, libXxf86vm, libXrandr +, waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, wayland, wayland-protocols, libxkbcommon +, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL , audiofile, cf-private, libiconv }: @@ -16,9 +20,6 @@ with stdenv.lib; -assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null); - stdenv.mkDerivation rec { name = "SDL2-${version}"; version = "2.0.9"; @@ -44,14 +45,14 @@ stdenv.mkDerivation rec { ++ optionals x11Support [ libX11 xorgproto ]; dlopenBuildInputs = [ ] - ++ optional alsaSupport alsaLib + ++ optionals alsaSupport [ alsaLib audiofile ] ++ optional dbusSupport dbus ++ optional pulseaudioSupport libpulseaudio ++ optional udevSupport udev ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]; - buildInputs = [ audiofile libiconv ] + buildInputs = [ libiconv ] ++ dlopenBuildInputs ++ optional ibusSupport ibus ++ optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/ace/default.nix b/nixpkgs/pkgs/development/libraries/ace/default.nix index 54c95d6087a1..e0c46acb6303 100644 --- a/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.4"; + version = "6.5.5"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0qs54p2kwkk05nfkijdn0rksjw86bkdk4mnh2nkxgnv32s6wdkv6"; + sha256 = "1r1bvy65n50l6lbxm1k1bscqcv29mpkgp0pgr5cvvv7ldisrjl39"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/alure/default.nix b/nixpkgs/pkgs/development/libraries/alure/default.nix index fe2892c96270..95828c44f851 100644 --- a/nixpkgs/pkgs/development/libraries/alure/default.nix +++ b/nixpkgs/pkgs/development/libraries/alure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility library to help manage common tasks with OpenAL applications"; - homepage = http://kcat.strangesoft.net/alure.html; + homepage = https://kcat.strangesoft.net/alure.html; license = licenses.mit; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix b/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix index f14c77f666bd..4b8093f74031 100644 --- a/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix +++ b/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix @@ -1,5 +1,24 @@ { stdenv, fetchurl, fetchpatch }: +let + patch-argp-fmtstream = fetchpatch { + name = "patch-argp-fmtstream.h"; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h"; + sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8"; + }; + + patch-throw-in-funcdef = fetchpatch { + name = "argp-standalone-1.3-throw-in-funcdef.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-throw-in-funcdef.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca"; + sha256 = "0b2b4l1jkvmnffl22jcn4ydzxy2i7fnmmnfim12f0yg5pb8fs43c"; + }; + + patch-shared = fetchpatch { + name = "argp-standalone-1.3-shared.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca"; + sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; + }; +in stdenv.mkDerivation rec { name = "argp-standalone-1.3"; @@ -8,24 +27,19 @@ stdenv.mkDerivation rec { sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be"; }; - patches = [ - (if stdenv.hostPlatform.isDarwin then - fetchpatch { - name = "patch-argp-fmtstream.h"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h"; - sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8"; - } - else null) - ]; - - patchFlags = "-p0"; - - postInstall = - '' - mkdir -p $out/lib $out/include - cp libargp.a $out/lib - cp argp.h $out/include - ''; + patches = + stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; + + patchFlags = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "-p0"; + + preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; + + postInstall = '' + mkdir -p $out/lib $out/include + cp libargp.a $out/lib + cp argp.h $out/include + ''; doCheck = true; @@ -34,8 +48,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.lysator.liu.se/~nisse/misc/"; description = "Standalone version of arguments parsing functions from GLIBC"; - platforms = platforms.darwin; + platforms = with platforms; darwin ++ [ "x86_64-linux" ]; maintainers = with maintainers; [ amar1729 ]; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/development/libraries/arguments/default.nix b/nixpkgs/pkgs/development/libraries/arguments/default.nix index ebef604e1be6..cb0c65e97e3b 100644 --- a/nixpkgs/pkgs/development/libraries/arguments/default.nix +++ b/nixpkgs/pkgs/development/libraries/arguments/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ ]; - #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ]; + #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ]; doCheck = false; # internal_volume_io.h: No such file or directory diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix index 84340a25bb1d..6c3f3aa9fa29 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "at-spi2-atk"; - version = "2.30.1"; + version = "2.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rxqp9kgf8mcyg84b9pq2kpqr1ws81ijn9nfdis2w0ixy9cbjfyr"; + sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"; }; nativeBuildInputs = [ meson ninja pkgconfig ] diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 759666c827e9..0fc50f2c641f 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "at-spi2-core"; - version = "2.30.1"; + version = "2.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0j6aa071lnhpgv9h8l0pqimk8pc152gqpcbmq8djlj7h3f7iyvw5"; + sha256 = "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/atk/default.nix b/nixpkgs/pkgs/development/libraries/atk/default.nix index b56c84f57bd0..0a076442b42c 100644 --- a/nixpkgs/pkgs/development/libraries/atk/default.nix +++ b/nixpkgs/pkgs/development/libraries/atk/default.nix @@ -4,7 +4,7 @@ let pname = "atk"; - version = "2.30.0"; + version = "2.32.0"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0yq25iisnf0rmlg2x5ghzqk9vhf2jramb2khxqghqakz47a90kfx"; + sha256 = "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix index b6203a159e6c..78763ca29e2a 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build ''; - configureFlags = [ + wafConfigureFlags = [ "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index dd200304ab64..682a74593fdc 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "169ha105qgcvj93hf1bhlya2nlwh8g5fvypd6whfjs9k0hqddi0c"; + sha256 = "0wfqs77plb37gp586a0pclxjlpsjvq44991am8p2g5j46zfz6pdx"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9ba611b0f96f..e53c75e6f74e 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.7.53"; + version = "1.7.56"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0ybccffz5nrhp4n4nyb6ykrk9fdi0vqqqhjkaxx3l0xvmqx9rbrv"; + sha256 = "0vfw5bqlwm5r0ikziz3jx6yb5v24lwig0m62979zy3ndx36kpb9b"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index 4c942cac3f69..947065997ec9 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.60"; + name = "babl-0.1.62"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0kv0y12j4k9khrxqa7rryfb4ikcnrax6x4nwi70wnz05nv6fxld3"; + sha256 = "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw"; }; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix index 1a2c75ecf912..2618d35ff794 100644 --- a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix +++ b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "boehm-gc-${version}"; - version = "8.0.2"; + version = "8.0.4"; src = fetchurl { urls = [ "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" ]; - sha256 = "1jsixcpdwy5cgq5s9fi3bdlid9zh46vakymf3nbjffianyss932f"; + sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"; }; buildInputs = [ libatomic_ops ]; diff --git a/nixpkgs/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch b/nixpkgs/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch new file mode 100644 index 000000000000..f8163f6d2718 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch @@ -0,0 +1,45 @@ +diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam +index 273b28a..2d2031e 100644 +--- a/tools/build/v2/tools/python.jam ++++ b/tools/build/v2/tools/python.jam +@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? ) + + local rule darwin-installed-pythons ( version ? ) + { +- version ?= $(.version-countdown) ; +- +- local prefix +- = [ GLOB /System/Library/Frameworks /Library/Frameworks +- : Python.framework ] ; +- +- return $(prefix)/Versions/$(version)/bin/python ; ++ return ; + } + + +@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + + # See if we can find a framework directory on darwin. + local framework-directory ; +- if $(target-os) = darwin +- { +- # Search upward for the framework directory. +- local framework-directory = $(libraries[-1]) ; +- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework +- { +- framework-directory = $(framework-directory:D) ; +- } +- +- if $(framework-directory:D=) = Python.framework +- { +- debug-message framework directory is \"$(framework-directory)\" ; +- } +- else +- { +- debug-message "no framework directory found; using library path" ; +- framework-directory = ; +- } +- } + + local dll-path = $(libraries) ; + diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index dd383bd01231..8ce44b878d07 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -104,7 +104,10 @@ stdenv.mkDerivation { patchFlags = ""; patches = patches - ++ optional stdenv.isDarwin ./darwin-no-system-python.patch; + ++ optional stdenv.isDarwin ( + if version == "1.55.0" + then ./darwin-1.55-no-system-python.patch + else ./darwin-no-system-python.patch); meta = { homepage = http://boost.org/; diff --git a/nixpkgs/pkgs/development/libraries/c-blosc/default.nix b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix index c52d7c2756dc..4c28ca9f2c71 100644 --- a/nixpkgs/pkgs/development/libraries/c-blosc/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "c-blosc-${version}"; - version = "1.14.4"; + version = "1.16.2"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "195w96gl75mkxxqq6qjsmb2s1lq8z95qlc71fr5a7sckslcwglh0"; + sha256 = "19wb699rb5bn6h9qhw1m18m2w77lws7r50vxpgrvggnl27mvm3xc"; }; buildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 845b09053ad4..a761b8bd3f22 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -40,6 +40,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig + ]; + + buildInputs = [ libiconv libintl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/nixpkgs/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix index 1fbee74f5dbb..666db6f88e22 100644 --- a/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-H.." - "-DBUILD_TESTING=OFF"]; + cmakeFlags = [ "-H.." ]; meta = with stdenv.lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; diff --git a/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/nixpkgs/pkgs/development/libraries/cracklib/default.nix index b75f03fab7c7..d335a286c87b 100644 --- a/nixpkgs/pkgs/development/libraries/cracklib/default.nix +++ b/nixpkgs/pkgs/development/libraries/cracklib/default.nix @@ -1,15 +1,35 @@ -{ stdenv, fetchurl, zlib, gettext }: +let version = "2.9.7"; in +{ stdenv, fetchurl, zlib, gettext +, wordlists ? [ (fetchurl { + url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; + sha256 = "12fk8w06q628v754l357cf8kfjna98wj09qybpqr892az3x4a33z"; +}) ] +}: stdenv.mkDerivation rec { - name = "cracklib-2.9.6"; + pname = "cracklib"; + inherit version; src = fetchurl { - url = "https://github.com/cracklib/cracklib/releases/download/${name}/${name}.tar.gz"; - sha256 = "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; + sha256 = "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py"; }; buildInputs = [ zlib gettext ]; + postPatch = '' + chmod +x util/cracklib-format + patchShebangs util + + ln -vs ${toString wordlists} dicts/ + ''; + + postInstall = '' + make dict + ''; + doInstallCheck = true; + installCheckTarget = "test"; + meta = with stdenv.lib; { homepage = https://github.com/cracklib/cracklib; description = "A library for checking the strength of passwords"; diff --git a/nixpkgs/pkgs/development/libraries/db/generic.nix b/nixpkgs/pkgs/development/libraries/db/generic.nix index c3ca9aa442bd..bb501fb9c68d 100644 --- a/nixpkgs/pkgs/development/libraries/db/generic.nix +++ b/nixpkgs/pkgs/development/libraries/db/generic.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation (rec { rm -rf $out/docs ''; + enableParallelBuilding = true; + doCheck = true; checkPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix index 04fd04a564f8..402bf0232813 100644 --- a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix +++ b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "082w15xq8f4c422a71phvcahgc8vmqrig97av9g9628q5n2ybbgg"; + sha256 = "13xwcqk2c0q8c1siw566clxcpvp0xrxvb72mra42wa3nvq9wlsv6"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index d8a13a9c384d..7e2507d5afdf 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchpatch # Darwin frameworks -, Cocoa, CoreMedia +, Cocoa, CoreMedia, VideoToolbox , ... }@args: @@ -8,5 +8,5 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; branch = "4.1.2"; sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0"; - darwinFrameworks = [ Cocoa CoreMedia ]; + darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; }) diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index d11ef732a01f..72929e127bcc 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, x265, xvidcore, zlib, libopus, speex +, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers , openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -161,7 +161,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex + libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers ] ++ optional openglSupport libGLU_combined ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM diff --git a/nixpkgs/pkgs/development/libraries/flatcc/default.nix b/nixpkgs/pkgs/development/libraries/flatcc/default.nix index f3d06f7a01ab..8518545665c9 100644 --- a/nixpkgs/pkgs/development/libraries/flatcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatcc/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "flatcc"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "dvidelabs"; repo = "flatcc"; rev = "v${version}"; - sha256 = "sha256:0cb6s9q1cbigss1q7dra0ix2a0iqlh2xxwncbrnmqv17h4lwvglr"; + sha256 = "06wnwvnkhw1rk0y3nncjmcyjy3bgpw8i9xqd5gpbhbrm38718cjk"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 65c876320b5a..a4a0bd1a263c 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.2.3"; + version = "1.2.4"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv"; + sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v"; }; patches = [ @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch ./use-flatpak-from-path.patch + ./unset-env-vars.patch ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch new file mode 100644 index 000000000000..798e388b23c2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -0,0 +1,10 @@ +--- a/common/flatpak-run.c ++++ b/common/flatpak-run.c +@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = { + {"PERLLIB", NULL}, + {"PERL5LIB", NULL}, + {"XCURSOR_PATH", NULL}, ++ {"GDK_PIXBUF_MODULE_FILE", NULL}, + }; + + static const ExportData no_ld_so_cache_exports[] = { diff --git a/nixpkgs/pkgs/development/libraries/fltk/default.nix b/nixpkgs/pkgs/development/libraries/fltk/default.nix index 270936a91b9f..60773d29d3d6 100644 --- a/nixpkgs/pkgs/development/libraries/fltk/default.nix +++ b/nixpkgs/pkgs/development/libraries/fltk/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.3.4"; + version = "1.3.5"; in stdenv.mkDerivation { name = "fltk-${version}"; src = fetchurl { url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "13y57pnayrkfzm8azdfvysm8b77ysac8zhhdsh8kxmb0x3203ay8"; + sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/folks/default.nix b/nixpkgs/pkgs/development/libraries/folks/default.nix index 2ce50a92ea36..57edbaef2984 100644 --- a/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib libgee sqlite ]; - # dbus_daemon needed for tests + buildInputs = [ - dbus-glib telepathy-glib evolution-data-server dbus + dbus-glib telepathy-glib evolution-data-server libsecret libxml2 libsoup nspr nss db ]; + + checkInputs = [ dbus ]; + nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; configureFlags = [ "--disable-fatal-warnings" ]; - NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"]; - enableParallelBuilding = true; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index 7381c240c8c8..37be3c01d937 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2019.01.28.00"; + version = "2019.03.18.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0ll7ivf59s4xpc6wkyxnl1hami3s2a0kq8njr57lxiqy938clh4g"; + sha256 = "0g7c2lq4prcw9dd5r4q62l8kqm8frczrfq8m4mgs22np60yvmb6d"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 3cd4a894b37f..b18d72e0a228 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -2,7 +2,8 @@ runCommand "fonts.conf" { - buildInputs = [ libxslt fontconfig ]; + nativeBuildInputs = [ libxslt ]; + buildInputs = [ fontconfig ]; # Add a default font for non-nixos systems, <1MB and in nixos defaults. fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]; } diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index 76df9514cf4a..4658ac049df9 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -13,8 +13,8 @@ let inherit (stdenv.lib) optional optionalString; in stdenv.mkDerivation rec { - name = "freetype-${version}"; - version = "2.9.1"; + pname = "freetype"; + version = "2.10.0"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype diff --git a/nixpkgs/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/nixpkgs/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch index 4f908343e8c1..6b3577eb4f02 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch +++ b/nixpkgs/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch @@ -1,13 +1,12 @@ -Index: freetype-2.7.1/include/freetype/config/ftoption.h -=================================================================== ---- freetype-2.7.1.orig/include/freetype/config/ftoption.h -+++ freetype-2.7.1/include/freetype/config/ftoption.h -@@ -122,7 +122,7 @@ FT_BEGIN_HEADER - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ +Index: freetype-2.10.0/include/freetype/config/ftoption.h +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -126,7 +126,7 @@ FT_BEGIN_HEADER + * macro is not defined, FreeType offers alternative LCD rendering + * technology that produces excellent output without LCD filtering. + */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - /*************************************************************************/ + /************************************************************************** diff --git a/nixpkgs/pkgs/development/libraries/freetype/enable-table-validation.patch b/nixpkgs/pkgs/development/libraries/freetype/enable-table-validation.patch index 37419f14f40f..bd964c3342d8 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/enable-table-validation.patch +++ b/nixpkgs/pkgs/development/libraries/freetype/enable-table-validation.patch @@ -1,20 +1,18 @@ -Index: freetype-2.7.1/modules.cfg +Index: freetype-2.10.0/modules.cfg =================================================================== ---- freetype-2.7.1.orig/modules.cfg -+++ freetype-2.7.1/modules.cfg -@@ -120,7 +120,7 @@ AUX_MODULES += cache +--- freetype-2.10.0.orig/modules.cfg ++++ freetype-2.10.0/modules.cfg +@@ -120,6 +120,6 @@ AUX_MODULES += cache # TrueType GX/AAT table validation. Needs ftgxval.c below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += gxvalid +AUX_MODULES += gxvalid # Support for streams compressed with gzip (files with suffix .gz). # -@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 +@@ -143,6 +143,6 @@ AUX_MODULES += bzip2 # OpenType table validation. Needs ftotval.c below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += otvalid +AUX_MODULES += otvalid diff --git a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index 20f05d28bfe4..d98d9e8107e9 100644 --- a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -4,28 +4,18 @@ let pname = "gdk-pixbuf"; - version = "2.38.0"; + version = "2.38.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x"; + sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi"; }; patches = [ - # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which requires access to shared-mime-info files during runtime. - # For now, we are patching the build script to avoid the dependency. - ./no-mime-sniffing.patch - # Move installed tests to a separate output ./installed-tests-path.patch - - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch; - sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92"; - }) ]; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; @@ -48,6 +38,7 @@ in stdenv.mkDerivation rec { "-Djasper=true" "-Dx11=true" "-Dgir=${if gobject-introspection != null then "true" else "false"}" + "-Dgio_sniffing=false" ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix index 0fdf0a09be6c..da20438fb4bb 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix @@ -1,20 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, babl, libpng, cairo, libjpeg, which +, librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw , gexiv2, libwebp, gnome3, libintl }: -let - version = "0.4.12"; -in stdenv.mkDerivation rec { - name = "gegl-${version}"; +stdenv.mkDerivation rec { + pname = "gegl"; + version = "0.4.14"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9"; + url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "00crhngwi07f5b9x77kx5p7p4cl6l5g6glpz9rqv7pfqk62xa0ac"; }; + patches = stdenv.lib.optionals stdenv.isDarwin [ + # Make the Darwin patches below apply cleanly + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gegl/commit/141a7aa76cd36143f624f06b1c43d2483945653c.patch; + sha256 = "0ijv9ra6723jn60krjwzbc6l9qr08h76bsz9xgddvfgsgr1nnpbi"; + }) + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gegl/commit/b3ff0df080d133bbdb394c3db40d4f9d2980a8a6.patch; + sha256 = "0im0rqk8mz9vi7qqx06vj4wm5hjwv1544jwdaaywlcrs9g266hl0"; + }) + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gegl/commit/fe756be6f0c776a45201a61f67d3e5e42f6398de.patch; + sha256 = "0h3rqwfsph2gisbwvc2v5a9r5b0djcxlm790xpi6yfndj42b0v2b"; + }) + # Fix build on Darwin + # https://gitlab.gnome.org/GNOME/gegl/merge_requests/28 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gegl/commit/ac331b5c0e3d940b64bb811b0f54e86c7d312917.patch; + sha256 = "1yj9jh8q9cbr1szrxhdapknk4nfhbkbc1njv50ifrj7vyfislj34"; + }) + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gegl/commit/d05eb01170728f45f561ca937708a293e29e02d9.patch; + sha256 = "0gwz12sm8kkmzyxsiq0sl30cabs5q0ckj743yrzimspkhrvc1ya2"; + }) + ]; + enableParallelBuilding = true; doCheck = true; @@ -26,7 +51,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc - nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; + nativeBuildInputs = [ pkgconfig gettext which autoreconfHook libintl ]; meta = with stdenv.lib; { description = "Graph-based image processing framework"; diff --git a/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix b/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix index ebb9b354ff1d..c1d0d7e8a4f1 100644 --- a/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.0"; + version = "3.26.1"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; + sha256 = "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch b/nixpkgs/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch new file mode 100644 index 000000000000..b734c1c8b027 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch @@ -0,0 +1,323 @@ +This patch was generated by re-running Bison 3.0.4 on pro-gram-gen.y after +applying CVE-2018-18751.patch. This patch removes the need to add bison to +nativeBuildInputs. + +--- a/gettext-tools/src/po-gram-gen.c ++++ b/gettext-tools/src/po-gram-gen.c +@@ -568,9 +568,9 @@ static const yytype_uint8 yytranslate[] = + static const yytype_uint16 yyrline[] = + { + 0, 169, 169, 171, 172, 173, 174, 179, 187, 195, +- 216, 240, 249, 258, 269, 278, 292, 301, 315, 321, +- 332, 338, 350, 361, 372, 376, 391, 414, 422, 434, +- 442 ++ 216, 237, 246, 255, 266, 275, 289, 298, 312, 318, ++ 329, 335, 347, 358, 369, 373, 388, 411, 419, 431, ++ 439 + }; + #endif + +@@ -1419,14 +1419,11 @@ yyreduce: + check_obsolete ((yyvsp[-3].message_intro), (yyvsp[-1].string)); + check_obsolete ((yyvsp[-3].message_intro), (yyvsp[0].rhs)); + if (!(yyvsp[-3].message_intro).obsolete || pass_obsolete_entries) +- { +- do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string, +- (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos, +- (yyvsp[-3].message_intro).prev_ctxt, +- (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural, +- (yyvsp[-3].message_intro).obsolete); +- free ((yyvsp[-1].string).string); +- } ++ do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string, ++ (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos, ++ (yyvsp[-3].message_intro).prev_ctxt, ++ (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural, ++ (yyvsp[-3].message_intro).obsolete); + else + { + free_message_intro ((yyvsp[-3].message_intro)); +@@ -1435,11 +1432,11 @@ yyreduce: + free ((yyvsp[0].rhs).rhs.msgstr); + } + } +-#line 1439 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1436 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 11: +-#line 241 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 238 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].string)); +@@ -1448,11 +1445,11 @@ yyreduce: + string_list_destroy (&(yyvsp[-1].stringlist).stringlist); + free ((yyvsp[0].string).string); + } +-#line 1452 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1449 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 12: +-#line 250 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 247 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].rhs)); +@@ -1461,22 +1458,22 @@ yyreduce: + string_list_destroy (&(yyvsp[-1].stringlist).stringlist); + free ((yyvsp[0].rhs).rhs.msgstr); + } +-#line 1465 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1462 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 13: +-#line 259 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 256 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].message_intro), (yyvsp[0].stringlist)); + po_gram_error_at_line (&(yyvsp[-1].message_intro).pos, _("missing 'msgstr' section")); + free_message_intro ((yyvsp[-1].message_intro)); + string_list_destroy (&(yyvsp[0].stringlist).stringlist); + } +-#line 1476 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1473 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 14: +-#line 270 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 267 "po-gram-gen.y" /* yacc.c:1646 */ + { + (yyval.message_intro).prev_ctxt = NULL; + (yyval.message_intro).prev_id = NULL; +@@ -1485,11 +1482,11 @@ yyreduce: + (yyval.message_intro).pos = (yyvsp[0].string).pos; + (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete; + } +-#line 1489 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1486 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 15: +-#line 279 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 276 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].prev), (yyvsp[0].string)); + (yyval.message_intro).prev_ctxt = (yyvsp[-1].prev).ctxt; +@@ -1499,11 +1496,11 @@ yyreduce: + (yyval.message_intro).pos = (yyvsp[0].string).pos; + (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete; + } +-#line 1503 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1500 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 16: +-#line 293 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 290 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].string), (yyvsp[0].stringlist)); + (yyval.prev).ctxt = (yyvsp[-1].string).string; +@@ -1512,11 +1509,11 @@ yyreduce: + (yyval.prev).pos = (yyvsp[-1].string).pos; + (yyval.prev).obsolete = (yyvsp[-1].string).obsolete; + } +-#line 1516 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1513 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 17: +-#line 302 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 299 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].string), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].string), (yyvsp[0].string)); +@@ -1526,21 +1523,21 @@ yyreduce: + (yyval.prev).pos = (yyvsp[-2].string).pos; + (yyval.prev).obsolete = (yyvsp[-2].string).obsolete; + } +-#line 1530 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1527 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 18: +-#line 316 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 313 "po-gram-gen.y" /* yacc.c:1646 */ + { + (yyval.string).string = NULL; + (yyval.string).pos = (yyvsp[0].pos).pos; + (yyval.string).obsolete = (yyvsp[0].pos).obsolete; + } +-#line 1540 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1537 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 19: +-#line 322 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 319 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos)); +@@ -1548,21 +1545,21 @@ yyreduce: + (yyval.string).pos = (yyvsp[0].pos).pos; + (yyval.string).obsolete = (yyvsp[0].pos).obsolete; + } +-#line 1552 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1549 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 20: +-#line 333 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 330 "po-gram-gen.y" /* yacc.c:1646 */ + { + (yyval.string).string = NULL; + (yyval.string).pos = (yyvsp[0].pos).pos; + (yyval.string).obsolete = (yyvsp[0].pos).obsolete; + } +-#line 1562 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1559 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 21: +-#line 339 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 336 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist)); + check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos)); +@@ -1570,11 +1567,11 @@ yyreduce: + (yyval.string).pos = (yyvsp[0].pos).pos; + (yyval.string).obsolete = (yyvsp[0].pos).obsolete; + } +-#line 1574 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1571 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 22: +-#line 351 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 348 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist)); + plural_counter = 0; +@@ -1582,30 +1579,30 @@ yyreduce: + (yyval.string).pos = (yyvsp[-1].pos).pos; + (yyval.string).obsolete = (yyvsp[-1].pos).obsolete; + } +-#line 1586 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1583 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 23: +-#line 362 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 359 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist)); + (yyval.string).string = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist); + (yyval.string).pos = (yyvsp[-1].pos).pos; + (yyval.string).obsolete = (yyvsp[-1].pos).obsolete; + } +-#line 1597 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1594 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 24: +-#line 373 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 370 "po-gram-gen.y" /* yacc.c:1646 */ + { + (yyval.rhs) = (yyvsp[0].rhs); + } +-#line 1605 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1602 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 25: +-#line 377 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 374 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].rhs), (yyvsp[0].rhs)); + (yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[-1].rhs).rhs.msgstr_len + (yyvsp[0].rhs).rhs.msgstr_len, char); +@@ -1617,11 +1614,11 @@ yyreduce: + (yyval.rhs).pos = (yyvsp[-1].rhs).pos; + (yyval.rhs).obsolete = (yyvsp[-1].rhs).obsolete; + } +-#line 1621 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1618 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 26: +-#line 392 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 389 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-4].pos), (yyvsp[-3].pos)); + check_obsolete ((yyvsp[-4].pos), (yyvsp[-2].number)); +@@ -1640,11 +1637,11 @@ yyreduce: + (yyval.rhs).pos = (yyvsp[-4].pos).pos; + (yyval.rhs).obsolete = (yyvsp[-4].pos).obsolete; + } +-#line 1644 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1641 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 27: +-#line 415 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 412 "po-gram-gen.y" /* yacc.c:1646 */ + { + string_list_init (&(yyval.stringlist).stringlist); + string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string); +@@ -1652,11 +1649,11 @@ yyreduce: + (yyval.stringlist).pos = (yyvsp[0].string).pos; + (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete; + } +-#line 1656 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1653 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 28: +-#line 423 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 420 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string)); + (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist; +@@ -1665,11 +1662,11 @@ yyreduce: + (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos; + (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete; + } +-#line 1669 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1666 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 29: +-#line 435 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 432 "po-gram-gen.y" /* yacc.c:1646 */ + { + string_list_init (&(yyval.stringlist).stringlist); + string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string); +@@ -1677,11 +1674,11 @@ yyreduce: + (yyval.stringlist).pos = (yyvsp[0].string).pos; + (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete; + } +-#line 1681 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1678 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + case 30: +-#line 443 "po-gram-gen.y" /* yacc.c:1646 */ ++#line 440 "po-gram-gen.y" /* yacc.c:1646 */ + { + check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string)); + (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist; +@@ -1690,11 +1687,11 @@ yyreduce: + (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos; + (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete; + } +-#line 1694 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1691 "po-gram-gen.c" /* yacc.c:1646 */ + break; + + +-#line 1698 "po-gram-gen.c" /* yacc.c:1646 */ ++#line 1695 "po-gram-gen.c" /* yacc.c:1646 */ + default: break; + } + /* User semantic actions sometimes alter yychar, and that requires diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix index 8ed898813aef..75d1eec25f62 100644 --- a/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchurl, libiconv, xz }: +{ stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }: +let allowBisonDependency = !stdenv.isDarwin; in stdenv.mkDerivation rec { name = "gettext-${version}"; version = "0.19.8.1"; @@ -8,7 +9,17 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gettext/${name}.tar.gz"; sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z"; }; - patches = [ ./absolute-paths.diff ]; + patches = [ + ./absolute-paths.diff + (fetchurl { + name = "CVE-2018-18751.patch"; + url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4"; + sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn"; + }) + ] ++ lib.optionals (!allowBisonDependency) [ + # Only necessary for CVE-2018-18751.patch: + ./CVE-2018-18751-bison.patch + ]; outputs = [ "out" "man" "doc" "info" ]; @@ -40,7 +51,18 @@ stdenv.mkDerivation rec { sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in ''; - nativeBuildInputs = [ xz xz.bin ]; + nativeBuildInputs = [ + xz + xz.bin + ] ++ lib.optional allowBisonDependency [ + # Only necessary for CVE-2018-18751.patch (unless CVE-2018-18751-bison.patch + # is also applied): + bison + ] ++ [ + # Only necessary for CVE-2018-18751.patch: + automake115x + autoconf + ]; # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; diff --git a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix index 350f38d87030..7203f8531c27 100644 --- a/nixpkgs/pkgs/development/libraries/gexiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/gexiv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.10.10"; + version = "0.12.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx"; + sha256 = "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq"; }; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ exiv2 ]; mesonFlags = [ - "-Denable-gtk-doc=true" # TODO: change to gtk_doc in a next release + "-Dgtk_doc=true" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index e8105ef08237..ab5826bc796c 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -3,14 +3,14 @@ let pname = "glib-networking"; - version = "2.58.0"; + version = "2.60.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx"; + sha256 = "14jx8ca7plgh196629ghj41gsaha0aza222g64093hjsm8pnn76p"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ]; + mesonFlags = [ + # Default auto detection doesn't work + "-Dgnutls=enabled" + ]; + doCheck = false; # tests need to access the certificates (among other things) passthru = { diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 4c7c51dbdff5..05a52dce0f99 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -46,7 +46,7 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.58.2"; + version = "2.60.0"; in stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0jrxfm4gn1qz3y1450z709v74ys2bkjr8yffkgy106kgagb4xcn7"; + sha256 = "0ls3njqknb345ni5i8hn9nr1n70kn6s8bi0g6kcqj3c4js5mv1i0"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -66,26 +66,6 @@ stdenv.mkDerivation rec { ./schema-override-variable.patch # Require substituteInPlace in postPatch ./fix-gio-launch-desktop-path.patch - # https://gitlab.gnome.org/GNOME/glib/issues/1626 - # https://gitlab.gnome.org/GNOME/glib/merge_requests/557 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; - sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; - }) - # https://gitlab.gnome.org/GNOME/glib/issues/1645 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff; - sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w"; - }) - # https://gitlab.gnome.org/GNOME/glib/issues/1643 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/c792e5adaa8ae3a45e6ff3ff71168ad8d040a0d4.patch; - sha256 = "022x70qfn5wlv5gz3nlg0bwiwjxcd7l11j3qvbms2y8d1ffh5rfd"; - }) - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/30ccbc386026cecac6ef3a77d8fa4f3c24ac68d7.patch; - sha256 = "04y3pxgzlx92cppwibx4rlsyvwxb37aq52x2lr6ajfgykv2nzpr3"; - }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -116,15 +96,15 @@ stdenv.mkDerivation rec { # Avoid the need for gobject introspection binaries in PATH in cross-compiling case. # Instead we just copy them over from the native output. "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" + "-Dnls=enabled" ]; LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP"; + NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP") + ++ [ "-Wno-error=nonnull" ]; postPatch = '' - substituteInPlace meson.build --replace "install_dir : 'bin'," "install_dir : glib_bindir," - # substitute fix-gio-launch-desktop-path.patch substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin" diff --git a/nixpkgs/pkgs/development/libraries/glibc/locales.nix b/nixpkgs/pkgs/development/libraries/glibc/locales.nix index 2b20c17d4500..0dc191974155 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/locales.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/locales.nix @@ -26,6 +26,8 @@ callPackage ./common.nix { inherit stdenv; } { '' mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale" + echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED + # Hack to allow building of the locales (needed since glibc-2.12) sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile '' diff --git a/nixpkgs/pkgs/development/libraries/glog/default.nix b/nixpkgs/pkgs/development/libraries/glog/default.nix index 791588942bab..9ae181e94530 100644 --- a/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "glog-${version}"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "google"; repo = "glog"; rev = "v${version}"; - sha256 = "12v7j6xy0ghya6a0f6ciy4fnbdc486vml2g07j9zm8y5xc6vx3pq"; + sha256 = "1xd3maiipfbxmhc9rrblc5x52nxvkwxp14npg31y5njqvkvzax9b"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix b/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix index 171c6d40fac1..9bfc638634ba 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-menus/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection }: stdenv.mkDerivation rec { pname = "gnome-menus"; - version = "3.31.4"; + version = "3.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1iihxcibjg22jxsw3s1cxzcq0rhn1rdmx4xg7qjqij981afs8dr7"; + sha256 = "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68"; }; makeFlags = [ @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ glib gobject-introspection ]; meta = { diff --git a/nixpkgs/pkgs/development/libraries/gnutls/3.6.nix b/nixpkgs/pkgs/development/libraries/gnutls/3.6.nix index 513f20fd835a..b05624ee0b28 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls/3.6.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls/3.6.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"; + sha256 = "1ql8l6l5bxks2pgpwb1602zc0j6ivhpy27hdfc49h8xgbanhjd2v"; }; # Skip some tests: diff --git a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index c00b5eca300b..e6978d0955fb 100644 --- a/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -9,7 +9,7 @@ let pname = "gobject-introspection"; - version = "1.58.3"; + version = "1.60.0"; in with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1j63rll0s608s0v4kqxkjapkpf46l069mlahzh8wykclplmn6nq2"; + sha256 = "0pgk9lcvz3i79m6g2ynlp00ghws7g0p0d5qyf0k72warrf841zly"; }; outputs = [ "out" "dev" "man" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cairoLib = "${getLib cairo}/lib"; }); - doCheck = true; + doCheck = !stdenv.isAarch64; passthru = { updateScript = gnome3.updateScript { diff --git a/nixpkgs/pkgs/development/libraries/google-gflags/default.nix b/nixpkgs/pkgs/development/libraries/google-gflags/default.nix index a6f062b8126a..fefc3a8b4b81 100644 --- a/nixpkgs/pkgs/development/libraries/google-gflags/default.nix +++ b/nixpkgs/pkgs/development/libraries/google-gflags/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=ON" - "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index ed2c3e6b8002..98a42aac72af 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses -, autoreconfHook, fetchpatch -, git , texinfo , buildPackages , qtbase ? null @@ -15,11 +13,11 @@ in stdenv.mkDerivation rec { name = "gpgme-${version}"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l"; + sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl"; }; outputs = [ "out" "dev" "info" ]; @@ -29,19 +27,11 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] + nativeBuildInputs = [ file pkgconfig gnupg texinfo ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - patches = [ - (fetchpatch { - name = "fix-key-expiry.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60"; - sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02"; - }) - ]; - postPatch ='' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file ''; diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index 3b4cc86aaaa4..93e76c621822 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m"; + sha256 = "105hvpn2z3qiyc01wyzpmfbrpmy20kz1nb9j1c2s0kz1r0v92gqi"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 2c1faac387e6..b69ab89df24d 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$dev/bin/"*; do - wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" + # 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 "\$_tmp")" done ''; diff --git a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix index 579fca06ffb1..1a01c28aeb4b 100644 --- a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix @@ -13,14 +13,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.5"; + version = "3.24.7"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b"; + sha256 = "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj"; }; outputs = [ "out" "dev" ]; @@ -35,11 +35,6 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - (fetchpatch { - name = "fix-fribidi-linking.patch"; - url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch; - sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr"; - }) ] ++ optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index ba20af1caf51..1a5b0fe62875 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.0"; + version = "3.24.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hxaq4x9jqj8vvnv3sb6nwapz83v8lclbm887qqci0g50llcjpyg"; + sha256 = "1zfj89spr8ianib5y10wcw63ybdmyjy58a15vqs0m8jq4knl5znx"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index f979be547fee..0f72afe4cc15 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala , libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { name = "gtksourceview-${version}"; - version = "3.24.9"; + version = "3.24.10"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hh7brcvpip96mkf9460ksy2qpx2pwynwd0634rx78z6afj7d7b9"; + sha256 = "16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"; }; propagatedBuildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ]; + nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; diff --git a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index acfd2c48081e..553e9fd9cbb6 100644 --- a/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { name = "gtksourceview-${version}"; - version = "4.0.3"; + version = "4.2.0"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x"; + sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4"; }; propagatedBuildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ]; + nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix index f7fda1a382fe..d9163c97cb79 100644 --- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -9,20 +9,19 @@ let pname = "gvfs"; - version = "1.38.1"; + version = "1.40.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd"; + sha256 = "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj"; }; postPatch = '' # patchShebangs requires executable file - chmod +x codegen.py meson_post_install.py + chmod +x meson_post_install.py patchShebangs meson_post_install.py - patchShebangs codegen.py patchShebangs test test-driver ''; diff --git a/nixpkgs/pkgs/development/libraries/hiredis-vip/default.nix b/nixpkgs/pkgs/development/libraries/hiredis-vip/default.nix new file mode 100644 index 000000000000..59e168115a86 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hiredis-vip/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "hiredis-vip"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "vipshop"; + repo = "hiredis-vip"; + rev = version; + sha256 = "1z9zry635pxqv6d2cgk3dghb5qfpg9m7dz34ld4djw9b53hjr2z2"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "A C client library for the Redis database"; + homepage = https://github.com/vipshop/hiredis-vip; + license = lib.licenses.bsd3; + }; + +} diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index aeb4253826b8..08ef667b24eb 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -582,4 +582,32 @@ in { shortDescription = "German (Switzerland)"; dictFileName = "de_CH"; }; + + /* UKRAINIAN */ + + uk-ua = mkDict rec { + name = "hunspell-dict-uk-ua-${version}"; + version = "4.2.5"; + _version = "4-2.5"; + + src = fetchurl { + url = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/${_version}/@@download/file/dict-uk_UA-${version}.oxt"; + sha256 = "1s2i9cd569g97kafrswczvwmvg7m9aks8qsbxd1mi73zy2y1r7n4"; + }; + + dictFileName = "uk_UA"; + readmeFile = "README_uk_UA.txt"; + nativeBuildInputs = [ unzip ]; + unpackCmd = '' + unzip $src ${dictFileName}/{${dictFileName}.dic,${dictFileName}.aff,${readmeFile}} + ''; + + meta = with stdenv.lib; { + description = "Hunspell dictionary for Ukrainian (Ukraine) from LibreOffice"; + homepage = https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/; + license = licenses.mpl20; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.all; + }; + }; } diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index aab64b941caa..f3206700cb89 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The network analysis package"; - homepage = http://igraph.org/; + homepage = https://igraph.org/; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; diff --git a/nixpkgs/pkgs/development/libraries/indilib/default.nix b/nixpkgs/pkgs/development/libraries/indilib/default.nix index c6ead6739824..5816f044f574 100644 --- a/nixpkgs/pkgs/development/libraries/indilib/default.nix +++ b/nixpkgs/pkgs/development/libraries/indilib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { libnova libjpeg gsl ]; meta = { - homepage = http://www.indilib.org/; + homepage = https://www.indilib.org/; license = stdenv.lib.licenses.lgpl2Plus; description = "Implementaion of the INDI protocol for POSIX operating systems"; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/itk/default.nix b/nixpkgs/pkgs/development/libraries/itk/default.nix index df016d9fcac0..878c82215429 100644 --- a/nixpkgs/pkgs/development/libraries/itk/default.nix +++ b/nixpkgs/pkgs/development/libraries/itk/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ - "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" "-DModule_ITKMINC=ON" diff --git a/nixpkgs/pkgs/development/libraries/jasper/default.nix b/nixpkgs/pkgs/development/libraries/jasper/default.nix index eb9282274328..946bc17e7643 100644 --- a/nixpkgs/pkgs/development/libraries/jasper/default.nix +++ b/nixpkgs/pkgs/development/libraries/jasper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jasper-${version}"; - version = "2.0.14"; + version = "2.0.16"; src = fetchFromGitHub { repo = "jasper"; owner = "mdadams"; rev = "version-${version}"; - sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f"; + sha256 = "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6"; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/java/jflex/default.nix b/nixpkgs/pkgs/development/libraries/java/jflex/default.nix index 1bc918af8352..744419dcd533 100644 --- a/nixpkgs/pkgs/development/libraries/java/jflex/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/jflex/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.jflex.de/; + homepage = https://www.jflex.de/; description = "Lexical analyzer generator for Java, written in Java"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix b/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix index 2324f1280a5e..8012c6b3b149 100644 --- a/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.30.1"; + version = "3.32.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1iqxfdymsspsn1xr5bv7xllw73yhqq6k9bfixsggrf2g85pwwxdn"; + sha256 = "1sx6xvzzdm9k0vfmpgg07abz7a9kar20h1a9ml0wgjdxr0valq5w"; }; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index 66f10f4abc1e..bd105d2b4a9c 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch @@ -1,5 +1,5 @@ diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index 52b2eb2..a04596c 100644 +index 275fd65..a04596c 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -232,34 +232,6 @@ @@ -14,7 +14,7 @@ index 52b2eb2..a04596c 100644 -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch +-# See https://wiki.debian.org/Multiarch -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") - AND NOT CMAKE_CROSSCOMPILING - AND NOT DEFINED ENV{FLATPAK_ID}) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index f240ad124c8b..07df956e7a43 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.56/ ) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index ac2092168285..c72cb5b71a43 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, - attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, qtmultimedia, taglib + attr, ebook_tools, exiv2, ffmpeg, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib }: mkDerivation { @@ -9,7 +9,7 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase qtmultimedia + attr ebook_tools exiv2 ffmpeg karchive kcoreaddons ki18n poppler qtbase qtmultimedia taglib ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index 5421a1edd31a..80431100b1c6 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/attica-5.54.0.tar.xz"; - sha256 = "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln"; - name = "attica-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/attica-5.56.0.tar.xz"; + sha256 = "1ib68yg7dgfyh2kq72abw5bh8h0m85z3hcada3b3axq2xkcfxfmb"; + name = "attica-5.56.0.tar.xz"; }; }; baloo = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/baloo-5.54.0.tar.xz"; - sha256 = "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c"; - name = "baloo-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/baloo-5.56.0.tar.xz"; + sha256 = "04hjlhlgw26l2pl4b5jk76xfs7366my71zp1xgiws5aq620bmmcy"; + name = "baloo-5.56.0.tar.xz"; }; }; bluez-qt = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/bluez-qt-5.54.0.tar.xz"; - sha256 = "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v"; - name = "bluez-qt-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/bluez-qt-5.56.0.tar.xz"; + sha256 = "1phph0rjms8n2qpkh9bk1n1n1cd75znsqj9r8njs1siasm6vi4nm"; + name = "bluez-qt-5.56.0.tar.xz"; }; }; breeze-icons = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/breeze-icons-5.54.0.tar.xz"; - sha256 = "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy"; - name = "breeze-icons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/breeze-icons-5.56.0.tar.xz"; + sha256 = "0n6gizmzay98q1vi9ac60p0xq9hpaj9q0gcf8vbmvk4m0yzdd63x"; + name = "breeze-icons-5.56.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/extra-cmake-modules-5.54.0.tar.xz"; - sha256 = "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi"; - name = "extra-cmake-modules-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/extra-cmake-modules-5.56.0.tar.xz"; + sha256 = "0a5mxk805rlmpgbxwa9qkn515jqpcifsrk8ydxc3anjcsq6ffg4i"; + name = "extra-cmake-modules-5.56.0.tar.xz"; }; }; frameworkintegration = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/frameworkintegration-5.54.0.tar.xz"; - sha256 = "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d"; - name = "frameworkintegration-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/frameworkintegration-5.56.0.tar.xz"; + sha256 = "1xc0vdvpjzhb6y1pz27c7x36qjjhcf4bll0fm3yljpm956v4d3gf"; + name = "frameworkintegration-5.56.0.tar.xz"; }; }; kactivities = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kactivities-5.54.0.tar.xz"; - sha256 = "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil"; - name = "kactivities-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kactivities-5.56.0.tar.xz"; + sha256 = "0l0p966b5rs6xjc61mpzmrkj7qqjvlzi6fwc7lky4z3fr924ssp7"; + name = "kactivities-5.56.0.tar.xz"; }; }; kactivities-stats = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kactivities-stats-5.54.0.tar.xz"; - sha256 = "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d"; - name = "kactivities-stats-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kactivities-stats-5.56.0.tar.xz"; + sha256 = "1v3pf9drb22qv7039grx4k7q3a1jxd2a7sf818mxpqyys4fzkl3f"; + name = "kactivities-stats-5.56.0.tar.xz"; }; }; kapidox = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kapidox-5.54.0.tar.xz"; - sha256 = "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c"; - name = "kapidox-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kapidox-5.56.0.tar.xz"; + sha256 = "0rhqqsv4zf13idk426x84jykw6lc74bz7pk606llbmyw4775c7wp"; + name = "kapidox-5.56.0.tar.xz"; }; }; karchive = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/karchive-5.54.0.tar.xz"; - sha256 = "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g"; - name = "karchive-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/karchive-5.56.0.tar.xz"; + sha256 = "1mnavc5baa4qw90baw5b95760lk61m2rx0vfa3w5d7fid3m6q6i8"; + name = "karchive-5.56.0.tar.xz"; }; }; kauth = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kauth-5.54.0.tar.xz"; - sha256 = "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h"; - name = "kauth-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kauth-5.56.0.tar.xz"; + sha256 = "0gb1yh2na2kfphln7arscv5n7llagkkv2y0zdprdy4michqa3k6b"; + name = "kauth-5.56.0.tar.xz"; }; }; kbookmarks = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kbookmarks-5.54.0.tar.xz"; - sha256 = "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw"; - name = "kbookmarks-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kbookmarks-5.56.0.tar.xz"; + sha256 = "0fwmq70ajyjqcva1n2vnf522gwl44aqsi6s9vf8zxsar14vil082"; + name = "kbookmarks-5.56.0.tar.xz"; }; }; kcmutils = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcmutils-5.54.0.tar.xz"; - sha256 = "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh"; - name = "kcmutils-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcmutils-5.56.0.tar.xz"; + sha256 = "1f1sccwyk6fzqd9ywnhkrsyaklmxi0w0w5jqhp1m4n3l30caixkw"; + name = "kcmutils-5.56.0.tar.xz"; }; }; kcodecs = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcodecs-5.54.0.tar.xz"; - sha256 = "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc"; - name = "kcodecs-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcodecs-5.56.0.tar.xz"; + sha256 = "10lw85im4rd3nfdnw2p48cjwq0d47pa2s9v6vmhzmm3hxbflq8z7"; + name = "kcodecs-5.56.0.tar.xz"; }; }; kcompletion = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcompletion-5.54.0.tar.xz"; - sha256 = "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460"; - name = "kcompletion-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcompletion-5.56.0.tar.xz"; + sha256 = "1yxsrl0f24ps8xsilh2iqnl88yvw39iw2ch0yk7lwwk47jkgvns9"; + name = "kcompletion-5.56.0.tar.xz"; }; }; kconfig = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kconfig-5.54.0.tar.xz"; - sha256 = "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7"; - name = "kconfig-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kconfig-5.56.0.tar.xz"; + sha256 = "0wii6pn5dq899s1r7p4q5vmm01jk11zwg2ky6760xf8nv8rhg5ra"; + name = "kconfig-5.56.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kconfigwidgets-5.54.0.tar.xz"; - sha256 = "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31"; - name = "kconfigwidgets-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kconfigwidgets-5.56.0.tar.xz"; + sha256 = "00x5cxgxqza81znzm5rzxzr6scv3s5wbwbhsq61ksmjnlf5wvky5"; + name = "kconfigwidgets-5.56.0.tar.xz"; }; }; kcoreaddons = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcoreaddons-5.54.0.tar.xz"; - sha256 = "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79"; - name = "kcoreaddons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcoreaddons-5.56.0.tar.xz"; + sha256 = "17kvndaab9l6r79rh0pyjgw4yqh99xfyksc4yxzhhlyl3fgh6hcz"; + name = "kcoreaddons-5.56.0.tar.xz"; }; }; kcrash = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kcrash-5.54.0.tar.xz"; - sha256 = "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7"; - name = "kcrash-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kcrash-5.56.0.tar.xz"; + sha256 = "1q5iyqi1qgk5ngc9fdilrc5mjxy2mb0xbdnlx234hn1a44aq47jq"; + name = "kcrash-5.56.0.tar.xz"; }; }; kdbusaddons = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdbusaddons-5.54.0.tar.xz"; - sha256 = "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf"; - name = "kdbusaddons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdbusaddons-5.56.0.tar.xz"; + sha256 = "0wmrcz92k27j0s2iyzd9ldynv4p52x70sxzby2m807ffrs692c5r"; + name = "kdbusaddons-5.56.0.tar.xz"; }; }; kdeclarative = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdeclarative-5.54.0.tar.xz"; - sha256 = "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0"; - name = "kdeclarative-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdeclarative-5.56.0.tar.xz"; + sha256 = "0slhxqzbrj23vw7f017cx3brpqkw3933jj7z8kc2bgfzjypj373r"; + name = "kdeclarative-5.56.0.tar.xz"; }; }; kded = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kded-5.54.0.tar.xz"; - sha256 = "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn"; - name = "kded-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kded-5.56.0.tar.xz"; + sha256 = "0fdzpsrigjqssqw25gxz5d1i0j8g3hc8xpv4v74mp0pcv9g10apz"; + name = "kded-5.56.0.tar.xz"; }; }; kdelibs4support = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kdelibs4support-5.54.0.tar.xz"; - sha256 = "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm"; - name = "kdelibs4support-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kdelibs4support-5.56.0.tar.xz"; + sha256 = "1yhfnvzgwmnivm99gkq67gnx0ar02j043mq3fg2lgwlrarqi9k7d"; + name = "kdelibs4support-5.56.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdesignerplugin-5.54.0.tar.xz"; - sha256 = "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga"; - name = "kdesignerplugin-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdesignerplugin-5.56.0.tar.xz"; + sha256 = "05nqayzafn2zz74lx8zj7hi7knclcip7zbqmpk1g3nriysc39x4v"; + name = "kdesignerplugin-5.56.0.tar.xz"; }; }; kdesu = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdesu-5.54.0.tar.xz"; - sha256 = "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar"; - name = "kdesu-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdesu-5.56.0.tar.xz"; + sha256 = "0fc77rbkd1m7rv4rq56g0fg4vg0siamdm5g788816ig9gn1j76ll"; + name = "kdesu-5.56.0.tar.xz"; }; }; kdewebkit = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdewebkit-5.54.0.tar.xz"; - sha256 = "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf"; - name = "kdewebkit-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdewebkit-5.56.0.tar.xz"; + sha256 = "1c1mxs30182ilxybp0xwaljrjg5y9j1ri79169hn8664xs3wcbc2"; + name = "kdewebkit-5.56.0.tar.xz"; }; }; kdnssd = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdnssd-5.54.0.tar.xz"; - sha256 = "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7"; - name = "kdnssd-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdnssd-5.56.0.tar.xz"; + sha256 = "1gskwc8sbj6cicblmrxh7qnh1gap0qivs8k5zf5qs94p1xc864vy"; + name = "kdnssd-5.56.0.tar.xz"; }; }; kdoctools = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kdoctools-5.54.0.tar.xz"; - sha256 = "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6"; - name = "kdoctools-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kdoctools-5.56.0.tar.xz"; + sha256 = "01y06rf1nhw2p8s0j60anr2qvssrqfimddvp2mqqkvx9xkx3py74"; + name = "kdoctools-5.56.0.tar.xz"; }; }; kemoticons = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kemoticons-5.54.0.tar.xz"; - sha256 = "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v"; - name = "kemoticons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kemoticons-5.56.0.tar.xz"; + sha256 = "00hbd09gnwyfszdwa9yf5m8wpbbapc4kwhs3qxhbvvmll0jv9vl2"; + name = "kemoticons-5.56.0.tar.xz"; }; }; kfilemetadata = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kfilemetadata-5.54.0.tar.xz"; - sha256 = "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab"; - name = "kfilemetadata-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kfilemetadata-5.56.0.tar.xz"; + sha256 = "04pmd2f77zxi14l3rhw4dyrh9dafchxqw1xjyv60j97gmm1b9796"; + name = "kfilemetadata-5.56.0.tar.xz"; }; }; kglobalaccel = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kglobalaccel-5.54.0.tar.xz"; - sha256 = "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1"; - name = "kglobalaccel-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kglobalaccel-5.56.0.tar.xz"; + sha256 = "0pmgvizc2dwrwr7m49125ybcpsc95r9riwxnihf37napyaacd9y3"; + name = "kglobalaccel-5.56.0.tar.xz"; }; }; kguiaddons = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kguiaddons-5.54.0.tar.xz"; - sha256 = "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935"; - name = "kguiaddons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kguiaddons-5.56.0.tar.xz"; + sha256 = "0gp2i29y1vws8i3q8s1bhyxksa42l6q55m459yczddcvcw0vd45i"; + name = "kguiaddons-5.56.0.tar.xz"; }; }; kholidays = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kholidays-5.54.0.tar.xz"; - sha256 = "1xp6mpnhlqkfl3pdaj6nq9sqy30z5wm6gms0ycy33n4ly2s8wb1y"; - name = "kholidays-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kholidays-5.56.0.tar.xz"; + sha256 = "0lm2ls3a15qbsfhamh2ldzvr62wi9nrhxd83rhyk3ifsgac4mg18"; + name = "kholidays-5.56.0.tar.xz"; }; }; khtml = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/khtml-5.54.0.tar.xz"; - sha256 = "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da"; - name = "khtml-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/khtml-5.56.0.tar.xz"; + sha256 = "1wmcqc4546mqagqpgb97h3yd7nxaq4si2484li5hnw8mglm1qf3x"; + name = "khtml-5.56.0.tar.xz"; }; }; ki18n = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/ki18n-5.54.0.tar.xz"; - sha256 = "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3"; - name = "ki18n-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/ki18n-5.56.0.tar.xz"; + sha256 = "0hdfad9vmyzfni9ln0dc9p26gpjksk754z28v35hww6z9kgbr1dq"; + name = "ki18n-5.56.0.tar.xz"; }; }; kiconthemes = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kiconthemes-5.54.0.tar.xz"; - sha256 = "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g"; - name = "kiconthemes-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kiconthemes-5.56.0.tar.xz"; + sha256 = "0rdpvbqsb2wqi3glmggilm1mhpy6nc80am5hl4c34269mxd55q8a"; + name = "kiconthemes-5.56.0.tar.xz"; }; }; kidletime = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kidletime-5.54.0.tar.xz"; - sha256 = "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm"; - name = "kidletime-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kidletime-5.56.0.tar.xz"; + sha256 = "09184bi8fvq34hwkldyibji7r79wd2wvhxk1i4kzkjg177dnaa95"; + name = "kidletime-5.56.0.tar.xz"; }; }; kimageformats = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kimageformats-5.54.0.tar.xz"; - sha256 = "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15"; - name = "kimageformats-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kimageformats-5.56.0.tar.xz"; + sha256 = "1cgh32jkg0ybfp8z6qwn7y6yr9mb0fiqly4pb0qc1lcm6awdx3d5"; + name = "kimageformats-5.56.0.tar.xz"; }; }; kinit = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kinit-5.54.0.tar.xz"; - sha256 = "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9"; - name = "kinit-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kinit-5.56.0.tar.xz"; + sha256 = "1ihrannyaj33wsir20qy363vdjafhlsmj45qzl3xkl4rbyl6ngs7"; + name = "kinit-5.56.0.tar.xz"; }; }; kio = { - version = "5.54.1"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kio-5.54.1.tar.xz"; - sha256 = "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp"; - name = "kio-5.54.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kio-5.56.0.tar.xz"; + sha256 = "1m2c3a5isj966snmzs97i9kyhwnbzlwf61lqw5yxck25x7d0pyyn"; + name = "kio-5.56.0.tar.xz"; }; }; kirigami2 = { - version = "5.54.0"; + version = "5.56.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kirigami2-5.54.0.tar.xz"; - sha256 = "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2"; - name = "kirigami2-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kirigami2-5.56.1.tar.xz"; + sha256 = "0npq65kslwkdsylmv5hgcqsa5i9386dmnx8ig79rlf3409awn2f8"; + name = "kirigami2-5.56.1.tar.xz"; }; }; kitemmodels = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kitemmodels-5.54.0.tar.xz"; - sha256 = "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760"; - name = "kitemmodels-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kitemmodels-5.56.0.tar.xz"; + sha256 = "13m1bvhljyc1jb9hdlz5v009kmkz7q0qf06l5zkck5k0fq41rkrg"; + name = "kitemmodels-5.56.0.tar.xz"; }; }; kitemviews = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kitemviews-5.54.0.tar.xz"; - sha256 = "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk"; - name = "kitemviews-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kitemviews-5.56.0.tar.xz"; + sha256 = "1ar492jpyprxvzcgnq0gnbyxlndb3rd0z32drk7xsx19vpk3ch58"; + name = "kitemviews-5.56.0.tar.xz"; }; }; kjobwidgets = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kjobwidgets-5.54.0.tar.xz"; - sha256 = "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq"; - name = "kjobwidgets-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kjobwidgets-5.56.0.tar.xz"; + sha256 = "1dh4ilry575k6z0glqb60ldjfkwpnkvijdzfyrc22bn84hbh19iy"; + name = "kjobwidgets-5.56.0.tar.xz"; }; }; kjs = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kjs-5.54.0.tar.xz"; - sha256 = "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy"; - name = "kjs-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kjs-5.56.0.tar.xz"; + sha256 = "1b3l76ipf0fr8bvp3f4njimmg5yw9ciwzzgvb34ds65aycplagln"; + name = "kjs-5.56.0.tar.xz"; }; }; kjsembed = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kjsembed-5.54.0.tar.xz"; - sha256 = "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8"; - name = "kjsembed-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kjsembed-5.56.0.tar.xz"; + sha256 = "0lkfq7099yiwvlycrix3s0dbk860rqfnix5fiw5vmi855is7mpkv"; + name = "kjsembed-5.56.0.tar.xz"; }; }; kmediaplayer = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kmediaplayer-5.54.0.tar.xz"; - sha256 = "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf"; - name = "kmediaplayer-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kmediaplayer-5.56.0.tar.xz"; + sha256 = "0blqbi40l1pk8qf9054ha4a8r7cb4pddbqydsqlsscl4gm8530jh"; + name = "kmediaplayer-5.56.0.tar.xz"; }; }; knewstuff = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/knewstuff-5.54.0.tar.xz"; - sha256 = "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3"; - name = "knewstuff-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/knewstuff-5.56.0.tar.xz"; + sha256 = "0r0ia0521vfri7mc6wpg3ihryqj48s3krgmliwbh635rfd3lcj9j"; + name = "knewstuff-5.56.0.tar.xz"; }; }; knotifications = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/knotifications-5.54.0.tar.xz"; - sha256 = "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn"; - name = "knotifications-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/knotifications-5.56.0.tar.xz"; + sha256 = "05nf2870fq9cwacgyy8iky5v37fq4jrsh4hl9xy9928d19qnmb24"; + name = "knotifications-5.56.0.tar.xz"; }; }; knotifyconfig = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/knotifyconfig-5.54.0.tar.xz"; - sha256 = "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if"; - name = "knotifyconfig-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/knotifyconfig-5.56.0.tar.xz"; + sha256 = "0zwq0p779482sxxjg62z1rkpiiyn6b3r47l450dm6hm56vkf7vxl"; + name = "knotifyconfig-5.56.0.tar.xz"; }; }; kpackage = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kpackage-5.54.0.tar.xz"; - sha256 = "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb"; - name = "kpackage-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kpackage-5.56.0.tar.xz"; + sha256 = "037r0ldp70q0yafld1ddff1d4wipb5ras88r72qazjcfqfg9rzjr"; + name = "kpackage-5.56.0.tar.xz"; }; }; kparts = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kparts-5.54.0.tar.xz"; - sha256 = "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6"; - name = "kparts-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kparts-5.56.0.tar.xz"; + sha256 = "1vj5ard5ff0wzpjqzrkd2kb31dkjly1cf4ww1ljrrwi7qgzxgw0z"; + name = "kparts-5.56.0.tar.xz"; }; }; kpeople = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kpeople-5.54.0.tar.xz"; - sha256 = "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx"; - name = "kpeople-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kpeople-5.56.0.tar.xz"; + sha256 = "0h456kjhx4ylbkiv3706g8ccdq55aamrhj5rgiql2gaw3d5dbrkr"; + name = "kpeople-5.56.0.tar.xz"; }; }; kplotting = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kplotting-5.54.0.tar.xz"; - sha256 = "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9"; - name = "kplotting-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kplotting-5.56.0.tar.xz"; + sha256 = "1hrk3iv77s46lcs6c5mfiyzr80vpg9261mlixc3qwps0mww43r1r"; + name = "kplotting-5.56.0.tar.xz"; }; }; kpty = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kpty-5.54.0.tar.xz"; - sha256 = "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3"; - name = "kpty-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kpty-5.56.0.tar.xz"; + sha256 = "1dzp4a6rz6hsp1y8m5l73i8v2a3bpwkv4rrypkd00051ajcch47k"; + name = "kpty-5.56.0.tar.xz"; }; }; kross = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/portingAids/kross-5.54.0.tar.xz"; - sha256 = "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd"; - name = "kross-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/portingAids/kross-5.56.0.tar.xz"; + sha256 = "0ry6fpl0rb8z5r08bzh6kj14mp7l94calvdk3vrnc89cpm5gxymv"; + name = "kross-5.56.0.tar.xz"; }; }; krunner = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/krunner-5.54.0.tar.xz"; - sha256 = "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v"; - name = "krunner-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/krunner-5.56.0.tar.xz"; + sha256 = "1gs0fr78zbhxl8c08zj4s98zshc42zxzwv7p9l7rmq8h21spc8ga"; + name = "krunner-5.56.0.tar.xz"; }; }; kservice = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kservice-5.54.0.tar.xz"; - sha256 = "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx"; - name = "kservice-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kservice-5.56.0.tar.xz"; + sha256 = "1hsc8pagigwspyv9ipl3l2b9mf8amfksk8a2k3iic9nw1hmpxinv"; + name = "kservice-5.56.0.tar.xz"; }; }; ktexteditor = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/ktexteditor-5.54.0.tar.xz"; - sha256 = "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy"; - name = "ktexteditor-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/ktexteditor-5.56.0.tar.xz"; + sha256 = "1a2r97v3xwh61q688jvwkk99bphfd0v0ldqms5d73q3m6w1x122c"; + name = "ktexteditor-5.56.0.tar.xz"; }; }; ktextwidgets = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/ktextwidgets-5.54.0.tar.xz"; - sha256 = "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5"; - name = "ktextwidgets-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/ktextwidgets-5.56.0.tar.xz"; + sha256 = "1km19z577y29di8zp6amlccqdavxk4f4sg1dblj6gp64zkw9dbqp"; + name = "ktextwidgets-5.56.0.tar.xz"; }; }; kunitconversion = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kunitconversion-5.54.0.tar.xz"; - sha256 = "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h"; - name = "kunitconversion-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kunitconversion-5.56.0.tar.xz"; + sha256 = "1kf5dc6p77mkx2i23ppfs0k3laybmx5vqq7aq1bxnkxj1ws75144"; + name = "kunitconversion-5.56.0.tar.xz"; }; }; kwallet = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kwallet-5.54.0.tar.xz"; - sha256 = "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2"; - name = "kwallet-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kwallet-5.56.0.tar.xz"; + sha256 = "02i6xkq9ki6sybjvcxkznf5v8b34pqxysg9pi5v4z6jkw2jpr5fj"; + name = "kwallet-5.56.0.tar.xz"; }; }; kwayland = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kwayland-5.54.0.tar.xz"; - sha256 = "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf"; - name = "kwayland-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kwayland-5.56.0.tar.xz"; + sha256 = "1779in51z63sv6607xd7y30wprs9vs8nnqa28fxg1q4nicwnvrxv"; + name = "kwayland-5.56.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kwidgetsaddons-5.54.0.tar.xz"; - sha256 = "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh"; - name = "kwidgetsaddons-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kwidgetsaddons-5.56.0.tar.xz"; + sha256 = "0flmw1wfzs49dmmlbbimizjwj09wp4qwr9znxn3h5yfn0mxfc1lv"; + name = "kwidgetsaddons-5.56.0.tar.xz"; }; }; kwindowsystem = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kwindowsystem-5.54.0.tar.xz"; - sha256 = "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb"; - name = "kwindowsystem-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kwindowsystem-5.56.0.tar.xz"; + sha256 = "0dk9ymlpdpvra2zm1f2rcx2dwnn9qc49n2y7p6iw094fwk5rzczc"; + name = "kwindowsystem-5.56.0.tar.xz"; }; }; kxmlgui = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kxmlgui-5.54.0.tar.xz"; - sha256 = "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7"; - name = "kxmlgui-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kxmlgui-5.56.0.tar.xz"; + sha256 = "1ipa0qnkh6gs3f6ygvb7cf0yv1m89m3cdl1z23br4fn14d5mxbrl"; + name = "kxmlgui-5.56.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/kxmlrpcclient-5.54.0.tar.xz"; - sha256 = "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6"; - name = "kxmlrpcclient-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/kxmlrpcclient-5.56.0.tar.xz"; + sha256 = "1bjnpl4521gv35zghaanz6v5bap2b9n2kz7b0rif1bf6iak018ql"; + name = "kxmlrpcclient-5.56.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/modemmanager-qt-5.54.0.tar.xz"; - sha256 = "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350"; - name = "modemmanager-qt-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/modemmanager-qt-5.56.0.tar.xz"; + sha256 = "1xwx6yybij8nlaqfpz76pindfxshcyg9p21nqm6ddpgyzh74klbc"; + name = "modemmanager-qt-5.56.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/networkmanager-qt-5.54.0.tar.xz"; - sha256 = "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y"; - name = "networkmanager-qt-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/networkmanager-qt-5.56.0.tar.xz"; + sha256 = "0p0b3rq7s1yzy6zspd6xnzjc0hza9d7fixm8pw369kn5k3pi5lk1"; + name = "networkmanager-qt-5.56.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/oxygen-icons5-5.54.0.tar.xz"; - sha256 = "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46"; - name = "oxygen-icons5-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/oxygen-icons5-5.56.0.tar.xz"; + sha256 = "17cjcfmc8vywh8n2ck0s3b0i88ilamdah0gipicn7vj65l4wc1qb"; + name = "oxygen-icons5-5.56.0.tar.xz"; }; }; plasma-framework = { - version = "5.54.0"; + version = "5.56.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/plasma-framework-5.54.0.tar.xz"; - sha256 = "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj"; - name = "plasma-framework-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/plasma-framework-5.56.1.tar.xz"; + sha256 = "0wn7q2cfrgzcprzgqj1d4calc0mmrrn615698fish7x9s1n7ag6w"; + name = "plasma-framework-5.56.1.tar.xz"; }; }; prison = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/prison-5.54.0.tar.xz"; - sha256 = "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb"; - name = "prison-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/prison-5.56.0.tar.xz"; + sha256 = "05hy6fz05snpgjz6bnm3qcr7smg65a0m6rdmyv7avrpbs4qpbghx"; + name = "prison-5.56.0.tar.xz"; }; }; purpose = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/purpose-5.54.0.tar.xz"; - sha256 = "07rz8bqwvlz5g914q4vxdcdmrja5hxa29iazxz8nr171xnpg9x0w"; - name = "purpose-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/purpose-5.56.0.tar.xz"; + sha256 = "0rvywfkhqbmd39g950mpnn35i3kg7j63ylvdy2px2d71am6acal8"; + name = "purpose-5.56.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/qqc2-desktop-style-5.54.0.tar.xz"; - sha256 = "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8"; - name = "qqc2-desktop-style-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/qqc2-desktop-style-5.56.0.tar.xz"; + sha256 = "08afy1gsy0lvpzqmv5azzfiy5x9lvffsf6qvzxxab4v5ch8fn00b"; + name = "qqc2-desktop-style-5.56.0.tar.xz"; }; }; solid = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/solid-5.54.0.tar.xz"; - sha256 = "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9"; - name = "solid-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/solid-5.56.0.tar.xz"; + sha256 = "17kfwj0y41pkd0kxj2fj9m9qs7bq05vka9ngfr022lfwdhs907c4"; + name = "solid-5.56.0.tar.xz"; }; }; sonnet = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/sonnet-5.54.0.tar.xz"; - sha256 = "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz"; - name = "sonnet-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/sonnet-5.56.0.tar.xz"; + sha256 = "0r8bsf7a9rjvv4jirycwf3xvkqa9iax23p93m301x82hdvmkjr9w"; + name = "sonnet-5.56.0.tar.xz"; }; }; syndication = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/syndication-5.54.0.tar.xz"; - sha256 = "0zj8nv0hj5sf79v3clg2bqhs3m8hi1pzjar1cq6hkxprymw0hzx8"; - name = "syndication-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/syndication-5.56.0.tar.xz"; + sha256 = "0wnrhfp5b4wgmigqh39c0f2qfblgmc3x6018b4wcayfs8gb4m1q9"; + name = "syndication-5.56.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/syntax-highlighting-5.54.0.tar.xz"; - sha256 = "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl"; - name = "syntax-highlighting-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/syntax-highlighting-5.56.0.tar.xz"; + sha256 = "0gl0v1bscqd6xhl3644wix8ix04lax0h1zzr1v65704c4qp87h8l"; + name = "syntax-highlighting-5.56.0.tar.xz"; }; }; threadweaver = { - version = "5.54.0"; + version = "5.56.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.54/threadweaver-5.54.0.tar.xz"; - sha256 = "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp"; - name = "threadweaver-5.54.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.56/threadweaver-5.56.0.tar.xz"; + sha256 = "1gyvj0v1zhfk8shi31pivvf5rwxkgv9bjmy2vippk2vxvkh0qc5x"; + name = "threadweaver-5.56.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index 6ff6bb955913..208f294aef7e 100644 --- a/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -14,12 +14,12 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.15"; - version = "${majorVersion}.2"; + majorVersion = "1.17"; + version = "${majorVersion}"; src = fetchurl { - url = "${meta.homepage}dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n"; + url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; + sha256 = "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs"; }; outputs = [ "out" "dev" ]; @@ -39,8 +39,9 @@ stdenv.mkDerivation rec { ++ optional (!libOnly) yacc # Provides the mig command used by the build scripts ++ optional stdenv.isDarwin bootstrap_cmds; + buildInputs = [ openssl ] - ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic") [ keyutils ] + ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] ++ optionals (!libOnly) [ openldap libedit ]; preConfigure = "cd ./src"; diff --git a/nixpkgs/pkgs/development/libraries/lasso/default.nix b/nixpkgs/pkgs/development/libraries/lasso/default.nix index 54d33e5f425e..e93467fba0a2 100644 --- a/nixpkgs/pkgs/development/libraries/lasso/default.nix +++ b/nixpkgs/pkgs/development/libraries/lasso/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://lasso.entrouvert.org/; + homepage = https://lasso.entrouvert.org/; description = "Liberty Alliance Single Sign-On library"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/ldacbt/default.nix b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix new file mode 100644 index 000000000000..4ff58843d155 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ldacbt/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +}: + +stdenv.mkDerivation rec { + name = "ldacBT-${version}"; + version = "2.0.2.3"; + + src = fetchFromGitHub { + repo = "ldacBT"; + owner = "ehfive"; + rev = "v${version}"; + sha256 = "09dalysx4fgrgpfdm9a51x6slnf4iik1sqba4xjgabpvq91bnb63"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with stdenv.lib; { + description = "AOSP libldac dispatcher"; + homepage = https://github.com/EHfive/ldacBT; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ adisbladis ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix index ad59674b3ed7..9ab68e578fbf 100644 --- a/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { - sha256 = "08hd6j8w4mgnxj84y26vip1vgrg668jnil5jzq2dk4pfapigfz8l"; + sha256 = "1dy1iisc0h1l28ff72pq7vxa4mj5zpq2jflpdghhx8yqksxhii4k"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix new file mode 100644 index 000000000000..7292debfc3f6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, ninja, libuuid, gtest }: + +stdenv.mkDerivation rec { + pname = "lib3mf"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "3MFConsortium"; + repo = pname; + rev = "v${version}"; + sha256 = "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd"; + }; + + nativeBuildInputs = [ cmake ninja ]; + + buildInputs = [ libuuid ]; + + postPatch = '' + rmdir UnitTests/googletest + ln -s ${gtest.src} UnitTests/googletest + ''; + + meta = with stdenv.lib; { + description = "Reference implementation of the 3D Manufacturing Format file standard"; + homepage = "https://3mf.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index 029be971ac17..f2a1c500a8be 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,21 @@ stdenv.mkDerivation rec { sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms"; }; + patches = [ + (fetchpatch { + # details: https://github.com/libarchive/libarchive/pull/1105 + name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80 + url = "https://github.com/libarchive/libarchive/pull/1105.diff"; + sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf"; + }) + (fetchpatch { + # details: https://github.com/libarchive/libarchive/pull/1120 + name = "cve-2019-1000019_cve-2019-1000020.diff"; + url = "https://github.com/libarchive/libarchive/pull/1120.diff"; + sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4"; + }) + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libassuan/default.nix b/nixpkgs/pkgs/development/libraries/libassuan/default.nix index 540aef9edf25..507470900111 100644 --- a/nixpkgs/pkgs/development/libraries/libassuan/default.nix +++ b/nixpkgs/pkgs/development/libraries/libassuan/default.nix @@ -1,17 +1,23 @@ -{ fetchurl, stdenv, gettext, pth, libgpgerror }: +{ fetchurl, stdenv, gettext, pth, libgpgerror, buildPackages }: stdenv.mkDerivation rec { - name = "libassuan-2.5.2"; + pname = "libassuan"; + version = "2.5.3"; src = fetchurl { - url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq"; + url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i"; }; outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # libassuan-config - buildInputs = [ libgpgerror pth gettext]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ pth gettext ]; + + configureFlags = [ + "--with-libgpg-error-prefix=${libgpgerror.dev}" + ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libast/default.nix b/nixpkgs/pkgs/development/libraries/libast/default.nix index bcfee0444756..313cb7f8d5dc 100644 --- a/nixpkgs/pkgs/development/libraries/libast/default.nix +++ b/nixpkgs/pkgs/development/libraries/libast/default.nix @@ -14,10 +14,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; - homepage = http://www.eterm.org; + homepage = https://www.eterm.org; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; } - diff --git a/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix index ea1df23182d3..0df8ed0f9699 100644 --- a/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix +++ b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; - version = "7.6.8"; + version = "7.6.10"; src = fetchurl { urls = [ "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" ]; - sha256 = "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx"; + sha256 = "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix index fea4744a075a..7c7ba82ccde4 100644 --- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "1zxfnw1xbghcj7b3zz5djndv6gwssxda19cz1lrlqrkg8577r7kd"; + sha256 = "10zyqgccgl8kl9d9ljml86sm9s9l2424y55vilb3lifkdb9019p6"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; diff --git a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index bef7a161dd3b..59f07202fde2 100644 --- a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -2,7 +2,7 @@ , gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }: let - version = "3.30.2"; + version = "3.32.1"; pname = "libdazzle"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq"; + sha256 = "0wprqgn480r31pcgmpyk9l6cfvlczfcx10fpqaq9pbn3vjgs3393"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ]; diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix index 8fbbae43f619..e064084f695e 100644 --- a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, intltool , glib, dbus-glib, json-glib -, gobject-introspection, vala_0_38, gnome-doc-utils +, gobject-introspection, vala, gnome-doc-utils , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: with lib; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ vala pkgconfig intltool ]; buildInputs = [ glib dbus-glib json-glib - gobject-introspection vala_0_38 gnome-doc-utils + gobject-introspection gnome-doc-utils ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { doCheck = false; # generates shebangs in check phase, too lazy to fix installFlags = [ - "sysconfdir=\${out}/etc" + "sysconfdir=${placeholder ''out''}/etc" "localstatedir=\${TMPDIR}" - "typelibdir=\${out}/lib/girepository-1.0" + "typelibdir=${placeholder ''out''}/lib/girepository-1.0" ]; meta = { diff --git a/nixpkgs/pkgs/development/libraries/libedit/default.nix b/nixpkgs/pkgs/development/libraries/libedit/default.nix index c68e171084b9..e46a7ec33c4d 100644 --- a/nixpkgs/pkgs/development/libraries/libedit/default.nix +++ b/nixpkgs/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "libedit-20180525-3.1"; + pname = "libedit"; + version = "20190324-3.1"; src = fetchurl { - url = "https://thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4"; + url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; + sha256 = "1bhvp8xkkgrg89k4ci1k8vjl3nhb6szd4ghy9lp4jrfgq58hz3xc"; }; outputs = [ "out" "dev" ]; @@ -17,8 +18,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses ]; - configureFlags = [ "--enable-widec" ]; - postInstall = '' find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g' diff --git a/nixpkgs/pkgs/development/libraries/libestr/default.nix b/nixpkgs/pkgs/development/libraries/libestr/default.nix index 33d835d69196..b8f62901eed4 100644 --- a/nixpkgs/pkgs/development/libraries/libestr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libestr/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libestr.adiscon.com/; + homepage = https://libestr.adiscon.com/; description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libgda/default.nix b/nixpkgs/pkgs/development/libraries/libgda/default.nix index cab04438dd38..95860ac94201 100644 --- a/nixpkgs/pkgs/development/libraries/libgda/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgda/default.nix @@ -36,7 +36,7 @@ assert postgresSupport -> postgresql != null; meta = with stdenv.lib; { description = "Database access library"; - homepage = http://www.gnome-db.org/; + homepage = https://www.gnome-db.org/; license = [ licenses.lgpl2 licenses.gpl2 ]; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libgdamm/default.nix b/nixpkgs/pkgs/development/libraries/libgdamm/default.nix index 012400a49abc..4367cc5b2764 100644 --- a/nixpkgs/pkgs/development/libraries/libgdamm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdamm/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ bindings for libgda"; - homepage = http://www.gnome-db.org/; + homepage = https://www.gnome-db.org/; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/nixpkgs/pkgs/development/libraries/libgdata/default.nix index 3f20236d17f4..59e19750715f 100644 --- a/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; }; - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gcr}/include/gcr-3 -I${gcr}/include/gck-1"; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ]; diff --git a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index 15efdd4fd4e4..c7b76497fa8c 100644 --- a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -38,7 +38,11 @@ in stdenv.mkDerivation rec { url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch"; sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://github.com/NVIDIA/libglvnd/commit/294ccb2f49107432567e116e13efac586580a4cc.patch"; + sha256 = "01339wg27cypv93221rhk3885vxbsg8kvbfyia77jmjdcnwrdwm2"; + }); outputs = [ "out" "dev" ]; passthru = { inherit driverLink; }; diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index 5038547f5b87..dc221156f461 100644 --- a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -16,12 +16,12 @@ outputBin = "out"; }; in stdenv.mkDerivation (rec { - name = "libgpg-error-${version}"; - version = "1.34"; + pname = "libgpg-error"; + version = "1.36"; src = fetchurl { - url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "10cc76y7zi6wsdmpy1abf3i0q17bj59q5ysy8cpnpf3ixsfpk006"; + url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libgpod/default.nix b/nixpkgs/pkgs/development/libraries/libgpod/default.nix index 7126d027c7a0..b77690bd1593 100644 --- a/nixpkgs/pkgs/development/libraries/libgpod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpod/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { - homepage = http://gtkpod.sourceforge.net/; + homepage = https://gtkpod.sourceforge.net/; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libgtop/default.nix b/nixpkgs/pkgs/development/libraries/libgtop/default.nix index fcc76938b3ed..fe7986bf21aa 100644 --- a/nixpkgs/pkgs/development/libraries/libgtop/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgtop/default.nix @@ -1,30 +1,34 @@ -{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobject-introspection, libtool, gnome3, gtk-doc }: -let - pname = "libgtop"; - version = "2.38.0"; -in +{ stdenv +, fetchurl +, glib +, pkgconfig +, perl +, gettext +, gobject-introspection +, gnome3 +, gtk-doc +}: + stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "libgtop"; + version = "2.40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"; }; - patches = [ - # Fix darwin build - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/libgtop/commit/42b049f338363f92c1e93b4549fc944098eae674.patch; - sha256 = "0kf9ihgb0wqji6dcvg36s6igkh7b79k6y1n7w7wzsxya84x3hhyn"; - }) + nativeBuildInputs = [ + pkgconfig + gtk-doc + perl + gettext + gobject-introspection ]; - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobject-introspection ]; - - preConfigure = '' - ./autogen.sh - ''; + propagatedBuildInputs = [ + glib + ]; passthru = { updateScript = gnome3.updateScript { diff --git a/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/nixpkgs/pkgs/development/libraries/libgweather/default.nix index b5fda25a8c55..3300e9b1d680 100644 --- a/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.28.2"; + version = "3.32.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708"; + sha256 = "1079d26y8d2zaw9w50l9scqjhbrynpdd6kyaa32x4393f7nih8hw"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix index 25cee4ef8daa..581a579cbe2c 100644 --- a/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: stdenv.mkDerivation rec { - version = "1.3.2"; + version = "1.4.0"; name = "libheif-${version}"; src = fetchFromGitHub { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; + sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix index c1ec533ba5b8..cf5c80c9b219 100644 --- a/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40 -, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch +, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection, valadoc }: let pname = "libhttpseverywhere"; @@ -12,10 +12,17 @@ in stdenv.mkDerivation rec { sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; }; - # Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1 - nativeBuildInputs = [ vala_0_40 gobject-introspection meson ninja pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ]; buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; + # Fixes build with vala >=0.42 + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; + sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; + }) + ]; + mesonFlags = [ "-Denable_valadoc=true" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libiec61883/default.nix b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix index 4c0119f473c1..4fa3addc0a66 100644 --- a/nixpkgs/pkgs/development/libraries/libiec61883/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiec61883/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libraw1394 ]; meta = with stdenv.lib; { - homepage = http://www.linux1394.org; + homepage = https://www.linux1394.org; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/liblo/default.nix b/nixpkgs/pkgs/development/libraries/liblo/default.nix index c72b9723dc52..2ba5750b1bf3 100644 --- a/nixpkgs/pkgs/development/libraries/liblo/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "liblo-0.29"; + name = "liblo-0.30"; src = fetchurl { - url = "mirror://sourceforge/liblo/liblo/0.29/${name}.tar.gz"; - sha256 = "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc"; + url = "mirror://sourceforge/liblo/liblo/0.30/${name}.tar.gz"; + sha256 = "06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh"; }; doCheck = false; # fails 1 out of 3 tests diff --git a/nixpkgs/pkgs/development/libraries/liblognorm/default.nix b/nixpkgs/pkgs/development/libraries/liblognorm/default.nix index b03ab0e3fabb..d77b452e3e92 100644 --- a/nixpkgs/pkgs/development/libraries/liblognorm/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblognorm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; meta = with stdenv.lib; { - homepage = http://www.liblognorm.com/; + homepage = https://www.liblognorm.com/; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index a6005d66b4d6..a3af7aab526d 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -3,7 +3,7 @@ }: let - version = "3.5.0"; + version = "3.9.0"; in stdenv.mkDerivation rec { name = "liblouis-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "0klmyh6cg9khv59j4xdsrwwjzdgylw689gvrjiy5jsvqll58fcsd"; + sha256 = "11vq9rnmrfqka3fiyrxs0q1gpvpj4m9jmrkwd1yvrq94fndgvh1m"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; @@ -50,7 +50,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source braille translator and back-translator"; homepage = http://liblouis.org/; - broken = true; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/nixpkgs/pkgs/development/libraries/libmanette/default.nix index 258fbc2657ba..701238750512 100644 --- a/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -2,7 +2,7 @@ , glib, libgudev, libevdev, gnome3 }: let - version = "0.2.1"; + version = "0.2.2"; pname = "libmanette"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "14vqz30p4693yy3yxs0gj858x25sl2kawib1g9lj8g5frgl0hd82"; + sha256 = "1lpprk2qz1lsqf9xj6kj2ciyc1zmjhj5lwd584qkh7jgz2x9y6wb"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 17632c678c46..021cfbb1bb48 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -1,24 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: +{ stdenv, fetchurl, pkgconfig, glib, python3, systemd, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.16.2"; + pname = "libmbim"; + version = "1.18.0"; src = fetchurl { - url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb"; + url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; + sha256 = "10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c"; }; outputs = [ "out" "dev" "man" ]; - preConfigure = '' - patchShebangs . - ''; + configureFlags = [ + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib udev libgudev python ]; + nativeBuildInputs = [ + pkgconfig + python3 + ]; + + buildInputs = [ + glib + libgudev + systemd + ]; + + doCheck = true; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/software/libmbim/; + homepage = https://www.freedesktop.org/wiki/Software/libmbim/; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 1ef2c6914ae4..09eb7d95f370 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "18.08.1"; + version = "18.12"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1h6brg98i39xprcl54gvs1scmv8d6f3iw5h2diwz5bbz4lspy8vs"; + sha256 = "0kvfhcij32jfkggbhqzy7bfiwrly5j51d5gdz5lrfdcjq113svwp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libmemcached/default.nix b/nixpkgs/pkgs/development/libraries/libmemcached/default.nix index 15e642832df6..d2fba5cddd82 100644 --- a/nixpkgs/pkgs/development/libraries/libmemcached/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmemcached/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fpermissive"/*gcc7*/ ]; meta = with stdenv.lib; { - homepage = http://libmemcached.org; + homepage = https://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/libminc/default.nix b/nixpkgs/pkgs/development/libraries/libminc/default.nix index 1e13f3238222..aea7a5959fac 100644 --- a/nixpkgs/pkgs/development/libraries/libminc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libminc/default.nix @@ -22,13 +22,12 @@ stdenv.mkDerivation rec { buildInputs = [ zlib netcdf nifticlib hdf5 ]; cmakeFlags = [ - "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" "-DLIBMINC_MINC1_SUPPORT=ON" "-DLIBMINC_BUILD_SHARED_LIBS=ON" "-DLIBMINC_USE_SYSTEM_NIFTI=ON" ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = true; checkPhase = '' export LD_LIBRARY_PATH="$(pwd)" # see #22060 ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure diff --git a/nixpkgs/pkgs/development/libraries/libmodbus/default.nix b/nixpkgs/pkgs/development/libraries/libmodbus/default.nix index d1ee30698a09..182d642bc08d 100644 --- a/nixpkgs/pkgs/development/libraries/libmodbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmodbus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to send/receive data according to the Modbus protocol"; - homepage = http://libmodbus.org/; + homepage = https://libmodbus.org/; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix index ae12bd03813c..408155fd5a77 100644 --- a/nixpkgs/pkgs/development/libraries/libndctl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndctl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, autoreconfHook , asciidoctor, pkgconfig, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt -, json_c, kmod, which, file, utillinux, systemd +, json_c, kmod, which, file, utillinux, systemd, keyutils }: stdenv.mkDerivation rec { name = "libndctl-${version}"; - version = "63"; + version = "64.1"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "060nsza8xic769bxj3pvl70a9885bwrc0myw16l095i3z6w7yzwq"; + sha256 = "1la82fqbdwjkw6il498nkdfgqc4aszv481xf2p9p07jfvankx24v"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ json_c kmod utillinux systemd + [ json_c kmod utillinux systemd keyutils ]; configureFlags = diff --git a/nixpkgs/pkgs/development/libraries/libnfs/default.nix b/nixpkgs/pkgs/development/libraries/libnfs/default.nix index 96bd983e64cd..8ed6dfa8ac0d 100644 --- a/nixpkgs/pkgs/development/libraries/libnfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libnfs-${version}"; - version = "3.0.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libnfs"; rev = "libnfs-${version}"; - sha256 = "115p55y2cbs92z5lmcnjx1v29lwinpgq4sha9v1kq1vd8674h404"; + sha256 = "0i27wd4zvhjz7620q043p4d4mkx8zv2yz9adm1byin47dynahyda"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libofx/default.nix b/nixpkgs/pkgs/development/libraries/libofx/default.nix index 86166ec608fd..6723c08f0822 100644 --- a/nixpkgs/pkgs/development/libraries/libofx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.13"; + name = "libofx-0.9.14"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "1r60pj1jn269mk4s4025qxllkzgvnbw5r3vby8j2ry5svmygksjp"; + sha256 = "02i9zxkp66yxjpjay5dscfh53bz5vxy03zcxncpw09svl6zmf9xq"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; diff --git a/nixpkgs/pkgs/development/libraries/libow/default.nix b/nixpkgs/pkgs/development/libraries/libow/default.nix new file mode 100644 index 000000000000..66cb0762c25a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libow/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }: + +stdenv.mkDerivation rec { + version = "3.2p1"; + name = "libow-${version}"; + + src = fetchFromGitHub { + owner = "owfs"; + repo = "owfs"; + rev = "v${version}"; + sha256 = "17jhhvlqzndf7q3xnb8bjf4j0j905c420cbxabwpz8xac3z62vb8"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + meta = with stdenv.lib; { + description = "1-Wire File System full library"; + homepage = http://owfs.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ disserman ]; + platforms = platforms.unix; + }; + + buildInputs = [ libtool ]; + + preConfigure = "./bootstrap"; + + configureFlags = [ + "--disable-owtcl" + "--disable-owphp" + "--disable-owpython" + "--disable-zero" + "--disable-owshell" + "--disable-owhttpd" + "--disable-owftpd" + "--disable-owserver" + "--disable-owperl" + "--disable-owtcl" + "--disable-owtap" + "--disable-owmon" + "--disable-owexternal" + ]; +} diff --git a/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix index fc753fe76696..567be6e55244 100644 --- a/nixpkgs/pkgs/development/libraries/libpqxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.4.2"; + version = "6.4.3"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "1s9gbznhak4nvpv56v38pgyki37rlmr0rgc1249ahhv0yfbcf74j"; + sha256 = "1h2gwns9mcdsrl8v203pq3r6jcydg3r5nihsl8s17lkfysizrqw8"; }; nativeBuildInputs = [ gnused python2 ]; diff --git a/nixpkgs/pkgs/development/libraries/libpst/default.nix b/nixpkgs/pkgs/development/libraries/libpst/default.nix index cb30a890f401..574fa18ae4e4 100644 --- a/nixpkgs/pkgs/development/libraries/libpst/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpst/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://www.five-ten-sg.com/libpst/; + homepage = https://www.five-ten-sg.com/libpst/; description = "A library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2; maintainers = [maintainers.tohl]; diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 99383fe6450c..083b5c8bc851 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }: +{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }: stdenv.mkDerivation rec { - name = "libqmi-1.20.2"; + pname = "libqmi"; + version = "1.22.2"; src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67"; + url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; + sha256 = "09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi"; }; outputs = [ "out" "dev" "devdoc" ]; - preBuild = '' - patchShebangs . - ''; + configureFlags = [ + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib python libgudev libmbim ]; + nativeBuildInputs = [ + pkgconfig + python3 + ]; - configureFlags = ["--enable-mbim-qmux" ]; + buildInputs = [ + glib + libgudev + libmbim + ]; + + doCheck = true; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/libqmi/; + homepage = https://www.freedesktop.org/wiki/Software/libqmi/; description = "Modem protocol helper library"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/development/libraries/librelp/default.nix b/nixpkgs/pkgs/development/libraries/librelp/default.nix index 011de93e668f..82a71be52105 100644 --- a/nixpkgs/pkgs/development/libraries/librelp/default.nix +++ b/nixpkgs/pkgs/development/libraries/librelp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls zlib ]; meta = with stdenv.lib; { - homepage = http://www.librelp.com/; + homepage = https://www.librelp.com/; description = "A reliable logging library"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index 9cd68cacfe7b..21eeb1848d93 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintl, darwin, rust, gnome3 +, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3 , withGTK ? false, gtk3 ? null , vala, gobject-introspection }: let pname = "librsvg"; - version = "2.44.12"; + version = "2.45.5"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6"; + sha256 = "001phhq3dd9i6mkbjnmw468vjlqvs1330nwdzldy1rcgc3f74230"; }; outputs = [ "out" "dev" "installedTests" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; - nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobject-introspection ] + nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); diff --git a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index 1f188f98f038..0571cc5b3ac5 100644 --- a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz"; + sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f"; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 2f8f37b37927..4c1e0d830d10 100644 --- a/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.3"; + version = "0.7.4"; name = "libsolv-${version}"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "13zjk78gc5fyygpsf0n3p9n22gbjd64wgng98253phd3znvzplag"; + sha256 = "0d7xwykb3mxg8bhmlswnj5f0iyl1qsjyidxswzhcbk21fcgm5d4y"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix index e59282553fbc..d0023a3d4f36 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libsoup"; - version = "2.64.2"; + version = "2.66.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm"; + sha256 = "08c9kkdhzy504gv23pfdm4sq3dd3j20sikwz6gv0qrwcdjnw5bai"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix index 52359a3a4cd6..a61b3c3f2ac9 100644 --- a/nixpkgs/pkgs/development/libraries/libvdpau/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvdpau/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libvdpau-${version}"; - version = "1.1.1"; + version = "1.2"; src = fetchurl { - url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; - sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; + url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2"; + sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libwpg/default.nix b/nixpkgs/pkgs/development/libraries/libwpg/default.nix index 99808be2b216..e80cefe16e2d 100644 --- a/nixpkgs/pkgs/development/libraries/libwpg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwpg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { - name = "libwpg-0.3.2"; + name = "libwpg-0.3.3"; src = fetchurl { url = "mirror://sourceforge/libwpg/${name}.tar.xz"; - sha256 = "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp"; + sha256 = "074x159immf139szkswv2zapnq75p7xk10dbha2p9193hgwggcwr"; }; buildInputs = [ libwpd zlib librevenge ]; diff --git a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix index 591a3e451ab3..93f78a7eb8f0 100644 --- a/nixpkgs/pkgs/development/libraries/libx86emu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libx86emu-${version}"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "16k16xcw2w2c69sn04jfdy9fd7cxs463d2rwb948xchyvfla958j"; + sha256 = "10amjaamd6jfwqxrinsbkqmm6jjrwzyqjp8qy3hm71vkg6fr20gy"; }; nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index 12fd972b8719..7bd89b44d889 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library of exchange-correlation functionals for density-functional theory"; - homepage = http://octopus-code.org/wiki/Libxc; + homepage = https://octopus-code.org/wiki/Libxc; license = licenses.lgpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ markuskowa ]; diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index e730cc6eaabf..0d034f5385f5 100644 --- a/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; - homepage = http://xkbcommon.org; + homepage = https://xkbcommon.org; license = licenses.mit; maintainers = with maintainers; [ garbas ttuegel ]; platforms = with platforms; unix; diff --git a/nixpkgs/pkgs/development/libraries/marisa/default.nix b/nixpkgs/pkgs/development/libraries/marisa/default.nix index ed824ec75922..4b06c58af5f7 100644 --- a/nixpkgs/pkgs/development/libraries/marisa/default.nix +++ b/nixpkgs/pkgs/development/libraries/marisa/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "marisa-${version}"; - version = "0.2.4"; + pname = "marisa"; + version = "0.2.5"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/marisa-trie/marisa-${version}.tar.gz"; - sha256 = "1cwzf8hr348zihkiy0qckx0n6rxg7sy113xhbslb1irw1pvs99v7"; + src = fetchFromGitHub { + owner = "s-yata"; + repo = "marisa-trie"; + rev = "v${version}"; + sha256 = "0z4bf55np08q3cbi6gvj3cpw3zp8kf2d0jq6k74pjk066m7rapbb"; }; enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { homepage = https://github.com/s-yata/marisa-trie; description = "Static and space-efficient trie data structure library"; diff --git a/nixpkgs/pkgs/development/libraries/matio/default.nix b/nixpkgs/pkgs/development/libraries/matio/default.nix index 72743efeb8ef..9abdf4bbd854 100644 --- a/nixpkgs/pkgs/development/libraries/matio/default.nix +++ b/nixpkgs/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.14"; + name = "matio-1.5.15"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "0vhzh0idzlm0m28gxsnv1dcfp0229vdj49d749qn4xfdyncbnfhb"; + sha256 = "1kxi15ph68nnbi0s1m8icb0685wg8ql8gj7wnkdk20kzpf3lbgr1"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index b5bfb4af0bdb..7d070364a63c 100644 --- a/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = "mbedtls-${version}"; - version = "2.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "0w6cm2f7d43wp8cx6r5h4icq8zcix1jnvivshypir1rbk1q83gx8"; + sha256 = "14gw3rga9qr6j8ssfjy7k4l8spz37gamqxh9qcwas7w48303897l"; }; nativeBuildInputs = [ cmake ninja perl python ]; diff --git a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix index 4e35d6ed24d1..cb238a6a5ae0 100644 --- a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = https://cgit.freedesktop.org/mesa/glu/; license = stdenv.lib.licenses.sgi-b-20; platforms = stdenv.lib.platforms.unix; + broken = stdenv.hostPlatform.isAndroid; }; } diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 1f41696a4e33..85ea7a6292a5 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.12.0"; + version = "6.14.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w"; + sha256 = "0lxjrd0rsadkfwg86qp0p176kqd9zdfhbmjygmrg5jklmxzd5i25"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/nixpkgs/pkgs/development/libraries/mm-common/default.nix index 78ae8875fcf3..9519e295213b 100644 --- a/nixpkgs/pkgs/development/libraries/mm-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/mm-common/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { control repository. An installation of mm-common is not required for building tarball releases, unless configured to use maintainer-mode. ''; - homepage = http://www.gtkmm.org; + homepage = https://www.gtkmm.org; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/motif/default.nix b/nixpkgs/pkgs/development/libraries/motif/default.nix index c57353ccbd47..51591c9d8e8b 100644 --- a/nixpkgs/pkgs/development/libraries/motif/default.nix +++ b/nixpkgs/pkgs/development/libraries/motif/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://motif.ics.com; + homepage = https://motif.ics.com; description = "Unix standard widget-toolkit and window-manager"; platforms = with platforms; linux ++ darwin; license = with licenses; [ lgpl21 ]; diff --git a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix index 923bc61f67da..cbe1f9840593 100644 --- a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx]; - configureFlags = [ + wafConfigureFlags = [ "--with-openssl=${openssl.dev}" "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index 971c70c4f2cc..277ef7923e61 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -17,12 +17,12 @@ assert enableJemalloc -> jemalloc != null; let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "nghttp2-${version}"; - version = "1.36.0"; + pname = "nghttp2"; + version = "1.37.0"; src = fetchurl { - url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; + sha256 = "1bi3aw096kd51abazvv6ilplz6gjbm84yr3mzxklbhysv38y6xl2"; }; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch b/nixpkgs/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch new file mode 100644 index 000000000000..d7fec73910fb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch @@ -0,0 +1,84 @@ +From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001 +From: Graham Christensen <graham@grahamc.com> +Date: Thu, 7 Mar 2019 08:11:32 -0500 +Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility + +--- + nspr/lib/ds/Makefile.in | 4 ++-- + nspr/lib/libc/src/Makefile.in | 4 ++-- + nspr/lib/prstreams/Makefile.in | 4 ++-- + nspr/pr/src/Makefile.in | 6 +++--- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in +index e737791..d56b0a7 100644 +--- a/nspr/lib/ds/Makefile.in ++++ b/nspr/lib/ds/Makefile.in +@@ -101,8 +101,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in +index e8a6d9f..0485737 100644 +--- a/nspr/lib/libc/src/Makefile.in ++++ b/nspr/lib/libc/src/Makefile.in +@@ -103,8 +103,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in +index aeb2944..83ae423 100644 +--- a/nspr/lib/prstreams/Makefile.in ++++ b/nspr/lib/prstreams/Makefile.in +@@ -105,8 +105,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(OS_ARCH), WINNT) + SUF = i64 +diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in +index 19c5a69..989cc8c 100644 +--- a/nspr/pr/src/Makefile.in ++++ b/nspr/pr/src/Makefile.in +@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE) + endif + # + # In Solaris 2.6 or earlier, -lrt is called -lposix4. +-# ++# + LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE))) + ifeq (5.7, $(LIBRT_TEST)) + LIBRT=-lrt +@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY)) + endif + + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +-- +2.19.2 + diff --git a/nixpkgs/pkgs/development/libraries/nspr/default.nix b/nixpkgs/pkgs/development/libraries/nspr/default.nix index 56804d546673..9dfb3d3851f4 100644 --- a/nixpkgs/pkgs/development/libraries/nspr/default.nix +++ b/nixpkgs/pkgs/development/libraries/nspr/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation { sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c"; }; + patches = [ + ./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; diff --git a/nixpkgs/pkgs/development/libraries/ntrack/default.nix b/nixpkgs/pkgs/development/libraries/ntrack/default.nix index a2361b0188eb..c0a73fa984e7 100644 --- a/nixpkgs/pkgs/development/libraries/ntrack/default.nix +++ b/nixpkgs/pkgs/development/libraries/ntrack/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; + # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; # Remove this patch after version 016 diff --git a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 42c0de4d493c..3081c6c839c8 100644 --- a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { name = "opencolorio-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "0cjsyn681xsg89lirlll5pqlsqg2vnk1278iiicmzjy2a2v8x7zq"; + sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/openfst/default.nix b/nixpkgs/pkgs/development/libraries/openfst/default.nix index c8c66969ef9b..cd3210dd08b1 100644 --- a/nixpkgs/pkgs/development/libraries/openfst/default.nix +++ b/nixpkgs/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "0x9wfcqd8hq4h349s7j77sr60h8xjdfshqw1m3a2n6z5bdr9qkm1"; + sha256 = "0fqgk8195kz21is09gwzwnrg7fr9526bi9mh4apyskapz27pbhr1"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 3e0202355ea3..133e9ae8cb82 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -132,8 +132,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1a"; - sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w"; + version = "1.1.1b"; + sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix index c11098c52ab8..00f4f45df96a 100644 --- a/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { meta = { description = "C++ implementation of the OpenTracing API"; - homepage = http://opentracing.io; + homepage = https://opentracing.io; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ rob ]; }; } - diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index 7b1d69ed42b0..ef60b331fc6c 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -1,30 +1,50 @@ { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz , libintl, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf +, meson, ninja, glib }: with stdenv.lib; let pname = "pango"; - version = "1.42.4"; + version = "1.43.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"; + sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j"; }; - outputs = [ "bin" "dev" "out" "devdoc" ]; + # FIXME: docs fail on darwin + outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; - nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + nativeBuildInputs = [ + meson ninja + pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ + harfbuzz fribidi + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices Carbon CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ]; + propagatedBuildInputs = [ cairo glib libXft libintl ]; + + patches = [ + (fetchurl { + # Add gobject-2 to .pc file + url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch"; + sha256 = "034na38cq98vk8gggn3yfr65jmv3jgig8d25zg89wydrandp14yr"; + }) + ]; + + mesonFlags = [ + "-Denable_docs=${if stdenv.isDarwin then "false" else "true"}" + ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/physfs/default.nix b/nixpkgs/pkgs/development/libraries/physfs/default.nix index e29af17f35df..6edea7f51419 100644 --- a/nixpkgs/pkgs/development/libraries/physfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/physfs/default.nix @@ -37,5 +37,5 @@ let in { physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na"; - physfs = generic "3.0.1" "1wgj2zqpnfbnyyi1i7bq5pshcc9n5cvwlpzp8im67nb8662ryyxp"; + physfs = generic "3.0.2" "0qzqz4r88gvd8m7sh2z5hvqcr0jfr4wb2f77c19xycyn0rigfk9h"; } diff --git a/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix index 3eb4ddaab693..30b56afb8a95 100644 --- a/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/apfel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PDF Evolution Library"; license = licenses.gpl3; - homepage = http://apfel.mi.infn.it/; + homepage = https://apfel.mi.infn.it/; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix index 61af6e7fdab8..639d6266b5a8 100644 --- a/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pixman-${version}"; - version = "0.36.0"; + version = "0.38.0"; src = fetchurl { url = "mirror://xorg/individual/lib/${name}.tar.bz2"; - sha256 = "1p40fygy9lcn6ypkzh14azksi570brcpr3979bjpff8qk76c14px"; + sha256 = "1a1nnkjv0rqdj26847r0saly0kzckjfp4y3ly30bvpjxi7vy6s5p"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/pmdk/default.nix b/nixpkgs/pkgs/development/libraries/pmdk/default.nix new file mode 100644 index 000000000000..ceb49fc01538 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pmdk/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, autoconf, libndctl, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "pmdk-${version}"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "pmem"; + repo = "pmdk"; + rev = "refs/tags/${version}"; + sha256 = "11h9h5ifgaa5f6v9y77s5lmsj7k61qg52992s1361cmvl0ndgl9k"; + }; + + nativeBuildInputs = [ autoconf pkgconfig ]; + buildInputs = [ libndctl ]; + enableParallelBuilding = true; + + outputs = [ "out" "lib" "dev" "man" ]; + + patchPhase = "patchShebangs utils"; + + installPhase = '' + make install prefix=$out + + mkdir -p $lib $dev $man/share + mv $out/share/man $man/share/man + mv $out/include $dev/include + mv $out/lib $lib/lib + ''; + + meta = with stdenv.lib; { + description = "Persistent Memory Development Kit"; + homepage = https://github.com/pmem/pmdk; + license = licenses.lgpl21; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = [ "x86_64-linux" ]; # aarch64 is experimental + }; +} diff --git a/nixpkgs/pkgs/development/libraries/polkit/default.nix b/nixpkgs/pkgs/development/libraries/polkit/default.nix index 737a9a5badf2..f47d2713f1a4 100644 --- a/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -2,6 +2,7 @@ , intltool, spidermonkey_52 , gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? stdenv.isLinux, systemd +, withGnome ? true , doCheck ? stdenv.isLinux }: @@ -42,11 +43,12 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk-doc pkgconfig autoreconfHook intltool gobject-introspection perl ] + [ glib gtk-doc pkgconfig intltool perl ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = - [ glib expat pam spidermonkey_52 gobject-introspection ] - ++ stdenv.lib.optional useSystemd systemd; + [ glib expat pam spidermonkey_52 ] + ++ stdenv.lib.optional useSystemd systemd + ++ stdenv.lib.optional withGnome gobject-introspection; NIX_CFLAGS_COMPILE = " -Wno-deprecated-declarations "; # for polkit 0.114 and glib 2.56 @@ -73,7 +75,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS - "--enable-introspection" + (if withGnome then "--enable-introspection" else "--disable-introspection") ] ++ stdenv.lib.optional (!doCheck) "--disable-test"; makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix index f1b6c002488e..28408cb91f88 100644 --- a/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.73.0"; + version = "0.74.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "00yv7011y40jc5iw9b7zjyg8ij5wsfbjm32kli5qha1ij11majz4"; + sha256 = "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix index 0009209d9cef..16decc44e847 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.6.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.6.1"; - sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; + version = "3.6.1.3"; + sha256 = "1spj0d4flx6h3phxx3sg9r00yv734hina3365avkcz9brnm089c1"; } diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.7.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.7.nix new file mode 100644 index 000000000000..8a3f9a563212 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.7.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.7.0"; + sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh"; +} diff --git a/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix b/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix index 4d53c42a3478..c3a815c45ac8 100644 --- a/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix +++ b/nixpkgs/pkgs/development/libraries/protobufc/1.3.nix @@ -5,7 +5,8 @@ callPackage ./generic.nix (args // rec { src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - rev = "v${version}"; - sha256 = "1dmvs0bhyx94ipaq3c7jmwcz4hwjmznn7310kqkqx7ly0w5vxxxr"; + #rev = "v${version}"; + rev = "9412830d0680150d429d2aa170b8d7218ab49397"; + sha256 = "175cmaj5231iqzhf5a9sxw2y3i165chk3681m1b5mp8di927q5ai"; }; }) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix b/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix index 96014cfbc779..d4e2143d564b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -19,7 +19,6 @@ let cmakeFlags = (args.cmakeFlags or []) ++ [ - "-DBUILD_TESTING=OFF" ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index f5f5c69455f5..92ac8a242013 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -301,7 +301,6 @@ stdenv.mkDerivation { then [ "-platform macx-clang" - "-no-use-gold-linker" "-no-fontconfig" "-qt-freetype" "-qt-libpng" @@ -329,9 +328,6 @@ stdenv.mkDerivation { "-glib" "-system-libjpeg" "-system-libpng" - # gold linker of binutils 2.28 generates duplicate symbols - # TODO: remove for newer version of binutils - "-no-use-gold-linker" ] ++ lib.optional withGtk3 "-gtk" ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" diff --git a/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix index 79b182b33b22..b6e0acb603d3 100644 --- a/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix +++ b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4, qmake4Hook, AGL }: stdenv.mkDerivation rec { - name = "qwt-6.1.3"; + name = "qwt-6.1.4"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "0cwp63s03dw351xavb3pzbjlqvx7kj88wv7v4a2b18m9f97d7v7k"; + sha256 = "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/readline/6.3.nix b/nixpkgs/pkgs/development/libraries/readline/6.3.nix index cbe6c083cb44..f9a20a535cb3 100644 --- a/nixpkgs/pkgs/development/libraries/readline/6.3.nix +++ b/nixpkgs/pkgs/development/libraries/readline/6.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./link-against-ncurses.patch ./no-arch_only-6.3.patch - ] + ] ++ stdenv.lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch ++ (let patch = nr: sha256: diff --git a/nixpkgs/pkgs/development/libraries/readline/android.patch b/nixpkgs/pkgs/development/libraries/readline/android.patch new file mode 100644 index 000000000000..7e81774be369 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/readline/android.patch @@ -0,0 +1,16 @@ +diff --git histlib.h histlib.h +index c938a10..925ab72 100644 +--- histlib.h ++++ histlib.h +@@ -51,9 +51,9 @@ + #endif + + #ifndef member +-# ifndef strchr ++# if !defined (strchr) && !defined (__STDC__) + extern char *strchr (); +-# endif ++# endif /* !strchr && !__STDC__ */ + #define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0) + #endif + diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix index f763e8a4fcc0..0c634c0f265c 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libminc netpbm ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" ]; doCheck = false; # internal_volume_io.h: No such file or directory diff --git a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix index ce2050e82e6d..51beba898f6c 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON"; + cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON"; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 2ae3bd2b9c83..5d0f6794d176 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -127,7 +127,12 @@ stdenv.mkDerivation rec { CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; # Makefile.system only checks defined status - NO_BINARY_MODE = toString (stdenv.hostPlatform != stdenv.buildPlatform); + # This seems to be a bug in the openblas Makefile: + # on x86_64 it expects NO_BINARY_MODE= + # but on aarch64 it expects NO_BINARY_MODE=0 + NO_BINARY_MODE = if stdenv.isx86_64 + then toString (stdenv.hostPlatform != stdenv.buildPlatform) + else stdenv.hostPlatform != stdenv.buildPlatform; }); doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 3e8524b40140..01b0faf89f90 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "High quality system independent, portable, open source libm implementation"; - homepage = http://www.openlibm.org/; + homepage = https://www.openlibm.org/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix b/nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix index d5c3ca2457aa..5218de075093 100644 --- a/nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { patchShebangs doc/ns3_html_theme/get_version.sh ''; - configureFlags = with stdenv.lib; [ + wafConfigureFlags = with stdenv.lib; [ "--enable-modules=${stdenv.lib.concatStringsSep "," modules}" "--with-python=${pythonEnv.interpreter}" ] diff --git a/nixpkgs/pkgs/development/libraries/simgear/default.nix b/nixpkgs/pkgs/development/libraries/simgear/default.nix index 927715535b5f..11612eeb2884 100644 --- a/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "simgear-${version}"; - version = "2018.2.2"; - shortVersion = "2018.2"; + version = "2018.3.1"; + shortVersion = "2018.3"; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5"; + sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99"; }; buildInputs = [ plib freeglut xorgproto libX11 libXext libXi diff --git a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix index 4dd09776f343..2903e79f8910 100644 --- a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.2.1"; + name = "socket_wrapper-1.2.3"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1yi1ry3skkbrhvm6g72ripz99diqxnd09v0bx3dlb5sfgcl0wjax"; + sha256 = "1jprm8f7xb91b3yrapdbf51l36j6g038n379akz7ds0dicjh0fh7"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix index 08c92ee9ea48..18ec02b4acf3 100644 --- a/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.14"; + name = "spice-protocol-0.12.15"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90"; + sha256 = "06b461i4jv741in8617jjpfk28wk7zs9p7841njkf4sbm8xv4kcb"; }; postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 46c006df9357..ce72c2737be9 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { name = "sqlcipher-${version}"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "08iqj80qlcsnid2s3m6gcryhvcfc0f136frv0md2gp3rz9g3l63d"; + sha256 = "0w0f4pg3jfzismpgqnbf60bjbbll2ang48216bc4m20mm2dpp5ar"; }; buildInputs = [ readline ncurses openssl tcl ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix b/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix index 0a63f5e778a6..5c42f729469b 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.26.0"; + version = "3.27.2"; src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0ysgi2jrl348amdfifsl3cx90d04bijm4pn4xnvivmi3m1dq4hp0"; + url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; + sha256 = "02nz1y22wyb8101d9y6wfdrvp855wvch67js12p5y3riya345g8m"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 100f7fec06aa..bacba396c25b 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.26.0"; + version = "3.27.2"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx"; + url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "0vpgwszs19pwks2b4dhqwa0n6q5sx6pn1s7rngyyrd98xa2rxhsh"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/srt/default.nix b/nixpkgs/pkgs/development/libraries/srt/default.nix index b1882ff030b6..bb66174c8841 100644 --- a/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "0cv73j9c8024p6pg16c4hiryiv4jpgrfj2xhfdaprsikmkdnygmz"; + sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/talloc/default.nix b/nixpkgs/pkgs/development/libraries/talloc/default.nix index 1fbbecf71a6b..5a8ebe84ba69 100644 --- a/nixpkgs/pkgs/development/libraries/talloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/talloc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pkgconfig, readline, libxslt , docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames -, buildPackages +, wafHook }: stdenv.mkDerivation rec { @@ -11,23 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di"; }; - nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python + nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook docbook_xsl docbook_xml_dtd_42 ]; buildInputs = [ readline libxslt ]; - prePatch = '' - patchShebangs buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--enable-talloc-compat1" "--bundled-libraries=NONE" "--builtin-libraries=replace" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - configurePlatforms = []; + + # this must not be exported before the ConfigurePhase otherwise waf whines + preBuild = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + export NIX_CFLAGS_LINK="-no-pie -shared"; + ''; postInstall = '' ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o diff --git a/nixpkgs/pkgs/development/libraries/tdb/default.nix b/nixpkgs/pkgs/development/libraries/tdb/default.nix index 21f062998b40..4df80140aa5d 100644 --- a/nixpkgs/pkgs/development/libraries/tdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python2, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42, buildPackages +{ stdenv, fetchurl, wafHook, pkgconfig, readline, libxslt +, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { @@ -10,23 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva"; }; - nativeBuildInputs = [ pkgconfig python2 ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ readline libxslt docbook_xsl docbook_xml_dtd_42 ]; - preConfigure = '' - patchShebangs buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - configurePlatforms = [ ]; meta = with stdenv.lib; { description = "The trivial database"; diff --git a/nixpkgs/pkgs/development/libraries/template-glib/default.nix b/nixpkgs/pkgs/development/libraries/template-glib/default.nix index 2b63bab0eade..4314abd2548a 100644 --- a/nixpkgs/pkgs/development/libraries/template-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/template-glib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let - version = "3.30.0"; + version = "3.32.0"; pname = "template-glib"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j9ndswl3fc0ymbqd6kk7yw3sniij3dgczc665p06wgw3cwhssfg"; + sha256 = "1g0zx0sxpw8kqp7p3sgl9kngaqrg9xl6cir24nrahks0vgsk98rr"; }; buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; diff --git a/nixpkgs/pkgs/development/libraries/tk/generic.nix b/nixpkgs/pkgs/development/libraries/tk/generic.nix index b3cc2b7506b1..d5eaff77c117 100644 --- a/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,6 @@ -{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }: +{ stdenv, lib, src, pkgconfig, tcl, libXft, fontconfig, patches ? [] +, enableAqua ? stdenv.isDarwin, darwin +, ... }: stdenv.mkDerivation { name = "tk-${tcl.version}"; @@ -21,15 +23,14 @@ stdenv.mkDerivation { configureFlags = [ "--with-tcl=${tcl}/lib" - ]; + ] ++ stdenv.lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ] - ++ stdenv.lib.optional stdenv.isDarwin fontconfig; propagatedBuildInputs = [ tcl libXft ]; - - NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; + buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [ + Cocoa cf-private + ]); doCheck = false; # fails. can't find itself diff --git a/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix b/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix index 9e4ac7e22ca9..1a900c3135ca 100644 --- a/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/nixpkgs/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = https://sourceforge.net/projects/opencore-amr/; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; - license = "stdenv.lib.licenses.apache"; + license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.Esteth ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix index 97bb961c4bc5..7089da984a97 100644 --- a/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.54.3"; + version = "0.56.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9"; + sha256 = "0z6w4vrz51bjnvk773j4pnrqfmkvaaa58yc6yi3jwcx90b68xyh2"; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/vte/ng.nix b/nixpkgs/pkgs/development/libraries/vte/ng.nix index 6231b8315cd5..c00be4c008f7 100644 --- a/nixpkgs/pkgs/development/libraries/vte/ng.nix +++ b/nixpkgs/pkgs/development/libraries/vte/ng.nix @@ -1,4 +1,4 @@ -{ vte, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: +{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf }: vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; @@ -11,6 +11,15 @@ vte.overrideAttrs (oldAttrs: rec { sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; }; + patches = [ + # Fix build with vala 0.44 + # See: https://github.com/thestinger/vte-ng/issues/32 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/commit/53690d5cee51bdb7c3f7680d3c22b316b1086f2c.patch"; + sha256 = "1jrpqsx5hqa01g7cfqrsns6vz51mwyqwdp43ifcpkhz3wlp5dy66"; + }) + ]; + preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] diff --git a/nixpkgs/pkgs/development/libraries/vtk/default.nix b/nixpkgs/pkgs/development/libraries/vtk/default.nix index dee363f23b6a..9843b1289cfc 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { # objects. cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] - ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" - "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; + ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt diff --git a/nixpkgs/pkgs/development/libraries/vxl/default.nix b/nixpkgs/pkgs/development/libraries/vxl/default.nix index 777b8bb1f403..9651e9a5f80c 100644 --- a/nixpkgs/pkgs/development/libraries/vxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/vxl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # BUILD_OUL wants old linux headers for videodev.h, not available # in stdenv linux headers # BUILD_BRL fails to find open() - cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF " + cmakeFlags = "-DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF " + (if stdenv.hostPlatform.system == "x86_64-linux" then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" else diff --git a/nixpkgs/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix index 8a5a5dc070ed..60d240552d4f 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -7,12 +7,12 @@ assert expat != null; stdenv.mkDerivation rec { - name = "wayland-${version}"; - version = "1.16.0"; + pname = "wayland"; + version = "1.17.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"; + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; + sha256 = "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj"; }; separateDebugInfo = true; diff --git a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix new file mode 100644 index 000000000000..4fd94a29f9cd --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL }: + +stdenv.mkDerivation rec { + pname = "waylandpp"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "NilsBrause"; + repo = pname; + rev = version; + sha256 = "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ pugixml wayland libGL ]; + + meta = with stdenv.lib; { + description = "Wayland C++ binding"; + homepage = https://github.com/NilsBrause/waylandpp/; + license = with licenses; [ bsd2 hpnd ]; + maintainers = with maintainers; [ minijackson ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 1bec00e55596..2ccc9b7c2b4b 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.24.0"; + version = "2.24.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif"; + sha256 = "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk"; }; patches = optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/node-packages/composition-v6.nix b/nixpkgs/pkgs/development/node-packages/composition-v6.nix deleted file mode 100644 index ce42bfa7ba3d..000000000000 --- a/nixpkgs/pkgs/development/node-packages/composition-v6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.6.0. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages-v6.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} \ No newline at end of file diff --git a/nixpkgs/pkgs/development/node-packages/generate.sh b/nixpkgs/pkgs/development/node-packages/generate.sh index 816db45375dd..3df201dd96e3 100755 --- a/nixpkgs/pkgs/development/node-packages/generate.sh +++ b/nixpkgs/pkgs/development/node-packages/generate.sh @@ -4,6 +4,5 @@ set -eu -o pipefail rm -f node-env.nix -node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix diff --git a/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix index f5dd92422cc1..13cc4b02b068 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - homepage = http://erratique.ch/software/astring; + homepage = https://erratique.ch/software/astring; description = "Alternative String module for OCaml"; longDescription = '' Astring exposes an alternative String module for OCaml. This module tries diff --git a/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix b/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix new file mode 100644 index 000000000000..8128dc1cb6f5 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: + +let version = "2.0.0"; in + +stdenv.mkDerivation { + name = "ocaml-base64-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; + sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/ocaml-base64; + platforms = ocaml.meta.platforms or []; + description = "Base64 encoding and decoding in OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix b/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix index 8128dc1cb6f5..2633d43c1045 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchzip, buildDunePackage, alcotest, bos }: -let version = "2.0.0"; in +let version = "3.2.0"; in -stdenv.mkDerivation { - name = "ocaml-base64-${version}"; +buildDunePackage { + pname = "base64"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; - sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; + sha256 = "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + minimumOCamlVersion = "4.03"; - createFindlibDestdir = true; + buildInputs = [ alcotest bos ]; + + doCheck = true; meta = { homepage = https://github.com/mirage/ocaml-base64; - platforms = ocaml.meta.platforms or []; description = "Base64 encoding and decoding in OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix index 974348116656..47e9d7febf85 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic OS interaction for OCaml"; - homepage = http://erratique.ch/software/bos; + homepage = https://erratique.ch/software/bos; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix index c11aa41a4931..003ce57cc8a0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = http://erratique.ch/software/cmdliner; + homepage = https://erratique.ch/software/cmdliner; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix b/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix index 34c8fcbfcbcd..d739b33c8fab 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, alcotest }: +{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }: buildDunePackage rec { pname = "faraday"; - version = "0.5.0"; + version = "0.7.0"; minimumOCamlVersion = "4.02"; @@ -10,16 +10,17 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n"; + sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2"; }; buildInputs = [ alcotest ]; + propagatedBuildInputs = [ bigstringaf ]; doCheck = true; meta = { description = "Serialization library built for speed and memory efficiency"; - 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/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix index 20b6f7d0909e..96423a213a19 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix @@ -8,11 +8,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-farfadet-${version}"; - version = "0.2"; + version = "0.3"; src = fetchurl { url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz"; - sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr"; + sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix index 922f85996e14..a171a672ecaa 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = { - homepage = http://erratique.ch/software/fmt; + homepage = https://erratique.ch/software/fmt; license = stdenv.lib.licenses.isc; description = "OCaml Format pretty-printer combinators"; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix index 9317f50717e2..f8b7eda3a4fc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; - homepage = http://erratique.ch/software/fpath; + homepage = https://erratique.ch/software/fpath; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index 988b7147fcb4..5c0726176f6d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -441,13 +441,6 @@ rec { meta.description = "Async helpers for writing expectation tests"; }; - bignum = janePackage { - pname = "bignum"; - hash = "0hqd88fb90rsj1wjj4k79gigcf31c6a45msasw99zzifzppr3w3f"; - propagatedBuildInputs = [ core_kernel zarith num ]; - meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; - }; - cinaps = janePackage { pname = "cinaps"; hash = "0f8cx4xkkk4wqpcbvva8kxdndbgawljp17dwppc6zpjpkjl8s84j"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix index ca286ee36f8c..739daeddee57 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; - homepage = http://erratique.ch/software/jsonm; + homepage = https://erratique.ch/software/jsonm; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix index b067fd99ded4..715f97ebb6cb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Monotonic wall-clock time for OCaml"; - homepage = http://erratique.ch/software/mtime; + homepage = https://erratique.ch/software/mtime; inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix index a1e43d6d13db..468738224dea 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppxlib"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0qpjl84x8abq9zivifb0k8ld7fa1lrhkbajmmccvfv06ja3as1v4"; + sha256 = "0d2nyp4mlx7m3vdvcdhs51x570vw30j645yfbwlhjpwdd8243fya"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix index 4ac473fef006..6562edc12785 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; meta = { - homepage = http://erratique.ch/software/ptime; + homepage = https://erratique.ch/software/ptime; description = "POSIX time for OCaml"; longDescription = '' Ptime has platform independent POSIX time support in pure OCaml. diff --git a/nixpkgs/pkgs/development/ocaml-modules/react/default.nix b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix index 9d070b962b4c..eb0980618129 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/react/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = http://erratique.ch/software/react; + homepage = https://erratique.ch/software/react; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix index fa85f2174688..05bfe2c09347 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }: -assert stdenv.lib.versionAtLeast ocaml.version "3.11"; +if !stdenv.lib.versionAtLeast ocaml.version "4.04" +then throw "reactiveData is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation { - name = "ocaml${ocaml.version}-reactiveData-0.2.1"; + name = "ocaml${ocaml.version}-reactiveData-0.2.2"; src = fetchurl { - url = https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz; - sha256 = "0wcs0z50nia1cpk8mh6i5qbc6sff9cc8x7s7q1q89d7m73bnv4vf"; + url = https://github.com/ocsigen/reactiveData/archive/0.2.2.tar.gz; + sha256 = "0jzagyp4zla28wykvcgqwd8df71ir0vb4s8akp02cfacd5v86sng"; }; buildInputs = [ ocaml findlib ocamlbuild opaline ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix index 270432b86e94..caff9fa96320 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.isc; - homepage = http://erratique.ch/software/rresult; + homepage = https://erratique.ch/software/rresult; description = "Result value combinators for OCaml"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix index e28a86907bb4..e10cdd2d9c10 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru = { inherit run; }; meta = { - homepage = http://erratique.ch/software/topkg; + homepage = https://erratique.ch/software/topkg; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; description = "A packager for distributing OCaml software"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix index 0c45e6c8af18..bb6ef649e59c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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 = http://erratique.ch/software/uuidm; + homepage = https://erratique.ch/software/uuidm; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix index 9b6c1868ad32..58e02d6b2806 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1gp96dcggq7s84934vimxh89caaxa77lqiff1yywbwkilkkjcfqj"; + sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6"; }; buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix index d91f6e1c8a31..9122a3509d96 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl +{ stdenv, fetchurl , ocaml, findlib, pkgconfig, perl , gmp }: @@ -6,9 +6,9 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.7"; - url = https://github.com/ocaml/Zarith/archive/release-1.7.tar.gz; - sha256 = "0fmblap5nsbqq0dab63d6b7lsxpc3snkgz7jfldi2qa4s1kbnhfn"; + version = "1.8"; + url = https://github.com/ocaml/Zarith/archive/release-1.8.tar.gz; + sha256 = "1cn63c97aij19nrw5hc1zh1jpnbsdkzq99zyyk649c4s3xi3iqq7"; } else { version = "1.3"; url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; @@ -16,25 +16,20 @@ let source = }; in -buildOcaml rec { - name = "zarith"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zarith-${version}"; inherit (source) version; src = fetchurl { inherit (source) url sha256; }; - minimumSupportedOcamlVersion = "3.12.1"; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; - # needed so setup-hook.sh sets CAML_LD_LIBRARY_PATH for dllzarith.so - hasSharedObjects = true; - patchPhase = "patchShebangs ./z_pp.pl"; configurePhase = '' ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; + createFindlibDestdir = true; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; diff --git a/nixpkgs/pkgs/development/perl-modules/generic/default.nix b/nixpkgs/pkgs/development/perl-modules/generic/default.nix index a87e0c616fd8..20947b1dc335 100644 --- a/nixpkgs/pkgs/development/perl-modules/generic/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/generic/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, perl }: +{ lib, stdenv, perl, buildPackages, toPerlModule }: { nativeBuildInputs ? [], name, ... } @ attrs: -stdenv.mkDerivation ( +toPerlModule(stdenv.mkDerivation ( ( lib.recursiveUpdate { @@ -37,6 +37,6 @@ stdenv.mkDerivation ( name = "perl${perl.version}-${name}"; builder = ./builder.sh; nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; - inherit perl; + perl = buildPackages.perl; } -) +)) diff --git a/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix index f3c8c57f5766..5c8ec07f4bb1 100644 --- a/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.5.3"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "6599bc78901ee7e9be85cbd073d9cc155c42d2bc867c5cde4d4d1cc339ebfbeb"; + sha256 = "0q22lgp001hkk4z4xs2b2hlix84ka15i576p33fmgp69zn4bhmlg"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/IPy/default.nix b/nixpkgs/pkgs/development/python-modules/IPy/default.nix index eacfe8dda5bc..7f258780d1c6 100644 --- a/nixpkgs/pkgs/development/python-modules/IPy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/IPy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "IPy"; - version = "0.83"; + version = "1.00"; src = fetchPypi { inherit pname version; - sha256 = "61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8"; + sha256 = "08d6kcacj67mvh0b6y765ipccy6gi4w2ndd4v1l3im2qm1cgcarg"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/nixpkgs/pkgs/development/python-modules/Wand/default.nix index 0e25734cb7c0..1db067838fbb 100644 --- a/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "7d6b8dc9d4eaccc430b9c86e6b749013220c994970a3f39e902b397e2fa732c3"; + sha256 = "0nvdq15gmkzhwpwkln8wmkq0h4izznnr6zmrnwqza8lsa1c0jz5f"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 670e07e55d49..6a44dc9a75f2 100644 --- a/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "WazeRouteCalculator"; - version = "0.7.2"; + version = "0.9"; src = fetchPypi { inherit pname version; - sha256 = "09fe1bfb32291a658ba9baffe3fe176693f41362d74caba60fb04be01b447fa1"; + sha256 = "1kwr7r1cn9xxvf9asxqhsy4swx4v6hsgw5cr5wmn71qg11k1i5cx"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix b/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix index 99da64268ee2..e7c5595fe087 100644 --- a/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.1.5"; + version = "1.1.6"; # PyPI release tarball doesn't contain tests so let's use GitHub. See: # https://github.com/jmcnamara/XlsxWriter/issues/327 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = pname; rev = "RELEASE_${version}"; - sha256 = "13250y53mr0pki93sqscy2bx01fxh6b6wvvj6m95ky0wqrrbmg39"; + sha256 = "1hmagwh2k61r90a9xgp3xj24wb97ckllvgn82vsin9kvhhj1459i"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix b/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix index ea3f26cd3155..f070dcb258e8 100644 --- a/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "agate-dbf"; - version = "0.2.0"; + version = "0.2.1"; propagatedBuildInputs = [ agate dbf dbfread ]; src = fetchPypi { inherit pname version; - sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6"; + sha256 = "0brprva3vjypb5r9lk6zy10jazp681rxsqxzhz2lr869ir4krj80"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix index b7855bee72dc..0afaa65e40c5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bitstring ifaddr ]; meta = with lib; { - homepage = http://github.com/frawau/aiolifx; + homepage = https://github.com/frawau/aiolifx; license = licenses.mit; description = "API for local communication with LIFX devices over a LAN with asyncio"; maintainers = with maintainers; [ netixx ]; diff --git a/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix b/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix new file mode 100644 index 000000000000..55120ad58038 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pbr +, aiohttp +, ddt +, asynctest +, pytest +}: + +buildPythonPackage rec { + pname = "aioresponses"; + version = "0.6.0"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ii1jiwb8qa2y8cqa1zqn7mjax9l8bpf16k4clv616mxw1l0bvs6"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + asynctest + ddt + pytest + ]; + + # Skip a test which makes requests to httpbin.org + checkPhase = '' + pytest -k "not test_address_as_instance_of_url_combined_with_pass_through" + ''; + + meta = { + description = "A helper to mock/fake web requests in python aiohttp package"; + homepage = https://github.com/pnuckowski/aioresponses; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rvl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix index 4f6602395300..76b5d97e2813 100644 --- a/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "4.1.0"; + version = "6.0.0"; meta = with stdenv.lib; { description = "Parses ISO 8601 strings."; @@ -17,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1x49k287ky1spv3msc9fwmc7ydyw6rlcr14nslgcmpjfn3pgzh03"; + sha256 = "1bylfskk08ahyma25i8w3mcd0kywpxqx6icv5p7m1z0i8srak9mq"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/annexremote/default.nix b/nixpkgs/pkgs/development/python-modules/annexremote/default.nix new file mode 100644 index 000000000000..f07f05b98843 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/annexremote/default.nix @@ -0,0 +1,34 @@ +{ lib +, isPy3k +, buildPythonPackage +, fetchFromGitHub +, future +, mock +, nose +}: + +buildPythonPackage rec { + pname = "annexremote"; + version = "1.3.1"; + + # use fetchFromGitHub instead of fetchPypi because the test suite of + # the package is not included into the PyPI tarball + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Lykos153"; + repo = "AnnexRemote"; + sha256 = "13ny7h41430pi9393dw3qgwxvzcxacapjsw0d3vjm7lc4h566alq"; + }; + + propagatedBuildInputs = [ future ]; + + checkInputs = [ nose ] ++ lib.optional (!isPy3k) mock; + checkPhase = "nosetests -v"; + + meta = with lib; { + description = "Helper module to easily develop git-annex remotes"; + homepage = https://github.com/Lykos153/AnnexRemote; + license = licenses.gpl3; + maintainers = with maintainers; [ montag451 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index fbe9589478c3..2ea96b93772e 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "9c2fc02bd22ac831138bfd2241e1664d7700bbb2c61f96b8b1f2d83ab4ea59a7"; + sha256 = "1zys65vq0jqyzdmchaydzsvlf0ysw2y58sapjq6wzc6yw6pdyigz"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/argh/default.nix b/nixpkgs/pkgs/development/python-modules/argh/default.nix index ef21a3f871db..8c6afb099f91 100644 --- a/nixpkgs/pkgs/development/python-modules/argh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/argh/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/neithere/argh/; + homepage = https://github.com/neithere/argh/; description = "An unobtrusive argparse wrapper with natural syntax"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 8906b72dcca0..60b21322b870 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , numpy +, pandas +, pyarrow , pytestrunner , pytest , h5py @@ -9,15 +11,15 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.8.7"; + version = "0.8.14"; src = fetchPypi { inherit pname version; - sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp"; + sha256 = "1mf8ddxn7bdlhic5xcd8nvskp3cmyv8vk2hz52hb7faixsgvgj18"; }; nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pytest h5py ]; + checkInputs = [ pandas pyarrow pytest h5py ]; propagatedBuildInputs = [ numpy ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix new file mode 100644 index 000000000000..16f5e19b7866 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, pytest +, mock +, parameterized +, isPy35 +}: + +buildPythonPackage rec { + pname = "aws-lambda-builders"; + version = "0.2.1"; + + # No tests available in PyPI tarball + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-lambda-builders"; + rev = "v${version}"; + sha256 = "1pbi6572q1nqs2wd7jx9d5vgf3rqdsqlaz4v8fqvl23wfb2c4vpd"; + }; + + # Package is not compatible with Python 3.5 + disabled = isPy35; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytest + mock + parameterized + ]; + + checkPhase = '' + export PATH=$out/bin:$PATH + pytest tests/functional + ''; + + meta = with lib; { + homepage = https://github.com/awslabs/aws-lambda-builders; + description = "A tool to compile, build and package AWS Lambda functions"; + longDescription = '' + Lambda Builders is a Python library to compile, build and package + AWS Lambda functions for several runtimes & frameworks. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 4dd4c692490e..12d10d8ac477 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -15,12 +15,6 @@ buildPythonPackage rec { sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f"; }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py - ''; - postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix index 9a84a7326850..2531c440daf4 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "65ebe2e54460566c2077c6b3773a2a0623eabc7b95602010cb51b84077087fda"; + sha256 = "0b15dzy75fml994gdfmaw5qcyij15gvh968mk3hg94d1wxwai1zi"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix index 322f9c6d793f..ce5d15c212a1 100644 --- a/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports_csv/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "backports.csv"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "bed884eeb967c8d6f517dfcf672914324180f1e9ceeb0376fde2c4c32fd7008d"; + sha256 = "0vdx5jlhs91iizc8j8l8811nqprwvdx39pgkdc82w2qkfgzxyxqj"; }; propagatedBuildInputs = [ future ]; diff --git a/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/nixpkgs/pkgs/development/python-modules/braintree/default.nix index 5e24a880e759..6604901a512f 100644 --- a/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "3.51.0"; + version = "3.52.0"; src = fetchPypi { inherit pname version; - sha256 = "1aavalwxcpql416f0n6wxq2h5jpvbx5jq4y4nz2wsppgjbsxylcc"; + sha256 = "0p8qmmc3fmjz7i5yjyxx9sxkhfq38kr0mws4dh3k5kxl6an02mp4"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/broadlink/default.nix b/nixpkgs/pkgs/development/python-modules/broadlink/default.nix index d1ecddded776..4633cb1ecfbf 100644 --- a/nixpkgs/pkgs/development/python-modules/broadlink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/broadlink/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for controlling Broadlink IR controllers"; - homepage = http://github.com/mjg59/python-broadlink; + homepage = https://github.com/mjg59/python-broadlink; license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix index 17d442e4527e..beee82950496 100644 --- a/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix @@ -13,6 +13,15 @@ buildPythonPackage rec { sha256 = "66f333ef5dc79fdfbd3bbe98adc791b1f854e0461067d202fa7b15de66d517ec"; }; + patches = [ + # fix isort-check + (fetchpatch { + url = https://github.com/Kozea/CairoSVG/commit/b2534b0fc80b9f24a2bff2c938ac5da73ff1e478.patch; + excludes = [ "test_non_regression/__init__.py" ]; + sha256 = "1bms75dd0fd978yhlr0k565zq45lzxf0vkihryb7gcwnd42bl6yf"; + }) + ]; + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; diff --git a/nixpkgs/pkgs/development/python-modules/casttube/default.nix b/nixpkgs/pkgs/development/python-modules/casttube/default.nix index 60d9fe2aef1a..5d3b80aeb168 100644 --- a/nixpkgs/pkgs/development/python-modules/casttube/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casttube/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interact with the Youtube Chromecast api"; - homepage = http://github.com/ur1katz/casttube; + homepage = https://github.com/ur1katz/casttube; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/chevron/default.nix b/nixpkgs/pkgs/development/python-modules/chevron/default.nix new file mode 100644 index 000000000000..c6338fce56bc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/chevron/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "chevron"; + version = "0.13.1"; + + # No tests available in the PyPI tarball + src = fetchFromGitHub { + owner = "noahmorrison"; + repo = "chevron"; + rev = "0.13.1"; + sha256 = "0l1ik8dvi6bgyb3ym0w4ii9dh25nzy0x4yawf4zbcyvvcb6af470"; + }; + + checkPhase = '' + ${python.interpreter} test_spec.py + ''; + + meta = with lib; { + homepage = https://github.com/noahmorrison/chevron; + description = "A python implementation of the mustache templating language"; + license = licenses.mit; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/click-completion/default.nix b/nixpkgs/pkgs/development/python-modules/click-completion/default.nix index 0dd5e22abf57..2921970ff28a 100644 --- a/nixpkgs/pkgs/development/python-modules/click-completion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-completion/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "click-completion"; - version = "0.5.0"; + version = "0.5.1"; disabled = (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "0k3chs301cnyq2jfl12lih5fa6r06nmxmbyp9dwvjm09v8f2c03n"; + sha256 = "1ysn6kzv3fgakn0y06i3cxynd8iaybarrygabk9a0pp2spn2w1vq"; }; propagatedBuildInputs = [ click jinja2 shellingham six ]; diff --git a/nixpkgs/pkgs/development/python-modules/cntk/default.nix b/nixpkgs/pkgs/development/python-modules/cntk/default.nix index 2bcb7165ca1c..cfc16063cf73 100644 --- a/nixpkgs/pkgs/development/python-modules/cntk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cntk/default.nix @@ -10,9 +10,10 @@ }: buildPythonPackage rec { - inherit (pkgs.cntk) name version src meta; + inherit (pkgs.cntk) name version src; - buildInputs = [ pkgs.cntk pkgs.swig pkgs.openmpi ]; + nativeBuildInputs = [ pkgs.swig pkgs.openmpi ]; + buildInputs = [ pkgs.cntk pkgs.openmpi ]; propagatedBuildInputs = [ numpy scipy enum34 protobuf pip ]; CNTK_LIB_PATH = "${pkgs.cntk}/lib"; @@ -35,4 +36,12 @@ buildPythonPackage rec { cd $NIX_BUILD_TOP ${python.interpreter} -c "import cntk" ''; + + meta = { + inherit (pkgs.cntk.meta) homepage description license maintainers; + # broken in CNTK 2.4 starting with python-3.7 + # ("ImportError: cannot import name 'GenericMeta' from 'typing'") + broken = stdenv.lib.versionAtLeast python.version "3.7"; + + }; } diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index 1e1248591f0c..a4921b85e370 100644 --- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.0.3"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0mghbmilmy34xp1d50xdx76sijqxmpkm2bcgx2v1mdji2ff7n0yc"; + sha256 = "0bm5jvmwqp48n6b385mw4v7wsws9zk62mgb7xf5ymiq7k6wgvxli"; }; # This differs slightly from the default python installPhase in that it pip-installs diff --git a/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix index ec241fb9f6c1..73705d9982aa 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/dask/dask-glm/; + homepage = https://github.com/dask/dask-glm/; description = "Generalized Linear Models with Dask"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/datrie/default.nix b/nixpkgs/pkgs/development/python-modules/datrie/default.nix index eb654c650778..7cb30937e0db 100644 --- a/nixpkgs/pkgs/development/python-modules/datrie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datrie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch , cython, pytest, pytestrunner, hypothesis }: buildPythonPackage rec { @@ -10,6 +10,14 @@ buildPythonPackage rec { sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; }; + patches = [ + # fix tests against recent hypothesis + (fetchpatch { + url = "https://github.com/pytries/datrie/commit/9b24b4c02783cdb703ac3f6c6d7d881db93166e0.diff"; + sha256 = "1ql7jcf57q3x3fcbddl26y9kmnbnj2dv6ga8mwq94l4a3213j2iy"; + }) + ]; + nativeBuildInputs = [ cython ]; buildInputs = [ pytest pytestrunner hypothesis ]; diff --git a/nixpkgs/pkgs/development/python-modules/dbf/default.nix b/nixpkgs/pkgs/development/python-modules/dbf/default.nix index 5a27e2b746fd..2ba308596d49 100644 --- a/nixpkgs/pkgs/development/python-modules/dbf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.97.11"; + version = "0.98.0"; src = fetchPypi { inherit pname version; - sha256 = "8aa5a73d8b140aa3c511a3b5b204a67d391962e90c66b380dd048fcae6ddbb68"; + sha256 = "089h98gpjf9ffxzbkbd9k9wd8n3s7g0nhfpn3rf44h51hllgqxxb"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; diff --git a/nixpkgs/pkgs/development/python-modules/dbus/default.nix b/nixpkgs/pkgs/development/python-modules/dbus/default.nix index 13465f1af2c8..f686f067e7ad 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbus/default.nix @@ -6,12 +6,16 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa version = "1.2.4"; format = "other"; + outputs = [ "out" "dev" "doc" ]; + src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz"; sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2"; }; - postPatch = "patchShebangs ."; + patches = [ + ./fix-includedir.patch + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] diff --git a/nixpkgs/pkgs/development/python-modules/dbus/fix-includedir.patch b/nixpkgs/pkgs/development/python-modules/dbus/fix-includedir.patch new file mode 100644 index 000000000000..e3bb0682b5c4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbus/fix-includedir.patch @@ -0,0 +1,8 @@ +--- a/dbus-python.pc.in ++++ b/dbus-python.pc.in +@@ -9,4 +9,4 @@ + Description: Python bindings for D-Bus + Requires: dbus-1 >= 1.0 + Version: @VERSION@ +-Cflags: -I${includedir} ++Cflags: -I${includedir}/dbus-1.0 diff --git a/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix b/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix index 775660b8304c..331aa46acd0b 100644 --- a/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-allauth/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "0.36.0"; + version = "0.38.0"; # no tests on PyPI src = fetchFromGitHub { owner = "pennersr"; repo = pname; rev = version; - sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan"; + sha256 = "17ch8lvq47arkgvwz2fdc89lwvgphsnmjs6wwf5g1m50xclljwmq"; }; propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix index 4cff6f2a69b0..6b8aac33139c 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/ghickman/django-cache-url; + homepage = https://github.com/ghickman/django-cache-url; description = "Use Cache URLs in your Django application"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix index d25d9e79947b..82895f76473b 100644 --- a/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-discover-runner/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/jezdez/django-discover-runner; + homepage = https://github.com/jezdez/django-discover-runner; description = "A Django test runner based on unittest2's test discovery"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix b/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix index 9887580b0fdd..68fa0dce6159 100644 --- a/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "URLs with authentication tokens for automatic login"; - homepage = http://github.com/aaugustin/django-sesame; + homepage = https://github.com/aaugustin/django-sesame; license = licenses.bsd3; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/django/2_1.nix b/nixpkgs/pkgs/development/python-modules/django/2_1.nix index e15f2213f142..f8aa54dfe4cf 100644 --- a/nixpkgs/pkgs/development/python-modules/django/2_1.nix +++ b/nixpkgs/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.7"; + version = "2.1.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963"; + sha256 = "1r1y3d3gz5v1kyfs77dxbcm5my27q8dpcmj821b6yl8x22281cpk"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix b/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix new file mode 100644 index 000000000000..718084364179 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix @@ -0,0 +1,85 @@ +{ lib +, fetchFromGitHub +, buildBazelPackage +, buildPythonPackage +, git +, python +, six +, absl-py +, semantic-version +, contextlib2 +, wrapt +, tensorflow +, tensorflow-probability +}: + +let + version = "1.30"; + + # first build all binaries and generate setup.py using bazel + bazel-build = buildBazelPackage rec { + name = "dm-sonnet-bazel-${version}"; + + src = fetchFromGitHub { + owner = "deepmind"; + repo = "sonnet"; + rev = "v${version}"; + sha256 = "1dli4a4arx2gmb4p676pfibvnpag9f13znisrk9381g7xpqqmaw6"; + }; + + nativeBuildInputs = [ + git # needed to fetch the bazel deps (protobuf in particular) + ]; + + # see https://github.com/deepmind/sonnet/blob/master/docs/INSTALL.md + bazelTarget = ":install"; + + fetchAttrs = { + sha256 = "1qwq6xp6gdmy8f0k96q3nsgqs56adrbgq39g5smwik6griwfx9mr"; + }; + + buildAttrs = { + preBuild = '' + patchShebangs . + ''; + + installPhase = '' + # do not generate a wheel, instead just copy the generated files to $out to be installed by buildPythonPackage + sed -i 's,.*bdist_wheel.*,cp -rL . "$out"; exit 0,' bazel-bin/install + + # the target directory "dist" does not actually matter since we're not generating a wheel + bazel-bin/install dist + ''; + }; + }; + +# now use pip to install the package prepared by bazel +in buildPythonPackage rec { + pname = "dm-sonnet"; + inherit version; + + src = bazel-build; + + propagatedBuildInputs = [ + six + absl-py + semantic-version + contextlib2 + wrapt + tensorflow + tensorflow-probability + ]; + + # not sure how to properly run the real test suite -- through bazel? + checkPhase = '' + ${python.interpreter} -c "import sonnet" + ''; + + meta = with lib; { + description = "TensorFlow-based neural network library"; + homepage = https://sonnet.dev; + license = licenses.asl20; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/eyed3/default.nix b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix index 6f10e69c0ec7..16e94bd785f0 100644 --- a/nixpkgs/pkgs/development/python-modules/eyed3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/eyed3/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "0.8.9"; + version = "0.8.10"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "b6bb626566f2949da409d7a871576271e2d6254dfb3d416b21713dabc4b6b00f"; + sha256 = "1jb22n1jczxgbpcnfiw12r8dcs74556g1d09mzms44f52kgs7lgc"; }; # https://github.com/nicfit/eyeD3/pull/284 diff --git a/nixpkgs/pkgs/development/python-modules/favicon/default.nix b/nixpkgs/pkgs/development/python-modules/favicon/default.nix index e4675274c09f..019f4be91c82 100644 --- a/nixpkgs/pkgs/development/python-modules/favicon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/favicon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Find a website's favicon"; - homepage = http://github.com/scottwernervt/favicon; + homepage = https://github.com/scottwernervt/favicon; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/fints/default.nix b/nixpkgs/pkgs/development/python-modules/fints/default.nix index 5ac7ccd1adc5..4d9d250815a9 100644 --- a/nixpkgs/pkgs/development/python-modules/fints/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fints/default.nix @@ -2,13 +2,13 @@ requests, mt-940, sepaxml, bleach, isPy3k }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.1"; pname = "fints"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "27427b5e6536b592f964c464a8f0c75c5725176604e9d0f208772a45918d9b78"; + sha256 = "06p6p0xxw0n10hmf7z4k1l29fya0sja433s6lasjr1bal5asdhaq"; }; propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index ff6f0716d714..b8d203d515a9 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.4"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "aec9ab2e3513c9503ec123b1a8573bee55fc6a66e2ac07088c3376bf6738a424"; + sha256 = "0gpvdrayam4qvpqvz0911nlyvf7ib3slsyml52qx172vhpldycgs"; }; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix b/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix index c523d7b963c8..92e4542bfef7 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.9.0"; + version = "0.10.0"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "db7aff4130eb99fd05ab78fd2e2c58843ba0f208899aeb1c14aff9cd98ae8c80"; + sha256 = "1xvk289628l3pp56gidwhmd54cgdczpsxhxfw0bfcsd120k1svfv"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix index c2f7caf1b818..b97fc2430be7 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO integration for Flask applications"; - homepage = http://github.com/miguelgrinberg/Flask-SocketIO/; + homepage = https://github.com/miguelgrinberg/Flask-SocketIO/; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/flexmock/default.nix b/nixpkgs/pkgs/development/python-modules/flexmock/default.nix index f1a0efc07139..59dd32053ca6 100644 --- a/nixpkgs/pkgs/development/python-modules/flexmock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "031c624pdqm7cc0xh4yz5k69gqxn2bbrjz13s17684q5shn0ik21"; + sha256 = "0b6qw3grhgx58kxlkj7mdma7xdvlj02zabvcf7w2qifnfjwwwcsh"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/fs/default.nix b/nixpkgs/pkgs/development/python-modules/fs/default.nix index cdbdcf7d16e2..d53556f0d07a 100644 --- a/nixpkgs/pkgs/development/python-modules/fs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fs/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.3.1"; + version = "2.4.4"; src = fetchPypi { inherit pname version; - sha256 = "6c3f79a16dfcbf8a8f437f81dd8afaa3741285d9369574c48e1d27e40b0c980e"; + sha256 = "0krf632nz24v2da7g9xivq6l2w9za3vph4vix7mm1k3byzwjnawk"; }; buildInputs = [ glibcLocales ]; diff --git a/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix b/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix index 9e49147315b5..c9b49fee4cb6 100644 --- a/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix +++ b/nixpkgs/pkgs/development/python-modules/future-fstrings/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "future-fstrings"; - version = "0.4.5"; + version = "1.0.0"; src = fetchPypi { inherit version; pname = "future_fstrings"; - sha256 = "891c5d5f073b3e3ff686bebde0a4c45c479065f45c8cbd6de19323d5a50738a8"; + sha256 = "1pra33in6rinrcs5wvdb1rbxmx223j93ahdwhzwgf7wyfsnjda98"; }; # No tests included in Pypi archive diff --git a/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/nixpkgs/pkgs/development/python-modules/genanki/default.nix index 45906c3c434d..af2f99289a30 100644 --- a/nixpkgs/pkgs/development/python-modules/genanki/default.nix +++ b/nixpkgs/pkgs/development/python-modules/genanki/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/kerrickstaley/genanki; + homepage = https://github.com/kerrickstaley/genanki; description = "Generate Anki decks programmatically"; license = licenses.mit; maintainers = with maintainers; [ teto ]; diff --git a/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/nixpkgs/pkgs/development/python-modules/gensim/default.nix index 8c7b96e66dda..2bd1bfce6f95 100644 --- a/nixpkgs/pkgs/development/python-modules/gensim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gensim/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.7.1"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "ed845ac585f724ae1f40fdb517ed8ade822531f9bbcd1be4a599c2e86aff48a8"; + sha256 = "1la4y935sdah8ywa7krwy80hcl4n2k8cdx4ncy3dg3y2mdg3vq24"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index fbbcaa82dd2a..eebf2794d4b2 100644 --- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "7d66d01af82d22bc37d3ebb1e73713b87ac5e116b3bc82ea4ec0584bbaa89f89"; + sha256 = "0bzm9zgz2gfy6smlvdgxnf6y14rfhr4vj3mjfwlxdx2vcfc95hqa"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix b/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix index b690faccf069..967fc1c57457 100644 --- a/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gnureadline/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The standard Python readline extension statically linked against the GNU readline library"; - homepage = http://github.com/ludwigschwardt/python-gnureadline; + homepage = https://github.com/ludwigschwardt/python-gnureadline; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix b/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix new file mode 100644 index 000000000000..58aa6c84ade3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/graph_nets/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tensorflow +, absl-py +, dm-sonnet +, networkx +, numpy +, setuptools +, six +, future +}: + +buildPythonPackage rec { + pname = "graph_nets"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "15cbs9smmgqz2n9mnlzdbqj3iv9iw179d2g0f9lnimdy7xl4jqdf"; + }; + + buildInputs = []; + + postPatch = '' + # https://github.com/deepmind/graph_nets/issues/63 + sed -i 's/dm-sonnet==1.23/dm-sonnet/' setup.py + ''; + + propagatedBuildInputs = [ + tensorflow + absl-py + dm-sonnet + networkx + numpy + setuptools + six + future + ]; + + meta = with lib; { + description = "Build Graph Nets in Tensorflow"; + homepage = https://github.com/deepmind/graph_nets; + license = licenses.asl20; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index 3ecc0b3294fa..9d8814e65313 100644 --- a/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -1,17 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib, darwin -, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig }: +{ stdenv, buildPythonPackage, fetchFromGitHub, lib, darwin +, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig +, cython}: with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; version = "1.18.0"; - src = fetchPypi { - inherit pname version; - sha256 = "abe825aa49e6239d5edf4e222c44170d2c7f6f4b1fd5286b4756a62d8067e112"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0cilbhk35gv46mk40jl5f3iqa94x14qyxbavpfq0kh0rld82nx4m"; }; - nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ cython pkgconfig ] + ++ optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy27 || isPy34) [ enum34 ] diff --git a/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/nixpkgs/pkgs/development/python-modules/gsd/default.nix index c0ad2dc3ac9b..07fca0d2404c 100644 --- a/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.6.1"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "845a7fe4fd9776cda1bd66112dc2d788cb5ccf8333a205bd4a32807e57d3c875"; + sha256 = "18icw5cbsq4gnhx4vsjwhxzcx11mbnz6kmwgrylkf82m7m1v2921"; }; propagatedBuildInputs = [ numpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/nixpkgs/pkgs/development/python-modules/h5py/default.nix index e9d14e56fd47..23e659ea7ae6 100644 --- a/nixpkgs/pkgs/development/python-modules/h5py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/h5py/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, isPy27, python, buildPythonPackage -, numpy, hdf5, cython, six, pkgconfig, unittest2 +, numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch , mpi4py ? null, openssh }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -18,6 +18,12 @@ in buildPythonPackage rec { sha256 = "9d41ca62daf36d6b6515ab8765e4c8c4388ee18e2a665701fef2b41563821002"; }; + patches = [ ( fetchpatch { + # Skip a test that probes an already fixed bug in HDF5 (upstream patch) + url = "https://github.com/h5py/h5py/commit/141eafa531c6c09a06efe6a694251a1eea84908d.patch"; + sha256 = "0lmdn0gznr7gadx7qkxybl945fvwk6r0cc4lg3ylpf8ril1975h8"; + })]; + configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; postConfigure = '' @@ -30,7 +36,7 @@ in buildPythonPackage rec { preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - checkInputs = optional isPy27 unittest2; + checkInputs = optional isPy27 unittest2 ++ [ openssh ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hdf5 cython ] ++ optional mpiSupport mpi; diff --git a/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix index 76d5921487e7..3a573f69c700 100644 --- a/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/daleroberts/hdmedians; + homepage = https://github.com/daleroberts/hdmedians; description = "High-dimensional medians"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix index 3463f471c5eb..ad25b8977c05 100644 --- a/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hoomd-blue/default.nix @@ -10,7 +10,6 @@ let components = { hpmc = true; md = true; metal = true; - testing = false; }; onOffBool = b: if b then "ON" else "OFF"; withMPI = (mpi != null); @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { "-DBUILD_HPMC=${onOffBool components.hpmc}" "-DBUILD_MD=${onOffBool components.md}" "-DBUILD_METAL=${onOffBool components.metal}" - "-DBUILD_TESTING=${onOffBool components.testing}" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix b/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix new file mode 100644 index 000000000000..bef32f947c37 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/humanfriendly/default.nix @@ -0,0 +1,30 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchPypi +, monotonic +}: + +buildPythonPackage rec { + pname = "humanfriendly"; + version = "4.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "33ee8ceb63f1db61cce8b5c800c531e1a61023ac5488ccde2ba574a85be00a85"; + }; + + propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; + + # humanfriendly tests depends on coloredlogs which itself depends on + # humanfriendly. This lead to infinite recursion when trying to + # build this package so we have to disable the test suite :( + doCheck = false; + + meta = with lib; { + description = "Human friendly output for text interfaces using Python"; + homepage = https://humanfriendly.readthedocs.io/; + license = licenses.mit; + maintainers = with maintainers; [ montag451 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index 3575ee039633..d1fadad00d0f 100644 --- a/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.88.3"; + version = "4.7.3"; pname = "hypothesis"; # Use github tarballs that includes tests diff --git a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index 99edea703c60..657a8178440f 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.2.1"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1dp3fakzp0fqdajf6xsfmisdwj1avk4lvxjmw5k9wkhdbpi6vnbm"; + sha256 = "0hriag4d4gx4bsqisiz29478sj54b215p6xzmshlw6x9af4z5vxg"; }; # ImportError: No module named tests diff --git a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix index 3203963b29da..f31b9013d94b 100644 --- a/nixpkgs/pkgs/development/python-modules/ipdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipdb/default.nix @@ -7,17 +7,20 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.8.1"; + version = "0.12"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "1763d1564113f5eb89df77879a8d3213273c4d7ff93dcb37a3070cdf0c34fd7c"; + sha256 = "dce2112557edfe759742ca2d0fee35c59c97b0cc7a05398b791079d78f1519ce"; }; propagatedBuildInputs = [ ipython ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = with stdenv.lib; { homepage = https://github.com/gotcha/ipdb; description = "IPython-enabled pdb"; diff --git a/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix index 402361a6c74a..b092a9fa2aec 100644 --- a/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipdbplugin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ipython ]; meta = with stdenv.lib; { - homepage = http://github.com/flavioamieiro/nose-ipdb/tree/master; + homepage = https://github.com/flavioamieiro/nose-ipdb/tree/master; description = "Nose plugin to use iPdb instead of Pdb when tests fail"; license = licenses.lgpl2; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/j2cli/default.nix b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix index 13af20ba79b9..163dbba07f79 100644 --- a/nixpkgs/pkgs/development/python-modules/j2cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/j2cli/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "j2cli"; - version = "0.3.5.post1"; + version = "0.3.6.post1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c0439a79308aae320bfd01d82b56893b02fe461195d8b69b438ba9b333075642"; + sha256 = "1j8s09b75w041b2lawjz341ri997n9fnxbd2ipm9czxj6fhj8hi2"; }; buildInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix index cbf966785e17..59d8538bb1e5 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "4.4.1"; + version = "4.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae"; + sha256 = "0zxx8ffk5ycapy2d41dfgzskl5jfwjc10hsd91jsrax5alkhrh7x"; }; patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; diff --git a/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix index 9b2d3a5b832e..2ca26ad65e8c 100644 --- a/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,18 +1,26 @@ -{ lib, fetchPypi, buildPythonApplication, EditorConfig, pytest, six }: +{ lib, fetchPypi, buildPythonApplication, EditorConfig, fetchpatch, pytest, six }: buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.8.9"; + version = "1.9.1"; - propagatedBuildInputs = [ six ]; - - buildInputs = [ EditorConfig pytest ]; + propagatedBuildInputs = [ six EditorConfig ]; + checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "7d02baa9b0459bf9c5407c1b99ad5566de04a3b664b18a58ac64f52832034204"; + sha256 = "0q8ld072dkccssagjxyvc9633fb6ynflvz70924phgp3zxmim960"; }; + patches = [ + (fetchpatch { + url = "https://github.com/beautify-web/js-beautify/commit/78e35a11cbb805fc044241d6465800ee2bd57ebc.patch"; + sha256 = "1ah7nshk96yljy37i20v4fga834dix9cdbhkdc3flfm4904n4523"; + }) + ]; + + patchFlags = [ "-p2" ]; + meta = with lib; { homepage = "http://jsbeautifier.org"; description = "JavaScript unobfuscator and beautifier."; diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index 9d111c3eb6fa..5fa8c52a97a8 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "72d916a73957a880cdb885def6d8664a6d1b2760ef5dca5ad665aa1e8d1bb783"; + sha256 = "13b728z5ls0g3p1gq5hvfqg7302clxna5grvgjfwbfzss0avlpjc"; }; checkInputs = [ requests pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix index 0f257fb13c20..e68bd1615fa9 100644 --- a/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.4.5"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "1p9sr9vl96xz8qrgdrjiql9qkch2qx29pkq7igk28clgc6zbn510"; + sha256 = "01jlklfgvggkyq5yj0zhk46xv91jhha2cshq8kbxv9f7043c201i"; }; checkInputs = [ pytest six mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/keepkey/default.nix b/nixpkgs/pkgs/development/python-modules/keepkey/default.nix index 551614409db4..bbe72befb6d2 100644 --- a/nixpkgs/pkgs/development/python-modules/keepkey/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "1778c9vabn9a7b7lbirwclswnqmzqm00slklvnhqacbbdf4rp417"; + sha256 = "0jnkh1nin1lwnx32ak6sv8gzmpnkvcy6vm23wzm1ymzfndxk6rnm"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix index 6fe52f885743..fc5b0b2fe045 100644 --- a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix @@ -1,20 +1,12 @@ { stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pyasn1 }: buildPythonPackage rec { - version = "2.5.2"; pname = "ldap3"; + version = "2.6"; -## This should work, but 2.5.2 has a weird tarball with empty source files -## where upstream repository has non-empty ones -# src = fetchPypi { -# inherit pname version; -# sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz"; -# }; - src = fetchFromGitHub { - owner = "cannatag"; - repo = pname; - rev = "v${version}"; - sha256 = "0p5l4bhy6j2nvvlxz5zvznbaqb72x791v9la2jr2wpwr60mzz9hw"; + src = fetchPypi { + inherit pname version; + sha256 = "1f0v82584b7gkzrnnnl4fc88w4i73x7cxqbzy0r0bknm33yfwcq5"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/nixpkgs/pkgs/development/python-modules/lektor/default.nix b/nixpkgs/pkgs/development/python-modules/lektor/default.nix index 6eb84043d784..0fe3a11ae261 100644 --- a/nixpkgs/pkgs/development/python-modules/lektor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lektor/default.nix @@ -1,6 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , click , watchdog , exifread @@ -12,35 +12,47 @@ , flask , pyopenssl , ndg-httpsclient -, pkgs +, pytest +, pytestcov +, pytest-mock +, pytest-pylint +, pytest-click +, isPy27 +, functools32 }: buildPythonPackage rec { pname = "lektor"; - version = "2.3"; + version = "3.1.3"; - src = fetchgit { - url = "https://github.com/lektor/lektor"; - rev = "refs/tags/${version}"; - sha256 = "1n0ylh1sbpvi9li3g6a7j7m28njfibn10y6s2gayjxwm6fpphqxy"; + src = fetchFromGitHub { + owner = "lektor"; + repo = "lektor"; + rev = version; + sha256 = "16qw68rz5q77w84lwyhjpfd3bm4mfrhcjrnxwwnz3vmi610h68hx"; }; - buildInputs = [ pkgs.glibcLocales ]; propagatedBuildInputs = [ click watchdog exifread requests mistune inifile Babel jinja2 flask pyopenssl ndg-httpsclient + ] ++ lib.optionals isPy27 [ functools32 ]; + + checkInputs = [ + pytest pytestcov pytest-mock pytest-pylint pytest-click ]; - LC_ALL="en_US.UTF-8"; + checkPhase = '' + pytest + ''; - # No tests included in archive + # many errors -- tests assume inside of git repo, linting errors 13/317 fail doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A static content management system"; homepage = "https://www.getlektor.com/"; license = licenses.bsd0; - maintainers = with maintainers; [ vozz ]; + maintainers = with maintainers; [ vozz costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index cce640cce366..604f9bad3c36 100644 --- a/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2018.12.19"; + version = "2019.02.23"; src = fetchPypi { inherit pname version; - sha256 = "6034e324b3a455f042975006a35dd33fa9175115c7302cb53ca9a646f6594bfc"; + sha256 = "0rlv9l1w80n2jpw2yy1g6x83rvldwzkmkafdalxkar32czbi2xv4"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix b/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix index 42162d62aac4..1f06f7f250a9 100644 --- a/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mail-parser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.9.2"; + version = "3.9.3"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0f515a8r3qz3i2cm4lvs5aw59193jl9mk7bmaj9545n4miyar4nr"; + sha256 = "0v6hgsz6yvp6csgx4y440ksqj24rdsd06vyfqcihiy3dfvp9229y"; }; LC_ALL = "en_US.utf-8"; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 8582f8a29f92..0d8382f9b6ff 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.0"; + version = "0.16.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c99d51bb4dfca7e1b35ae12ed96746c0df0464b7eb95bba6835a1231e6ea286c"; + sha256 = "0dv9imc41xg0k9xv0fb8ygfip7iznsnf8g33z74zz2bf1dbhricr"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix index fa6ea72129f3..c6e7089cdd9b 100644 --- a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.0"; + version = "0.4.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "15g58z3hy1pgi5sygpif28jyqj79iz4vw2mh5nxdydl4w20micvf"; + sha256 = "1fl6zb36cqsdiay1mn3nmjv5jw4jys5av7hb1y9995qlycg0hm49"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index d3535589911c..5984f2bcb7cf 100644 --- a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -2,31 +2,17 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1mzgd26dfv4vwbci8gq77ss9f0x26i9aqzq9b9vs9ndxhlnv0mxl"; + sha256 = "0ld8rjmsjr0dklvj2g1gr3ax32sdq0xjxyh0cspknc1i36waajb5"; }; passthru = { inherit mpi; }; - patches = [ - (fetchpatch { - # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch) - url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; - sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; - }) - (fetchpatch { - # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch) - url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw"; - sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q"; - }) - - ]; - postPatch = '' substituteInPlace test/test_spawn.py --replace \ "unittest.skipMPI('openmpi(<3.0.0)')" \ diff --git a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index f592edf2cd90..a274da71ce40 100644 --- a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.4.2"; + version = "1.5.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0c0sklgrmv15ygliin8qq0hp7vanmbi74m6zpi0r1ksr0hssyd5r"; + sha256 = "1nf0cjja94zsfbp8dw83b36c4cmz9v4b0h51yh8g3q2z9w8d2n62"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix new file mode 100644 index 000000000000..9bb4a3e41f32 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jinja2 +, setuptools +, isPy27 +}: + +buildPythonPackage rec { + pname = "nixpkgs-pytools"; + version = "1.0.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "6aaf1e990be639a0d01afb454756606f3111dd8c596b6e848d4a0cec019168d0"; + }; + + propagatedBuildInputs = [ + jinja2 + setuptools + ]; + + # tests require network .. + doCheck = false; + + meta = with lib; { + description = "Tools for removing the tedious nature of creating nixpkgs derivations"; + homepage = https://github.com/nix-community/nixpkgs-pytools; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix index 71c142436d9f..ea0a359a49c3 100644 --- a/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nixpkgs/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, fetchpatch , fetchPypi , pbr , pythonix @@ -8,12 +9,12 @@ buildPythonPackage rec { pname = "nixpkgs"; - version = "0.2.2"; + version = "0.2.3"; disabled = ! pythonAtLeast "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj"; + sha256 = "12ycbv31g4qv14aq6hfb85hhx026lgvzqfsrkpzb64na0c1yjcvn"; }; buildInputs = [ pbr ]; @@ -21,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; - homepage = http://github.com/t184256/nixpkgs-python-importer; + homepage = https://github.com/t184256/nixpkgs-python-importer; license = licenses.mit; maintainers = with maintainers; [ t184256 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/nltk/default.nix b/nixpkgs/pkgs/development/python-modules/nltk/default.nix index 56edc44bce71..9ae4f00b495b 100644 --- a/nixpkgs/pkgs/development/python-modules/nltk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nltk/default.nix @@ -1,17 +1,25 @@ -{ fetchurl, buildPythonPackage, lib, six, pythonAtLeast, pythonOlder }: +{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k, fetchpatch }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.4"; pname = "nltk"; - src = fetchurl { - url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; - sha256 = "2661f9971d983db314bbebd51ba770811a362c6597fd0f303bb1d3beadcb4834"; + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "286f6797204ffdb52525a1d21ec0a221ec68b8e3fa4f2d25f412ac8e63c70e8d"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch; - disabled = pythonOlder "2.7" || pythonOlder "3.4" && (pythonAtLeast "3.0"); + # TODO: remove patch during update to new version + patches = [ + (fetchpatch { + url = https://github.com/nltk/nltk/commit/3966111cbf2f35fb86082b2f12acd90d75e9b8bb.patch; + includes = [ "setup.py" ]; + sha256 = "1sxafnvf6nzv6d996xc1rys06x62s36swgpfqhsyh6l1lj7y38jw"; + }) + ]; # Tests require some data, the downloading of which is impure. It would # probably make sense to make the data another derivation, but then feeding diff --git a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index ec68cb54afe3..b586a36aa88a 100644 --- a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -13,13 +13,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.1.1"; + version = "0.6.2"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "0dlhbgn90nj110kmylyrzxd301611g63ynbpm5dfsb09s9c569zm"; + sha256 = "04qmk1diplpvcdmk0clbsy0mdg04pkmgjjysz31g82v477if9m54"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 291a80a521b4..b74bbf581d83 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.16.1"; + version = "1.16.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288"; + sha256 = "1c4inssky16p6ab63n1gass6dik1dzxrp3y7kmxbdq6xg4w2wsbc"; }; disabled = isPyPy; diff --git a/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix b/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix index 634de3947a67..d3f47dad3ca2 100644 --- a/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pagerduty/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://github.com/samuel/python-pagerduty; + homepage = https://github.com/samuel/python-pagerduty; description = "Library for the PagerDuty service API"; license = licenses.bsd0; }; diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 1944e23f4b49..7416717585f1 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.24.1"; + version = "0.24.2"; src = fetchPypi { inherit pname version; - sha256 = "435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af"; + sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/nixpkgs/pkgs/tools/misc/papis/default.nix b/nixpkgs/pkgs/development/python-modules/papis/default.nix index f1589fc8c3b0..d9be946900cb 100644 --- a/nixpkgs/pkgs/tools/misc/papis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -1,8 +1,13 @@ -{ lib, fetchFromGitHub, fetchpatch -, python3, xdg_utils +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, xdg_utils +, requests, filetype, pyparsing, configparser, arxiv2bib +, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser +, pylibgen, click, python-slugify, habanero, isbnlib +, prompt_toolkit, pygments +#, optional, dependencies +, jinja2, whoosh, pytest }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "papis"; version = "0.8.2"; @@ -14,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb"; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 colorama bibtexparser pylibgen click python-slugify habanero isbnlib @@ -23,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { jinja2 whoosh ]; - checkInputs = (with python3.pkgs; [ + checkInputs = ([ pytest ]) ++ [ xdg_utils @@ -39,6 +44,6 @@ python3.pkgs.buildPythonApplication rec { description = "Powerful command-line document and bibliography manager"; homepage = http://papis.readthedocs.io/en/latest/; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.nico202 ]; + maintainers = with lib.maintainers; [ nico202 teto ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/nixpkgs/pkgs/development/python-modules/peewee/default.nix index 344f52d245f6..08c908e0aa59 100644 --- a/nixpkgs/pkgs/development/python-modules/peewee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.9.2"; + version = "3.9.3"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "0rmjr90555s1n6caqbncvilx6v30cksmcr4bjzylapsl3a5aw9aa"; + sha256 = "1frwwqkk0y1bkcm7bdzbyv2119vv640ncgs4d55zhbs70fxm2ylj"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index f0ac35feefdc..0aa89eb76203 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "724588ce982222a3020ad3de50e0912915815175771b35e59fe06fdf1db35415"; + sha256 = "1xb68q4rdi0is22cwvrfk1xwg6yngdxcvmjpdlkgmbdxf3y1sy33"; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 4fcc20d2d0d7..af9232b174cd 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.6"; + version = "8.10.8"; src = fetchPypi { inherit pname version; - sha256 = "2fe47dbf947cc74643ef1a49411466483d1165ced2b62578a14b513dd09642a9"; + sha256 = "1ka7fnlvmvmw984k89mlkdlwbnnyap186a1yfnykx833bp364yg2"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/pika/default.nix b/nixpkgs/pkgs/development/python-modules/pika/default.nix index ec00a2e400ae..40f2afcafb60 100644 --- a/nixpkgs/pkgs/development/python-modules/pika/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pika/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pika"; - version = "0.13.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1104b0jm7qs9b211hw6siddflvf56ag4lfsjy6yfbczds4lxhf2k"; + sha256 = "119lpjzw8wd7c6ikn35c0pvr3zzfy20rklpxdkcmp12wnf9i597v"; }; # Tests require twisted which is only availalble for python-2.x diff --git a/nixpkgs/pkgs/development/python-modules/pilkit/default.nix b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix index 2f4f4b264ce6..0f2a2bb4a8b7 100644 --- a/nixpkgs/pkgs/development/python-modules/pilkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pilkit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ pillow nose_progressive nose mock blessings ]; meta = with stdenv.lib; { - homepage = http://github.com/matthewwithanm/pilkit/; + homepage = https://github.com/matthewwithanm/pilkit/; description = "A collection of utilities and processors for the Python Imaging Libary"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/nixpkgs/pkgs/development/python-modules/plotly/default.nix index 6a2d49996b3d..253288088c46 100644 --- a/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.6.1"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "3cfc53346fa5c32432f13b0c20c272f9cf48f9af9c15f8f77745fb602c12bd91"; + sha256 = "1gad00c0p56zvmk2yzy03m0f3fcq67q9kdgdfxph2aw905mkwddc"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/portpicker/default.nix b/nixpkgs/pkgs/development/python-modules/portpicker/default.nix index e08fe05d8226..30ac00155604 100644 --- a/nixpkgs/pkgs/development/python-modules/portpicker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "19c0f950x544ndsdkfhga58x69iiin2vqiz59pqn9mymk2vrlpkg"; + sha256 = "0rwn5ca7ns3yh6bp785zdd2l4018ccpd5i0m2d1fsd9nhxvcgkfj"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index 7a3d2264c283..a8afd97c4340 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.39.2"; + version = "3.39.3"; src = fetchPypi { inherit pname version; - sha256 = "6eb5135b987caca4212d2c7abc2923d4ad5ba18bb34ccbe7044b3628f52efc2c"; + sha256 = "0fgy4327xzn232br4as74r6ddg5v6ycmfwga7xybp4s1w0cm8nwf"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index 4f00537db0c8..69dce2723ebb 100644 --- a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; - patches = optional isPy37 - # Python 3.7 compatibility (remove when protobuf 3.7 is released) + patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2")) + # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; @@ -41,9 +41,9 @@ buildPythonPackage rec { preBuild = '' # Workaround for https://github.com/google/protobuf/issues/2895 - ${python}/bin/${python.executable} setup.py build + ${python.interpreter} setup.py build '' + optionalString (versionAtLeast protobuf.version "2.6.0") '' - ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation + ${python.interpreter} setup.py build_ext --cpp_implementation ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") diff --git a/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix b/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix index 676f6b22990b..2a886c4cf915 100644 --- a/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.5.0"; + version = "0.6.1"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "09mv7hcczayzjbd4dsrph16ab21slaiamgph9lwr1kjdw7ri5cpg"; + sha256 = "1j2pkynqdqrxf86qyzrjj76i33ylxfsrqxv4j2x9bkd0hk6x0pa6"; }; buildInputs = [ exiv2 boost ]; diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index d8f3c01bbd48..8cca405f7bfd 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.16"; + version = "3.18"; src = fetchPypi { inherit pname version; - sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g"; + sha256 = "053znyl68sjmlp3r4br5jxhqqswjfbb1rb8k6f9qpzcym37439r0"; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix index 853b316a9298..20b391311355 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.30.0"; + version = "2.32.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11g7dx21brfmi5vrq289cw983rydalx0cy91afv5gigyadsmyam2"; + sha256 = "0jfmm5684sfb035ihvla75gxz4cls5d2vnf0s02y6dw7s12zbb8a"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/python-modules/pybcrypt/default.nix b/nixpkgs/pkgs/development/python-modules/pybcrypt/default.nix deleted file mode 100644 index 3f9f3b69a78a..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pybcrypt/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "pybcrypt"; - version = "0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "5fa13bce551468350d66c4883694850570f3da28d6866bb638ba44fe5eabda78"; - }; - - meta = with stdenv.lib; { - description = "bcrypt password hashing and key derivation"; - homepage = https://code.google.com/p/py-bcrypt2; - license = licenses.bsd0; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/pychef/default.nix b/nixpkgs/pkgs/development/python-modules/pychef/default.nix index f3c4109dd93d..51ce6241bb9c 100644 --- a/nixpkgs/pkgs/development/python-modules/pychef/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pychef/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/coderanger/pychef; + homepage = https://github.com/coderanger/pychef; description = "Python implementation of a Chef API client"; license = licenses.bsd0; }; diff --git a/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix index 43cb77e58319..399fc6c7e3cc 100644 --- a/nixpkgs/pkgs/development/python-modules/pygobject/3.nix +++ b/nixpkgs/pkgs/development/python-modules/pygobject/3.nix @@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { pname = "pygobject"; - version = "3.30.4"; + version = "3.32.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hscyvr6hh8l90fyz97b9d03506g3r8s5hl1bgk5aadq8jja3h9d"; + sha256 = "0agg8nxgqp96wyw4qnjjpiczf0j8aw454plwsfqccsyykzjxgx43"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pylama/default.nix b/nixpkgs/pkgs/development/python-modules/pylama/default.nix index f424a89ae33f..3073f55ca3ae 100644 --- a/nixpkgs/pkgs/development/python-modules/pylama/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylama/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pylama"; - version = "7.6.6"; + version = "7.7.1"; src = fetchPypi { inherit pname version; - sha256 = "f81bf3bbd15db802b620903df491e5cd6469dcd542424ce6718425037dcc4d10"; + sha256 = "9bae53ef9c1a431371d6a8dca406816a60d547147b60a4934721898f553b7d8f"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 67066c85f052..86730bc43306 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -12,7 +12,9 @@ buildPythonPackage rec { sha256 = "689de29ae747642ab230c6d37be2b969bf75663176658851f456619aacf27492"; }; - checkInputs = [ pytest pytestrunner pyenchant ]; + nativeBuildInputs = [ pytestrunner ]; + + checkInputs = [ pytest pyenchant ]; propagatedBuildInputs = [ astroid isort mccabe ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix b/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix index 61acce347ef0..42902bc7045a 100644 --- a/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "3.0"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245"; + sha256 = "00awypv2nbn44cc38q7w747gx1xhj33cygzzl56jn5jd3hdlldn7"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index 624dca05e1e3..e17ec16f436d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.3"; + version = "2018.2.5"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ebefe9505cad970dfb4c8024630ef5a546c68d22943dbb3e5677943a6d006ac6"; + sha256 = "1qgi6diw9m7yldmql9kh08792053ib6zkplh8v2mqv6waaflmrnn"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index 47a789000b19..46de94cd0c68 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -27,24 +27,26 @@ in buildPythonPackage rec { buildInputs = [ dbus sip ]; - propagatedBuildInputs = [ qtbase qtsvg qtwebengine ] + propagatedBuildInputs = [ qtbase qtsvg qtwebengine dbus-python ] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets; + patches = [ + # Fix some wrong assumptions by ./configure.py + # TODO: figure out how to send this upstream + ./pyqt5-fix-dbus-mainloop-support.patch + ]; + configurePhase = '' runHook preConfigure - mkdir -p $out - lndir ${dbus-python} $out - rm -rf "$out/nix-support" - export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} ${python.executable} configure.py -w \ --confirm-license \ - --dbus=${dbus.dev}/include/dbus-1.0 \ + --dbus-moduledir=$out/${python.sitePackages}/dbus/mainloop \ --no-qml-plugin \ --bindir=$out/bin \ --destdir=$out/${python.sitePackages} \ diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch b/nixpkgs/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch new file mode 100644 index 000000000000..faa36fa1913d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch @@ -0,0 +1,70 @@ +From 944d5467e1655aac20a14325631df6daccaf5804 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sun, 3 Mar 2019 01:13:46 +0100 +Subject: [PATCH] Fix building on Nix + +./configure.py tries to find dbus-python header in dbus-1 includedir +obtained from pkg-config or from --dbus flag. Unfortunately, when supplied, +it also uses the flag for locating dbus-1 headers. This fails on Nix, +since every package is installed into its own immutable tree so we cannot +use a single directory for both dbus-python and dbus-1. We can fix this by +using pkg-config for finding dbus-python headers too. + +Additionally, the build system also tries to install the dbus support module +to dbus-python tree. Often, it is possible to handle this in pkgconfig as well [1] +but unfortunately, dbus-python does not export the moduledir in its pc file +so I have decided to solve this with an extra configure flag. + +[1]: https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ +--- + configure.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure.py b/configure.py +index a3450ca3..440d90a2 100644 +--- a/configure.py ++++ b/configure.py +@@ -905,6 +905,9 @@ class TargetConfiguration: + if opts.pydbusincdir is not None: + self.pydbus_inc_dir = opts.pydbusincdir + ++ if opts.pydbusmoduledir is not None: ++ self.pydbus_module_dir = opts.pydbusmoduledir ++ + if opts.pyuicinterpreter is not None: + self.pyuic_interpreter = opts.pyuicinterpreter + +@@ -1184,6 +1187,11 @@ def create_optparser(target_config): + metavar="DIR", + help="the directory containing the dbus/dbus-python.h header is " + "DIR [default: supplied by pkg-config]") ++ g.add_option("--dbus-moduledir", dest='pydbusmoduledir', type='string', ++ default=None, action='callback', callback=store_abspath, ++ metavar="DIR", ++ help="the directory where dbus support module will be installed to" ++ "DIR [default: obtained from dbus.mainloop python module]") + p.add_option_group(g) + + # Installation. +@@ -2149,7 +2157,7 @@ def check_dbus(target_config, verbose): + + inform("Checking to see if the dbus support module should be built...") + +- cmd = 'pkg-config --cflags-only-I --libs dbus-1' ++ cmd = 'pkg-config --cflags-only-I --libs dbus-1 dbus-python' + + if verbose: + sys.stdout.write(cmd + "\n") +@@ -2178,7 +2186,8 @@ def check_dbus(target_config, verbose): + inform("The Python dbus module doesn't seem to be installed.") + return + +- target_config.pydbus_module_dir = dbus.mainloop.__path__[0] ++ if target_config.pydbus_module_dir == '': ++ target_config.pydbus_module_dir = dbus.mainloop.__path__[0] + + # Try and find dbus-python.h. We don't use pkg-config because it is broken + # for dbus-python (at least for versions up to and including v0.81.0). +-- +2.18.0 + diff --git a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix index 04d0d1c34a54..9512fce4f452 100644 --- a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "4.6.5"; + version = "4.7.0"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "0xlbr52vzx1j9sg65jhqv01vp4a49afjy03lc2zb0ggx0xxzngvb"; + sha256 = "1bpfvy2xd3aqf79ihglmxlxnv7406184p99h5mn5h9ifs54vvhhl"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/nixpkgs/pkgs/development/python-modules/pyscard/default.nix index a15342e17fa3..bab8e502b9c8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyscard/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyscard/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }: buildPythonPackage rec { - version = "1.9.7"; + version = "1.9.8"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "412c74c83e7401566e9d3d7b8b5ca965e74582a1f33179b3c1fabf1da73ebf80"; + sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm"; }; postPatch = '' @@ -16,6 +16,15 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/"; + patches = [ + # Fixes darwin tests + # See: https://github.com/LudovicRousseau/pyscard/issues/77 + (fetchpatch { + url = "https://github.com/LudovicRousseau/pyscard/commit/62e675028086c75656444cc21d563d9f08ebf8e7.patch"; + sha256 = "1lr55npcpc8j750vf7vaisqyk18d5f00l7nii2lvawg4sssjaaf7"; + }) + ]; + propagatedBuildInputs = [ pcsclite ]; buildInputs = stdenv.lib.optional stdenv.isDarwin PCSC; nativeBuildInputs = [ swig ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix b/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix new file mode 100644 index 000000000000..5fbabdc09883 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyschedule/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pulp +}: + +buildPythonPackage rec { + pname = "pyschedule"; + version = "0.2.34"; + + src = fetchPypi { + inherit pname version; + sha256 = "6bba9e9ea07906ce2dfe3cd847c1822b137f6b13e9f975c50b347312fd98e110"; + }; + + propagatedBuildInputs = [ + pulp + ]; + + # tests not included with pypi release (in examples) + doCheck = false; + + meta = with lib; { + description = "Formulate and solve resource-constrained scheduling problems"; + homepage = https://github.com/timnon/pyschedule; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index 77ea742387e8..e37fa07f2723 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/jlaska/pytest-ansible; + homepage = https://github.com/jlaska/pytest-ansible; description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix new file mode 100644 index 000000000000..e20ebc77ad1d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, click +, pytestcov +, isPy27 +, mock +}: + +buildPythonPackage rec { + pname = "pytest-click"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "Stranger6667"; + repo = "pytest-click"; + rev = version; + sha256 = "1cd15anw8d4rq6qs03j6ag38199rqw7vp0w0w0fm41mvdzr0lwvz"; + }; + + postConfigure = '' + substituteInPlace setup.py \ + --replace "mock==1.0.1" "mock" + ''; + + propagatedBuildInputs = [ + pytest + click + ]; + + checkInputs = [ pytestcov ] ++ lib.optionals isPy27 [ mock ]; + + meta = with lib; { + description = "pytest plugin for click"; + homepage = https://github.com/Stranger6667/pytest-click; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix new file mode 100644 index 000000000000..8943f220fe62 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pylint +, six +, pytestrunner +}: + +buildPythonPackage rec { + pname = "pytest-pylint"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7bfbb66fc6dc160193a9e813a7c55e5ae32028f18660deeb90e1cb7e980cbbac"; + }; + + buildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + pytest + pylint + six + ]; + + # tests not included with release + doCheck = false; + + meta = with lib; { + description = "pytest plugin to check source code with pylint"; + homepage = https://github.com/carsongee/pytest-pylint; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix index ccb9ae782aa9..53e1fce493d1 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-tornado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-tornado"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "214fc59d06fb81696fce3028b56dff522168ac1cfc784cfc0077b7b1e425b4cd"; + sha256 = "0ndwjsad901km7zw8xxj3igjff651hg1pjcmv5vqx458xhnmbfqw"; }; # package has no tests diff --git a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix index 8e3e9d9a5845..48dbc9b710a7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ python.pkgs.dbus-python ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" ''; - + preBuild = "${python.interpreter} setup.py build_ext"; installPhase= "${python.interpreter} setup.py install --prefix=$out"; diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 7e5be24efaa2..adb6d71fb40d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Engine.IO server"; - homepage = http://github.com/miguelgrinberg/python-engineio/; + homepage = https://github.com/miguelgrinberg/python-engineio/; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix index 381d54677d03..8dfea69a2334 100644 --- a/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = with stdenv.lib; { - homepage = http://github.com/madzak/python-json-logger; + homepage = https://github.com/madzak/python-json-logger; description = "A python library adding a json log formatter"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index 4615bfcccce1..fd84c587bdc0 100644 --- a/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the snappy compression library from Google"; - homepage = http://github.com/andrix/python-snappy; + homepage = https://github.com/andrix/python-snappy; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index 368b26f2fb5e..5dff7189e66c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO server"; - homepage = http://github.com/miguelgrinberg/python-socketio/; + homepage = https://github.com/miguelgrinberg/python-socketio/; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pythonix/default.nix b/nixpkgs/pkgs/development/python-modules/pythonix/default.nix index cd20bf72f5d5..6ed150d12398 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonix/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pythonix"; - version = "0.1.4"; + version = "0.1.6"; format = "other"; src = fetchFromGitHub { owner = "Mic92"; repo = "pythonix"; rev = "v${version}"; - sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk"; + sha256 = "1qzcrpn333hsgn6fj1m1s3cvaf0ny8qpygamcrazqv57xmwyr8h5"; }; disabled = !isPy3k; @@ -24,6 +24,5 @@ buildPythonPackage rec { ''; maintainers = [ maintainers.mic92 ]; license = licenses.mit; - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix b/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix index bfb0787a1bbc..d9ff4369c7a7 100644 --- a/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyupdate/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyupdate"; - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "1qxbakhsgmdc5aakhkadr26dlhi0lma7170b245sragn170fqjxf"; + sha256 = "151dxqvdpik4jy84sq6fhjyrq2qq5l70dccgxdbxxf9qyjxpywfl"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix index 53f06cff9221..5bd6722939b6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "7ad4ff0c2166f0296ee070049ce21341f868f907003714eb6eaf1630ea8e241a"; + sha256 = "045bjs8na3q0fy8zzq4pghyz05d9aid1lcv11992f62z2jrf6m2q"; }; propagatedBuildInputs = [ param ]; diff --git a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix index ecc531d82cec..d0bea83ad268 100644 --- a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "fd5c09655e58bf3a013d2940e71f069732ed67f056d4dcb2b0609a3ecd9b320f"; + sha256 = "0gjg7farw6mkmrwqcg6ms7j74g8py2msvawddji4wy8yfvql1ifl"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 6306267ba2ac..f5a563545a10 100644 --- a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.0.18"; + version = "1.0.22"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "05miivbn2c5slc5nn7fpdn1da42qwzg4z046i71f4r70bc49vsj9"; + sha256 = "1gx48qjiahlwflmjlkndp3ricd03jmzfx7i9ffgq7a2i6gcm36zp"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; diff --git a/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 6f85280979bd..baf26c2437bc 100644 --- a/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension for Read the Docs overrides"; - homepage = http://github.com/rtfd/readthedocs-sphinx-ext; + homepage = https://github.com/rtfd/readthedocs-sphinx-ext; license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix index 0ec53528df2e..287ae0391df3 100644 --- a/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; - version = "1.0.12"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1wc62d0f80kw1kjv8nlxychh0iy66a6pydi4vfvhh2shffm935fx"; + sha256 = "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi"; }; # The package does not ship tests, and the setup machinary confuses diff --git a/nixpkgs/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix index b91709446b3f..66340f917704 100644 --- a/nixpkgs/pkgs/development/python-modules/rope/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rope/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rope"; - version = "0.12.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "031eb54b3eeec89f4304ede816995ed2b93a21e6fba16bd02aff10a0d6c257b7"; + sha256 = "1bwayj0hh459s3yh0sdrxksr9wfilgi3a49izfaj06kvgyladif5"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/scp/default.nix b/nixpkgs/pkgs/development/python-modules/scp/default.nix index 623b94124d13..c57d10cf8908 100644 --- a/nixpkgs/pkgs/development/python-modules/scp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.0"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "09219c45hafq6pb8z6rsinsfhp3rsx5mr9cgz2099rcs4if2gk6g"; + sha256 = "1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix b/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix new file mode 100644 index 000000000000..d70abe1f95fd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, boto3 +, six +, pyyaml +, mock +}: + +buildPythonPackage rec { + pname = "serverlessrepo"; + version = "0.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "533389d41a51450e50cc01405ab766550170149c08e1c85b3a1559b0fab4cb25"; + }; + + propagatedBuildInputs = [ + six + boto3 + pyyaml + ]; + + checkInputs = [ pytest mock ]; + + checkPhase = '' + pytest tests/unit + ''; + + meta = with lib; { + homepage = https://github.com/awslabs/aws-serverlessrepo-python; + description = "Helpers for working with the AWS Serverless Application Repository"; + longDescription = '' + A Python library with convenience helpers for working with the + AWS Serverless Application Repository. + ''; + license = lib.licenses.asl20; + maintainers = with maintainers; [ dhkl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix index c1791db9fbc9..707a79e10551 100644 --- a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "116r78nhw74rh857kv9l614xjr6k89919s6l8b14hlvy8fz8rg51"; + sha256 = "1q7kws7w4x2hji3g7y0ni9ddk4sd676ylrb3db54gbpys6xj6nwq"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/shodan/default.nix b/nixpkgs/pkgs/development/python-modules/shodan/default.nix index bf57b9846ee5..586edd766cda 100644 --- a/nixpkgs/pkgs/development/python-modules/shodan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shodan/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.11.1"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0kjcyw3xmps3maf4vzn1pypc6i60q8b67xj78v4gbv4yx2cp2fzr"; + sha256 = "0fd68yaqhpay7jxhyc6xkdrak88wdblxs0phgdkngbakx2yaw2y3"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/slicerator/default.nix b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix index 6af7fafdddf8..af17780909e6 100644 --- a/nixpkgs/pkgs/development/python-modules/slicerator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slicerator/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/soft-matter/slicerator; + homepage = https://github.com/soft-matter/slicerator; description = "A lazy-loading, fancy-sliceable iterable"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/smart_open/default.nix b/nixpkgs/pkgs/development/python-modules/smart_open/default.nix index 9d4df1135994..7504d527ca7b 100644 --- a/nixpkgs/pkgs/development/python-modules/smart_open/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "a52206bb69c38c5f08709ec2ee5704b0f86fc0a770935b5dad9b5841bfd5f502"; + sha256 = "0a38mwlz92mlaxz8f8z4yyacpgykiysbcwfykrgr74vlic8x4m5i"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/nixpkgs/pkgs/development/python-modules/sparse/default.nix b/nixpkgs/pkgs/development/python-modules/sparse/default.nix index d3d78620a3de..f08d8c47c826 100644 --- a/nixpkgs/pkgs/development/python-modules/sparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sparse/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "2ac6fcbf68b38b999eae98467cf4880b942c13a72036868f78d65a10aeba808d"; + sha256 = "0ija4pl8wg36ldsdv5jmqr5i75qi17vijcwwf2jdn1k15kqg35j4"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix b/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix index f06138b4c255..f41452b4b61d 100644 --- a/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/DinoTools/python-ssdeep; + homepage = https://github.com/DinoTools/python-ssdeep; description = "Python wrapper for the ssdeep library"; license = licenses.lgpl3; }; diff --git a/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/nixpkgs/pkgs/development/python-modules/streamz/default.nix index b23853a9bae0..592ce28b7a5b 100644 --- a/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pipelines to manage continuous streams of data"; - homepage = http://github.com/mrocklin/streamz/; + homepage = https://github.com/mrocklin/streamz/; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/sympy/default.nix b/nixpkgs/pkgs/development/python-modules/sympy/default.nix index 1bf7511d2bb9..c09267662c17 100644 --- a/nixpkgs/pkgs/development/python-modules/sympy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sympy/default.nix @@ -8,25 +8,25 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.3"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.4"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "0m0vhyv15zszn19mk5xq3py4iijjbr7f3fpy1s57b8q7c9arncg1"; + sha256 = "1q937csy8rd18pk2fz1ssj7jyj7l3rjx4nzbiz5vcymfhrb1x8bi"; }; checkInputs = [ glibcLocales ]; propagatedBuildInputs = [ mpmath ]; - # some tests fail: https://github.com/sympy/sympy/issues/15149 + # tests take ~1h doCheck = false; patches = [ # to be fixed by https://github.com/sympy/sympy/pull/13476 (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=3277ba76d0ba7174608a31a0c6623e9210c63e3d"; + sha256 = "0xcp1qafvqnivvvi0byh51mbgqicjhmswwvqvamjz9rxfzm5f7d7"; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix index d34231ca9a9e..3540bebd1960 100644 --- a/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "5.0.3"; + version = "5.0.4"; src = fetchPypi { inherit pname version; - sha256 = "12z36fq6qfn9sgd1snsfwrk5j2cw29bsb7mkb0g818fal41g7dr4"; + sha256 = "06sp12cn8zcb7rqklq91f6mxhvrdq5cs0p3pdiazacqcmvvwbhx0"; }; nativeBuildInputs = [ pbr ]; diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix new file mode 100644 index 000000000000..aa32904b8d33 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, tensorflow +, pytest +}: + +buildPythonPackage rec { + pname = "tensorflow-probability"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "probability"; + rev = "v${version}"; + sha256 = "1y210n4asv8j39pk68bdfrz01gddflvzhxbcvj5jw6rjgaagnhvx"; + }; + + propagatedBuildInputs = [ + tensorflow + ]; + + checkInputs = [ + pytest + ]; + + # Tests have an invalid import (`tensorflow_probability.opensource`), should + # be resolved in the next version with + # https://github.com/tensorflow/probability/commit/77d5957f2f0bdddcb46582799cd9c5c5167a1a40 + doCheck = false; + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Library for probabilistic reasoning and statistical analysis"; + homepage = https://www.tensorflow.org/probability/; + license = licenses.asl20; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix b/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix index 21f89e31f376..894d4f737fb6 100644 --- a/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix @@ -1,19 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, webencodings, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi +, webencodings +, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: buildPythonPackage rec { pname = "tinycss2"; - version = "0.6.1"; + version = "1.0.2"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7c53c2c0e914c7711c295b3101bcc78e0b7eda23ff20228a936efe11cdcc7136"; + sha256 = "1kw84y09lggji4krkc58jyhsfj31w8npwhznr7lf19d0zbix09v4"; }; - propagatedBuildInputs = [ webencodings ]; + patches = [ ./remove-redundant-dependency.patch ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + propagatedBuildInputs = [ webencodings ]; - LC_ALL = "en_US.UTF-8"; + checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; meta = with lib; { description = "Low-level CSS parser for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch b/nixpkgs/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch new file mode 100644 index 000000000000..27ec511c55f6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch @@ -0,0 +1,12 @@ +diff --git a/setup.cfg b/setup.cfg +index b3b3c2d..480f3e6 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -33,7 +33,6 @@ project_urls = + + [options] + packages = find: +-setup_requires = pytest-runner + install_requires = + setuptools >= 39.2.0 + webencodings >= 0.4 diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 2b04fdc20c95..9c20226fea05 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.26.0"; + version = "6.26.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0l50n5hljkp7w2l4c36arxf4dxhkfhs7ywwck9y1gvcgsnvccmss"; + sha256 = "1ly22ah487jkq0my1l3c6hbx24fgganjhxrlrcw5jfc80qmgd3hd"; }; buildInputs = [ nose mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix index f5997b9091f3..84803a55b33d 100644 --- a/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "2.2.1"; + version = "2.4.0"; propagatedBuildInputs = [six]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1cn870jgf4h0wb4bnafw527g1dj6rd3rgyjz4f64khd0zx9qs84z"; + sha256 = "1qnlz1k77rldgd5dfrj6nhlsjj71xzqy6s4091djpk0s2p8y1550"; }; meta = with lib; { homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; diff --git a/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix b/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix index 961908116501..c6cfdacf6eeb 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.4.3"; + version = "0.4.4"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "f90d91a613a875ebdf214f0f6f3fd0f8beea9125fc35e54f334d6104fe47c87d"; + sha256 = "004q7lywhhdvsmds88cfpjvkj89nf8n9d4gyrbvvj3x0gw7iiljq"; }; propagatedBuildInputs = [ numpy awkward ]; diff --git a/nixpkgs/pkgs/development/python-modules/user-agents/default.nix b/nixpkgs/pkgs/development/python-modules/user-agents/default.nix index 07cbdc57ef9e..a5dc414b2606 100644 --- a/nixpkgs/pkgs/development/python-modules/user-agents/default.nix +++ b/nixpkgs/pkgs/development/python-modules/user-agents/default.nix @@ -2,20 +2,18 @@ buildPythonPackage rec { pname = "user-agents"; - version = "1.1.0"; + version = "2.0"; # PyPI is missing devices.json src = fetchFromGitHub { owner = "selwin"; repo = "python-user-agents"; rev = "v${version}"; - sha256 = "14kxd780zhp8718xr1z63xffaj3bvxgr4pldh9sv943m4hvi0gw5"; + sha256 = "0ix2yajqdnfj433j50dls90mkmqz8m4fiywxg097zwkkc95wm8s4"; }; propagatedBuildInputs = [ ua-parser ]; - doCheck = false; # some tests fail due to ua-parser bump to 0.8.0 - meta = with stdenv.lib; { description = "A Python library to identify devices by parsing user agent strings"; homepage = https://github.com/selwin/python-user-agents; diff --git a/nixpkgs/pkgs/development/python-modules/vega/default.nix b/nixpkgs/pkgs/development/python-modules/vega/default.nix index 9a589ccf1f87..25acc4f88bce 100644 --- a/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "1.4.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "cf9701dac0111c09ea009ab06cbb81f27b1d9c23ebf58ebdf08b6994a37f13ac"; + sha256 = "097jlh1xarnqmcnym5jkfa6rg2f0i6b17v9pck2242axgyi692rm"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix index 997c4a2deeb6..cf5243296613 100644 --- a/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.11.3"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1pc4p7yxvmhn3x121wgslwclaqnjlx51wxs6ihb4cxynh2vcwgfc"; + sha256 = "1wspvvp8hh9ar7pl6w1qhmakajsjsg4cm11pmi4a422jqmid0vw5"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/xattr/default.nix b/nixpkgs/pkgs/development/python-modules/xattr/default.nix index 8591e7d01b2c..c8940b54c46c 100644 --- a/nixpkgs/pkgs/development/python-modules/xattr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xattr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/xattr/xattr; + homepage = https://github.com/xattr/xattr; description = "Python wrapper for extended filesystem attributes"; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/development/python-modules/xxhash/default.nix b/nixpkgs/pkgs/development/python-modules/xxhash/default.nix new file mode 100644 index 000000000000..da9ec8dc2d97 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xxhash/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.3.0"; + pname = "xxhash"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rhrqrlq4n3vgqd1fv1dcc5ga5dzy9qbd40p8rsqqhh5klxg48gy"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/ifduyue/python-xxhash; + description = "Python Binding for xxHash https://pypi.org/project/xxhash/"; + license = licenses.bsd2; + maintainers = [ maintainers.teh ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/yapf/default.nix b/nixpkgs/pkgs/development/python-modules/yapf/default.nix index 69ce7a360b01..78e97014189b 100644 --- a/nixpkgs/pkgs/development/python-modules/yapf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.26.0"; + version = "0.27.0"; src = fetchPypi { inherit pname version; - sha256 = "edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b"; + sha256 = "18a7n85xv0qrab2ck94kw92ncjq2l8vl0k34pm22rjvd8h6gixil"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/zeep/default.nix b/nixpkgs/pkgs/development/python-modules/zeep/default.nix index c4d9222e8179..0513183d484c 100644 --- a/nixpkgs/pkgs/development/python-modules/zeep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeep/default.nix @@ -1,88 +1,67 @@ { fetchPypi , lib , buildPythonPackage -, python , isPy3k , appdirs +, attrs , cached-property , defusedxml , isodate , lxml -, pytz +, requests , requests_toolbelt , six +, pytz +, tornado +, aiohttp # test dependencies , freezegun , mock -, nose , pretend -, pytest +, pytest_3 , pytestcov , requests-mock -, tornado -, attrs +, aioresponses }: buildPythonPackage rec { pname = "zeep"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0bfpdy3hi8aa45piwg5gj0xxa187v13d66qr1ki73qn7c6rbizp5"; + sha256 = "144dk7gw93l4amrwmp5vzxxkcjsgkx6fjqzvsawx2iap23j605j9"; }; propagatedBuildInputs = [ - attrs appdirs + attrs cached-property defusedxml isodate lxml - pytz + requests requests_toolbelt six - ]; - - # testtools dependency not supported for py3k - doCheck = !isPy3k; + pytz - checkInputs = [ + # optional requirements tornado - ]; + ] ++ lib.optional isPy3k aiohttp; - buildInputs = if isPy3k then [] else [ + checkInputs = [ freezegun mock - nose pretend - pytest pytestcov + pytest_3 requests-mock - ]; - - patchPhase = '' - # remove overly strict bounds and lint requirements - sed -e "s/freezegun==.*'/freezegun'/" \ - -e "s/pytest-cov==.*'/pytest-cov'/" \ - -e "s/'isort.*//" \ - -e "s/'flake8.*//" \ - -i setup.py - - # locale.preferredencoding() != 'utf-8' - sed -e "s/xsd', 'r')/xsd', 'r', encoding='utf-8')/" -i tests/*.py - - # cache defaults to home directory, which doesn't exist - sed -e "s|SqliteCache()|SqliteCache(path='./zeeptest.db')|" \ - -i tests/test_transports.py - - # requires xmlsec python module - rm tests/test_wsse_signature.py - ''; + ] ++ lib.optional isPy3k aioresponses; checkPhase = '' runHook preCheck - ${python.interpreter} -m pytest tests + # ignored tests requires xmlsec python module + HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/python-modules/zerorpc/default.nix b/nixpkgs/pkgs/development/python-modules/zerorpc/default.nix new file mode 100644 index 000000000000..2ad01586189b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/zerorpc/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack-python, pyzmq }: + +buildPythonPackage rec { + pname = "zerorpc"; + version = "0.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh"; + }; + + propagatedBuildInputs = [ future gevent msgpack-python pyzmq ]; + + doCheck = false; # pypi version doesn't include tests + + meta = with lib; { + description = "An easy to use, intuitive, and cross-language RPC"; + homepage = "https://www.zerorpc.io"; + license = licenses.mit; + maintainers = with maintainers; [ xeji ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix b/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix index 65ca0cc1ea9c..f447d29f2804 100644 --- a/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows you to perform imports names that will only be resolved when used in the code"; - homepage = http://github.com/zopefoundation/zope.deferredimport; + homepage = https://github.com/zopefoundation/zope.deferredimport; license = licenses.zpl21; }; } diff --git a/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix b/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix index de99386560ba..0b7bc80bf3a6 100644 --- a/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; - homepage = http://github.com/zopefoundation/zope.hookable; + homepage = https://github.com/zopefoundation/zope.hookable; license = licenses.zpl21; }; } diff --git a/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix b/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix index f310042976c2..9dac64907be9 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.contenttype; + homepage = https://github.com/zopefoundation/zope.contenttype; description = "A utility module for content-type (MIME type) handling"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix b/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix index f6c5f51b6265..3a2040cf008b 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_deprecation/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ zope_testing ]; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.deprecation; + homepage = https://github.com/zopefoundation/zope.deprecation; description = "Zope Deprecation Infrastructure"; license = licenses.zpl20; maintainers = with maintainers; [ garbas domenkozar ]; diff --git a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix index c72eeeb921df..738b30c489f5 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_event zope_component ]; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.lifecycleevent; + homepage = https://github.com/zopefoundation/zope.lifecycleevent; description = "Object life-cycle events"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/nixpkgs/pkgs/development/python-modules/zope_location/default.nix b/nixpkgs/pkgs/development/python-modules/zope_location/default.nix index 70ba9a8e88a9..7c0df16f7751 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_location/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_location/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.location/; + homepage = https://github.com/zopefoundation/zope.location/; description = "Zope Location"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix index 7c4b5d89ea30..08932c1cba19 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.proxy; + homepage = https://github.com/zopefoundation/zope.proxy; description = "Generic Transparent Proxies"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/nixpkgs/pkgs/development/python-modules/zope_size/default.nix b/nixpkgs/pkgs/development/python-modules/zope_size/default.nix index de1a34a3f79e..8651e2d6822f 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_size/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_size/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; meta = with stdenv.lib; { - homepage = http://github.com/zopefoundation/zope.size; + homepage = https://github.com/zopefoundation/zope.size; description = "Interfaces and simple adapter that give the size of an object"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/nixpkgs/pkgs/development/r-modules/bioc-packages.nix b/nixpkgs/pkgs/development/r-modules/bioc-packages.nix index e16db898fa89..9122ad9f1a4f 100644 --- a/nixpkgs/pkgs/development/r-modules/bioc-packages.nix +++ b/nixpkgs/pkgs/development/r-modules/bioc-packages.nix @@ -40,7 +40,7 @@ in with self; { AnnotationFilter = derive2 { name="AnnotationFilter"; version="1.6.0"; sha256="0wrr10cxjzmxx46vjzq2nsf6xlqz1sqwx4xm0sk3d77ff8wmph4x"; depends=[GenomicRanges lazyeval]; }; AnnotationForge = derive2 { name="AnnotationForge"; version="1.24.0"; sha256="13yvhf3yskmvhs8szs6rkw93h81h5xqa3h19h91pp6nprhc8s3ll"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; }; AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.32.0"; sha256="1x11mfabh7kbp39y5rkmrpjkaawx7ab5anfmciamrmrcw1kddbss"; depends=[AnnotationDbi DBI]; }; - AnnotationHub = derive2 { name="AnnotationHub"; version="2.14.4"; sha256="18v2mk395svq3c19wzi6bjwjfnmrvjqkzmj7cmaji7rx4xdgz6ck"; depends=[AnnotationDbi BiocGenerics BiocManager curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; }; + AnnotationHub = derive2 { name="AnnotationHub"; version="2.14.5"; sha256="0iyrxaijl4614iz5c1j53227xy2g756p3bx7hcwglcybh0k30nki"; depends=[AnnotationDbi BiocGenerics BiocManager curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; }; AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.12.0"; sha256="1xim76sxldx70h13fpkhz7fxr5rcq0gp7558w4v1iqjjzd4gp3mh"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocManager biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; }; ArrayExpress = derive2 { name="ArrayExpress"; version="1.42.0"; sha256="1a61miwsyqghmqnfnfpd7b0p712mz9cpcrq00p9b7jr8j4jd5vla"; depends=[Biobase limma oligo XML]; }; ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.32.1"; sha256="0gv3f1ynyl52ab7zvmfi9s34ns6nwqyayh5imv6b31l92rw5ifdm"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; }; @@ -50,7 +50,7 @@ in with self; { BAC = derive2 { name="BAC"; version="1.42.0"; sha256="02r74rwsn59b1f9l3n51xh6jj5bwjcg9qp63i1jczfnglwga01av"; depends=[]; }; BADER = derive2 { name="BADER"; version="1.20.1"; sha256="114xy8yynfncnrlsi1v44gsiq2a8jyh9q7ssb3f3rhb7rw8v0k4l"; depends=[]; }; BAGS = derive2 { name="BAGS"; version="2.22.0"; sha256="13zlmffg8y1vrkpj62wawfzx9h68q1p42bizrwzq0cdh6jyafp3z"; depends=[Biobase breastCancerVDX]; }; - BASiCS = derive2 { name="BASiCS"; version="1.4.1"; sha256="1ngkc3jjpma3k7xsn4a93bv4zzbxm0v38gy8hkzn29s3yfvyfmb3"; depends=[BiocGenerics coda data_table ggplot2 KernSmooth MASS matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; }; + BASiCS = derive2 { name="BASiCS"; version="1.4.7"; sha256="1i0ynbc6grg28w8wsibrcfyncdipacb1lprnw11fvgkd0d429mg2"; depends=[BiocGenerics coda data_table ggplot2 KernSmooth MASS matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; }; BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.12.0"; sha256="0k49ad1k3szjawsn7s97k7y2j7c03cqjcg8kmx8wmypjivjv1nv0"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; }; BCRANK = derive2 { name="BCRANK"; version="1.44.0"; sha256="0zrmrc4dsz9jl0n7a0fsnmfws54hpda21sxpdqdq86qhj4ljz2nd"; depends=[Biostrings]; }; BDMMAcorrect = derive2 { name="BDMMAcorrect"; version="1.0.1"; sha256="1i4d9qk4iw8m1p590fg85qg6w55982mn41zp8bqinygx5vzvq8i2"; depends=[ape ellipse ggplot2 Rcpp RcppArmadillo RcppEigen SummarizedExperiment vegan]; }; @@ -115,10 +115,10 @@ in with self; { CALIB = derive2 { name="CALIB"; version="1.48.0"; sha256="118sy35hi5p1nkm7ygh4pn7m3855vhywsj66j0v74iis00blpv1z"; depends=[limma]; }; CAMERA = derive2 { name="CAMERA"; version="1.38.1"; sha256="0mz6ahdyv3334v8fbqan8i6plkyz20smfq4p7hjphcybjfxxsizv"; depends=[Biobase graph Hmisc igraph RBGL xcms]; }; CAMTHC = derive2 { name="CAMTHC"; version="1.0.0"; sha256="1n2hn4snmlfrwr5c9di214sqvgmmihyxnbzbf0n2hx99rrjlzvpg"; depends=[apcluster Biobase BiocParallel corpcor DMwR geometry NMF pcaPP rJava SummarizedExperiment]; }; - CATALYST = derive2 { name="CATALYST"; version="1.6.4"; sha256="1ikqskvqrnkgz4rry5qj8is2b7d18lfy6df7r1v695pvd8x77z3w"; depends=[Biobase circlize ComplexHeatmap ConsensusClusterPlus dplyr drc DT flowCore FlowSOM ggplot2 ggrepel ggridges gridExtra htmltools limma magrittr Matrix matrixStats nnls plotly RColorBrewer reshape2 Rtsne S4Vectors scales shiny shinyBS shinydashboard shinyjs SummarizedExperiment tidyr]; }; + CATALYST = derive2 { name="CATALYST"; version="1.6.7"; sha256="08dfjyay6b2ja9jykpzfycnyd9y20pysmshbw5vd5fb69mcjii8q"; depends=[Biobase circlize ComplexHeatmap ConsensusClusterPlus data_table dplyr drc DT flowCore FlowSOM ggplot2 ggrepel ggridges gridExtra htmltools limma magrittr matrixStats nnls plotly purrr RColorBrewer reshape2 Rtsne S4Vectors scales scater shiny shinyBS shinydashboard shinyjs SingleCellExperiment SummarizedExperiment]; }; CAnD = derive2 { name="CAnD"; version="1.14.0"; sha256="0h1ry4z9g4daga7jqnm2wh631d4yzp738yf1vpxvf2d3f2qci8dv"; depends=[ggplot2 reshape]; }; CCPROMISE = derive2 { name="CCPROMISE"; version="1.8.0"; sha256="1kpz5cwx0bk55w8paldvmvmgprxsrgyqf8r3vxns136ksv1a1zhx"; depends=[Biobase CCP GSEABase PROMISE]; }; - CEMiTool = derive2 { name="CEMiTool"; version="1.6.10"; sha256="0db77vjkpv4a62hl9ralrdimrb02aqjp4iq102z9yhnjh0abn3ld"; depends=[clusterProfiler data_table dplyr DT ff ffbase fgsea GeneOverlap ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr limma matrixStats network plyr pracma RColorBrewer rmarkdown scales sna stringr tidyr WGCNA]; }; + CEMiTool = derive2 { name="CEMiTool"; version="1.6.11"; sha256="1wypc50kq5y6bnwrfkqz50wckb65bxw294472hnzk4vmaiyymvck"; depends=[clusterProfiler data_table dplyr DT ff ffbase fgsea GeneOverlap ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr limma matrixStats network plyr pracma RColorBrewer rmarkdown scales sna stringr tidyr WGCNA]; }; CFAssay = derive2 { name="CFAssay"; version="1.16.1"; sha256="1l8l157df163cy4i6qc1q95x1pqc80y7dp5jf9nfssgbkls2dpfv"; depends=[]; }; CGEN = derive2 { name="CGEN"; version="3.18.0"; sha256="0p0c05axpj94v3gksy065244vlxh9q4g6ifv07jxrvl23ji4bnyi"; depends=[mvtnorm survival]; }; CGHbase = derive2 { name="CGHbase"; version="1.42.0"; sha256="0ghxp49xdi09p3f2qwrdrq2p4qjafj4z1rr08ycgbf11gb22h1sc"; depends=[Biobase marray]; }; @@ -126,7 +126,7 @@ in with self; { CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.36.0"; sha256="1j92x5dyxp6hjj87g1hgw5q8fd4k2q5rb97ir47xkalkcskg0ddh"; depends=[Biobase CGHbase CGHcall]; }; CGHregions = derive2 { name="CGHregions"; version="1.40.0"; sha256="04j87bd2ygda6np72vs1bx857y5mbaga19ky6pgyxv9lahi62xyw"; depends=[Biobase CGHbase]; }; CHARGE = derive2 { name="CHARGE"; version="1.2.0"; sha256="0230pvgsf775lq4n9cpxb95bqq438f4z0wx9mmbj4yir8bljy0mk"; depends=[cluster diptest factoextra FactoMineR GenomicRanges IRanges matrixStats modes plyr SummarizedExperiment]; }; - CHRONOS = derive2 { name="CHRONOS"; version="1.10.0"; sha256="1r0gm20a5ivg1c0h338rzxby69ww4vlw32gmis06k3pmsqq49g13"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; }; + CHRONOS = derive2 { name="CHRONOS"; version="1.10.1"; sha256="03j4qcak7bpgw80gzxb2mj6k134jqp5frzd5ls6b5290lkknj720"; depends=[biomaRt circlize doParallel foreach graph igraph openxlsx RBGL RCurl XML]; }; CINdex = derive2 { name="CINdex"; version="1.10.0"; sha256="0c4p3v9a0njf28gdhvdbnydlhjgpnwzakhnvkvngs3mhbwpy9ih5"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; }; CMA = derive2 { name="CMA"; version="1.40.0"; sha256="1v77yiqmvd90pxbs64xfpglwy006w88b4zrb5rk90r0vasnvdl5n"; depends=[Biobase]; }; CNAnorm = derive2 { name="CNAnorm"; version="1.28.0"; sha256="050yhjqqqm5kqjpw2ar8gf0yjqzmr0xzwa0c10dfry6hml63d6m3"; depends=[DNAcopy]; }; @@ -214,7 +214,7 @@ in with self; { DEScan2 = derive2 { name="DEScan2"; version="1.2.1"; sha256="0l47x2yrxcyj0mfz972acyw2v9n08ib859jb3v9qasrbw04qnvwk"; depends=[BiocGenerics BiocParallel ChIPpeakAnno data_table DelayedArray GenomeInfoDb GenomicAlignments GenomicRanges glue IRanges plyr Rcpp RcppArmadillo rtracklayer S4Vectors SummarizedExperiment]; }; DESeq = derive2 { name="DESeq"; version="1.34.1"; sha256="0bpiixczbhlyaiinpbl6xrpmv72k2bq76bxnw06gl35m4pgs94p2"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; }; DESeq2 = derive2 { name="DESeq2"; version="1.22.2"; sha256="0n5ah84mxn87p45drzy0wh2yknmzj1q5i6gv0v9vgg1lj7awb91r"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; - DEXSeq = derive2 { name="DEXSeq"; version="1.28.2"; sha256="134znafy7hn38rp4nia4pglz56fz6nbkxrf7z2k1sajfsgxa1hs6"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; + DEXSeq = derive2 { name="DEXSeq"; version="1.28.3"; sha256="1wsj1kqfrakmjnlplxmrv17r2spzcdkmwdkhggyjbf8mdhqs3w16"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; DEqMS = derive2 { name="DEqMS"; version="1.0.1"; sha256="1869msy07xh9y0yr0mskrkpmzmf4x3vdarvn8wi78hk1scq1zk71"; depends=[ggplot2 limma]; }; DEsingle = derive2 { name="DEsingle"; version="1.2.1"; sha256="0w3b7pz04l60hrbw4k7rkp4xmf8hzxca7pgrjyalf946z6yvky0s"; depends=[bbmle BiocParallel gamlss MASS Matrix maxLik pscl VGAM]; }; DEsubs = derive2 { name="DEsubs"; version="1.8.1"; sha256="0whs5q02lgis04zyf6abd9b5phv3bw508k4ngp197ka02pbpvxxz"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL]; }; @@ -260,7 +260,7 @@ in with self; { EGAD = derive2 { name="EGAD"; version="1.10.0"; sha256="1krwqspyw63zddgksvjvcidfzcxv9165p5dl3cgh1qsb3s427gla"; depends=[affy arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; }; EGSEA = derive2 { name="EGSEA"; version="1.10.1"; sha256="0mimy2k7z3zyxksyax8xbl4yk48986b88x7vnfd2hlhibdcc1wg2"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 Glimma globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; }; ELBOW = derive2 { name="ELBOW"; version="1.18.1"; sha256="03jk906v6my6xf85ki2af8kd540bjjgn76xq4w38xc4dpfmpypla"; depends=[]; }; - ELMER = derive2 { name="ELMER"; version="2.6.1"; sha256="1675yr1f54cqyzir8rswndgcxb0pjb3c4bka9kdgfnjynk8w7ssv"; depends=[biomaRt circlize ComplexHeatmap doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr readr reshape rmarkdown rvest S4Vectors stringr SummarizedExperiment TCGAbiolinks tibble tidyr xml2]; }; + ELMER = derive2 { name="ELMER"; version="2.6.3"; sha256="0x9v0z2b649nwnxaj9fkyrlgqdlxl4cmdm5wmpw8nzn6r432wfmi"; depends=[biomaRt circlize ComplexHeatmap DelayedArray doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr progress purrr readr reshape rmarkdown rtracklayer rvest S4Vectors stringr SummarizedExperiment TCGAbiolinks tibble tidyr xml2]; }; EMDomics = derive2 { name="EMDomics"; version="2.12.0"; sha256="1savm8vh1cl8s9rw5jy341a6azx1d8pm0935jvl10ai0cs6q1f22"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; }; ENCODExplorer = derive2 { name="ENCODExplorer"; version="2.8.0"; sha256="1836v5yj5rr3mvmsakbz5ccqc0h3dngipigszbrzcb2qb9m55gqf"; depends=[data_table dplyr DT jsonlite RCurl shiny shinythemes stringi stringr tidyr]; }; ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.30.0"; sha256="0ciilgg8mw4lzclfqqgfrc6crig15m418qfpcfk9s4ykcnjzzial"; depends=[rJava XML]; }; @@ -285,7 +285,7 @@ in with self; { FGNet = derive2 { name="FGNet"; version="3.16.0"; sha256="12wv1r60nga4llvrx6blv9s6vlpcy22rz72qbf0ixpf16g16yc1x"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; }; FISHalyseR = derive2 { name="FISHalyseR"; version="1.16.0"; sha256="0gkghipxbdpb3x55j9n583mi1z9cai8g8xcmyj5337dccx91lfag"; depends=[abind EBImage]; }; FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.18.0"; sha256="0pw7r0w4ppv7jkjrx88a3bj85d96si1f0hqh7a5gpfb2593fd14k"; depends=[fda MASS]; }; - FamAgg = derive2 { name="FamAgg"; version="1.10.0"; sha256="1ry4p8yjq0zhgvv9wx9b085hq5k1q7q60hc5w5pmk94cswvv82vd"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; }; + FamAgg = derive2 { name="FamAgg"; version="1.10.4"; sha256="0fkpcamaav0nlsg0j5dl6l7zfn9z6nrrm8avk8waxnxsghanbc6h"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; }; FastqCleaner = derive2 { name="FastqCleaner"; version="1.0.0"; sha256="0v18zhzh8xd5b7828nnvlxc8gzwjgc9hnhznjd3w62js2yg9xv4l"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; }; FindMyFriends = derive2 { name="FindMyFriends"; version="1.12.0"; sha256="1yyzqw9hzyxh2sjw8wj3xi5cvkcr9ssnahhwaqrln5zsiq72kn70"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; }; FitHiC = derive2 { name="FitHiC"; version="1.8.0"; sha256="15xd8mz7660q4zr9p74mq1pqps4iz7pxp8f9ifn21gwg94aq1avn"; depends=[data_table fdrtool Rcpp]; }; @@ -339,13 +339,13 @@ in with self; { GWASTools = derive2 { name="GWASTools"; version="1.28.0"; sha256="1g039bg6pcbxnz9zyzknrl9qx6wzncqjw4lpiy1lq4pc91lqzjln"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; }; GateFinder = derive2 { name="GateFinder"; version="1.2.1"; sha256="1figmf8cpz1mfrcz69jfrxprl88aw01jb30pq3bi2n1r3dyvyxzp"; depends=[diptest flowCore flowFP mvoutlier splancs]; }; GenRank = derive2 { name="GenRank"; version="1.10.0"; sha256="1fs9kfpm1xcdkyfc52hyysxwdb86aghcgig0jam3cvvfgnpm4xk9"; depends=[matrixStats reshape2 survcomp]; }; - GenVisR = derive2 { name="GenVisR"; version="1.14.1"; sha256="1c49fgh4k5018xg0cxy2vx2lz4d9s8xm1kv2b2834cjviianzvhz"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome data_table DBI FField GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales VariantAnnotation viridis]; }; + GenVisR = derive2 { name="GenVisR"; version="1.14.2"; sha256="1sidsnzz6hfw072fk5n4i2v7ib9p0fm77p1vf26kgm0xi32ld679"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome data_table DBI FField GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales VariantAnnotation viridis]; }; GeneAccord = derive2 { name="GeneAccord"; version="1.0.0"; sha256="1g1rjgvqnf3bqa4phj0q4gzrm3y6ijbxzyjz83ilwdmwxd4vs5rw"; depends=[biomaRt caTools dplyr ggplot2 ggpubr gtools magrittr maxLik RColorBrewer reshape2 tibble]; }; GeneAnswers = derive2 { name="GeneAnswers"; version="2.24.0"; sha256="0cx6k2m3cllj0hvfmznkydwnw96q5a6k4781jiix7n9j97ys1rf5"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; }; GeneBreak = derive2 { name="GeneBreak"; version="1.12.0"; sha256="049876x0665zv2apxf48hc5yqi7nbh89sqxlgyfqc2vk4knjgkbj"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; }; GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.28.0"; sha256="12ww6hlgpxchlvrcc0va4x0ayb3119kakmm4yfscbp2xiy1dlinj"; depends=[Biobase PGSEA]; }; GeneGA = derive2 { name="GeneGA"; version="1.32.0"; sha256="1z83rrlp82q56wp3ywbacrh8ws5rhqn572p94hqj895jb3b2w3km"; depends=[hash seqinr]; }; - GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.8.0"; sha256="12bx94xw3pmsnwqb4ksgz9ydn8581x2pdvbdba8p7cwcwbkp2lfk"; depends=[data_table FactoMineR GenomicRanges GGtools igraph IRanges kernlab mvtnorm plspm rioja Rsamtools snpStats]; }; + GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.8.0"; sha256="12bx94xw3pmsnwqb4ksgz9ydn8581x2pdvbdba8p7cwcwbkp2lfk"; depends=[data_table FactoMineR GenomicRanges GGtools igraph IRanges kernlab mvtnorm plspm Rsamtools snpStats]; }; GeneMeta = derive2 { name="GeneMeta"; version="1.54.0"; sha256="0cwnhr98sc2xb9y7k4c502r1s1pwlwimpajfp7q34qs3w10sj8my"; depends=[Biobase genefilter]; }; GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.24.0"; sha256="1vrp2ns29fna1wkzzpfwp30ax9y6fr37w9a89lf2391hdpr3hls4"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; }; GeneOverlap = derive2 { name="GeneOverlap"; version="1.18.0"; sha256="1p87ngk0lfbb86hwx63x4xjnw77xslh5a7136l1dwia24r9dccls"; depends=[gplots RColorBrewer]; }; @@ -355,12 +355,12 @@ in with self; { GeneStructureTools = derive2 { name="GeneStructureTools"; version="1.2.1"; sha256="1rqw74rj3x9f4sslsamsz7g1k835qp76qhxz7i7sxvgi3gv21m9g"; depends=[Biostrings BSgenome_Mmusculus_UCSC_mm10 data_table GenomicRanges Gviz IRanges plyr rtracklayer S4Vectors stringdist stringr]; }; GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.50.0"; sha256="1pzqdrny4hx6sxnc9glhb5plgrahfdckmcr7symykcc8d896payl"; depends=[gmodels gtools mvtnorm]; }; GeneticsPed = derive2 { name="GeneticsPed"; version="1.44.0"; sha256="00v32167gl0kkglrzl3xm5bw7p8mfc933k074mf9lpbbf9s1liy7"; depends=[gdata genetics MASS]; }; - GenoGAM = derive2 { name="GenoGAM"; version="2.0.2"; sha256="1vnvsw3jsp9psdd3vlzxvxhsny15j15b3fhyb07fsr26hgd0k5jh"; depends=[BiocParallel Biostrings data_table DelayedArray DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges HDF5Array IRanges Matrix Rcpp RcppArmadillo rhdf5 Rsamtools S4Vectors sparseinv SummarizedExperiment]; }; + GenoGAM = derive2 { name="GenoGAM"; version="2.0.3"; sha256="09c7bk6jmfslr5clnrxp8f9s1fkq83w51nbj25akl3b8p5y5nagh"; depends=[BiocParallel Biostrings data_table DelayedArray DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges HDF5Array IRanges Matrix Rcpp RcppArmadillo rhdf5 Rsamtools S4Vectors sparseinv SummarizedExperiment]; }; GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.42.0"; sha256="0n3nbhgwnd09fnn7pyaa8n46hhjrz1gkvzbjjf7p9clv6p937y18"; depends=[biomaRt]; }; GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.18.2"; sha256="07bm35jcczpyxap0b3gky4b28z38z423sngzsm19d9krjxr76b5p"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.18.1"; sha256="1maslav2r34wjyzh2nlwa862in1ir7i5xk57nw2nlfh5gqy112jd"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.6.0"; sha256="00xlskvrcjmj28mqkdi2d4ksqsb603g6wckqvzqyjr417xyyanrl"; depends=[dplyr GenomicRanges httr IRanges jsonlite lazyeval magrittr rappdirs readr S4Vectors SummarizedExperiment xml2]; }; - GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.34.4"; sha256="09gc1vbqszrr3ixv4hsfan2l18fcf3gg58783mrfwjv6ci9c4w0d"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; + GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.34.7"; sha256="100y8cx9xfglbn36k25y09y0qfwm0qpb4b01qhk367832rqz5dhz"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; GenomicFiles = derive2 { name="GenomicFiles"; version="1.18.0"; sha256="0qf2yj4lfnnk64fk125n8sqms01shfqiik04nasx2z3k129ykpxp"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.16.0"; sha256="0zy5isp2lqpjm0n0n1gly5bs4izn22yciibyqrnlrr60rmn5s67q"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; }; GenomicRanges = derive2 { name="GenomicRanges"; version="1.34.0"; sha256="0bgh14d15dpf2iy36qinw45r6n45rqkf0ghazrdl3jfva6vbrb29"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; }; @@ -405,7 +405,7 @@ in with self; { IMPCdata = derive2 { name="IMPCdata"; version="1.18.0"; sha256="0qqdpi4g29kf3y2cj7y3db40myacl368alc72lrv1qbw3qncjyjd"; depends=[rjson]; }; INDEED = derive2 { name="INDEED"; version="1.0.1"; sha256="0w5h7zjalvz595fgz5ds5y4vxmny00psg60rwhjdjsh3z5rh6hwm"; depends=[devtools glasso]; }; INPower = derive2 { name="INPower"; version="1.18.0"; sha256="074fylal7rn880vidi10d78s4zcxakq8f4gcxlgpq2hg0ivhd8rk"; depends=[mvtnorm]; }; - INSPEcT = derive2 { name="INSPEcT"; version="1.12.1"; sha256="07q5msw9rnamx957mbiawnv3p9kr5ahwawzvv9xzla7d3lkk62xp"; depends=[Biobase BiocGenerics BiocParallel DESeq2 deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges plgem preprocessCore pROC rootSolve Rsamtools S4Vectors shiny SummarizedExperiment TxDb_Mmusculus_UCSC_mm9_knownGene]; }; + INSPEcT = derive2 { name="INSPEcT"; version="1.12.2"; sha256="1ykkr15b4bc2carwppf9yxzpl2n6lqpc6z6i2qy37vc6xffzgdx4"; depends=[Biobase BiocGenerics BiocParallel DESeq2 deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges plgem preprocessCore pROC rootSolve Rsamtools S4Vectors shiny SummarizedExperiment TxDb_Mmusculus_UCSC_mm9_knownGene]; }; IONiseR = derive2 { name="IONiseR"; version="2.6.0"; sha256="01lqisdlsvym8nhgpzn7lpcddk9lv9253dy9v65r2dicb5xqhj00"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; }; IPO = derive2 { name="IPO"; version="1.8.1"; sha256="0az0wvbnanaaviv4z91q4qa2zh7rjbmgybh4s78z9426cfk2yz7g"; depends=[BiocParallel CAMERA rsm xcms]; }; IPPD = derive2 { name="IPPD"; version="1.30.0"; sha256="19g39k2cxfrbfh8hzmwk6hh67mp3na8447kd7jrdshd6zd2raaas"; depends=[bitops digest MASS Matrix XML]; }; @@ -419,7 +419,7 @@ in with self; { IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.30.0"; sha256="1knaavzdvm1iz6crhqhxsxhvlrpa9k6n6d82q21w6qag8lkvwc2x"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; }; IdeoViz = derive2 { name="IdeoViz"; version="1.18.0"; sha256="067bd18pb3xyw58xxl0fxa09kcyh4dhdzxbci6i7b82fa17s9hkb"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; }; Imetagene = derive2 { name="Imetagene"; version="1.12.0"; sha256="0lh15nqjxwgjlhhzrrjj9bpbbkxnq2nlgx3v4fik6q4d5rqx0zbb"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; }; - ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.10.3"; sha256="1d67q276d9nr1fiz9a8lldvggq91sw056slcd8d2pvm55bj4fiwy"; depends=[Biobase curl data_table ggplot2 gplots gtools heatmaply httr pheatmap plotly preprocessCore R6 reshape2 rjson Rlabkey rmarkdown scales]; }; + ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.10.5"; sha256="15j5f8vxl0j135kcc69g9xpkgdcipjhj0slgd52c818hgdbyj4zk"; depends=[Biobase curl data_table digest flowCore flowWorkspace ggplot2 gplots gtools heatmaply httr pheatmap plotly preprocessCore R6 reshape2 rjson Rlabkey rmarkdown scales]; }; ImpulseDE = derive2 { name="ImpulseDE"; version="1.8.0"; sha256="0jiqclcm0w6nh7j3w5wqv0c6lw0pyn4wczld2fmkqyv71mshmakn"; depends=[amap boot]; }; ImpulseDE2 = derive2 { name="ImpulseDE2"; version="1.6.1"; sha256="0zbrkwaspwaq9aa9il4ahn5lnhbyz8cair5lx354pr1whm3wn8v3"; depends=[Biobase BiocParallel circlize ComplexHeatmap cowplot DESeq2 ggplot2 knitr Matrix S4Vectors SummarizedExperiment]; }; InPAS = derive2 { name="InPAS"; version="1.14.1"; sha256="0r1b5f13yq1nqrfk2ry88m5dnz86pjmf9g158c45jzvw0b9czxyd"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; }; @@ -481,7 +481,7 @@ in with self; { MIGSA = derive2 { name="MIGSA"; version="1.6.0"; sha256="19gfb98qmb8wbi343lw92sf7d29xliyzb3wz095pd2npsjr69qkl"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase ismev limma matrixStats org_Hs_eg_db RBGL reshape2 Rgraphviz RJSONIO vegan]; }; MIMOSA = derive2 { name="MIMOSA"; version="1.20.1"; sha256="0vj7z95pjq62glg1akipydbybxsxc69yjpqrffpc33kqhf46nhfb"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; }; MIRA = derive2 { name="MIRA"; version="1.4.1"; sha256="0wy4iisp6c0kfns34pr5am055b1x7wdnbdh8lgr5ll91wxz48sg9"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; }; - MLInterfaces = derive2 { name="MLInterfaces"; version="1.62.0"; sha256="12bgplyzfh0hkwmdp5w4cs5zw3ygdhzmiqzm8vhjyni6m9nrxwy8"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; }; + MLInterfaces = derive2 { name="MLInterfaces"; version="1.62.1"; sha256="1h0x1p2h8x1h276wxx6kcnb4c4s5sglnmd58iigl81a224x8gxwp"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; }; MLP = derive2 { name="MLP"; version="1.30.0"; sha256="03h7k5v620x2hw6k3gddaba40fwh6zvpmlnhf6mcml7ldsni95y9"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; }; MLSeq = derive2 { name="MLSeq"; version="2.0.1"; sha256="1jaw2blnl7jsd2px069af7zqk69d04bma8m5vpqb941vx6yhk095"; depends=[Biobase caret DESeq2 edgeR foreach ggplot2 limma plyr sSeq SummarizedExperiment xtable]; }; MMDiff2 = derive2 { name="MMDiff2"; version="1.10.0"; sha256="0ljdr6y3plzpf9j70ghw41x3jpb8p52lqb9987gm1mw7lxw9iraf"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; }; @@ -537,8 +537,8 @@ in with self; { MultiDataSet = derive2 { name="MultiDataSet"; version="1.10.0"; sha256="1sr93zdirjqgsffmkv9plaqbg3rfsz8lh96mqv7xrnc3nmhmm65y"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; }; MultiMed = derive2 { name="MultiMed"; version="2.4.0"; sha256="1dfcqh7px0zzgrg96r3930jxzcgvc91xlfm4q9fnn3w85nzgdnrb"; depends=[]; }; MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.8.0"; sha256="0w9lg1zs106h6rqvy8mhikq6q6q9syw6c1prcxr38ssh85rcih12"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; }; - NADfinder = derive2 { name="NADfinder"; version="1.6.0"; sha256="01jr6pds2r5h7fmm9z0rajiavx7fh4zxf623s1rdjg9ir6njq5m5"; depends=[ATACseqQC baseline BiocGenerics corrplot csaw EmpiricalBrownsMethod GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma metap Rsamtools rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; }; - NBSplice = derive2 { name="NBSplice"; version="1.0.3"; sha256="01ws1v6bks41iw2hbzprwbjx0rf0m10nh1wkfk48qzxzsvlfxn5y"; depends=[BiocParallel car edgeR ggplot2 MASS mppa reshape2]; }; + NADfinder = derive2 { name="NADfinder"; version="1.6.1"; sha256="0kz7dz95kdz5dz05bh7x6czrwdr1imaq1mv6bncxxhv1mffhmb9v"; depends=[ATACseqQC baseline BiocGenerics corrplot csaw EmpiricalBrownsMethod GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma metap Rsamtools rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; }; + NBSplice = derive2 { name="NBSplice"; version="1.0.6"; sha256="1nalcpj7n4qghmkrfq65xd4i0aack2yq4l2wwsy4z0sfi7gh6m49"; depends=[BiocParallel car edgeR ggplot2 MASS mppa reshape2]; }; NCIgraph = derive2 { name="NCIgraph"; version="1.30.0"; sha256="16mxxrq6g4szig29cah2a13qp1ybsh8ci37izlq6gpxn0h00maym"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; }; NGScopy = derive2 { name="NGScopy"; version="1.16.1"; sha256="1zfasfbzzay402igag1ynffz2v9ad70wdy5vs02q0api3rkkn406"; depends=[changepoint Xmisc]; }; NOISeq = derive2 { name="NOISeq"; version="2.26.1"; sha256="1wyhhi9ydlbjlz427093mdp5ppby77n37w5c2iyxlpsdk2m2nqsn"; depends=[Biobase Matrix]; }; @@ -561,7 +561,7 @@ in with self; { ORFik = derive2 { name="ORFik"; version="1.2.1"; sha256="0x8pj6j3g8gq3i6fqgnd85s60kadq4shjr4hykf00f9zzkj3gnv9"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rcpp Rsamtools rtracklayer S4Vectors]; }; OSAT = derive2 { name="OSAT"; version="1.30.0"; sha256="12cswkscavbkx8cxj0kzk6gz1h8xwp24mwy53dgyr771sch76k7j"; depends=[]; }; OTUbase = derive2 { name="OTUbase"; version="1.32.0"; sha256="0xhwa9yd0qd86j03190riff5z64h93pn7q0b6qb2awwf5zrda8fs"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; - OUTRIDER = derive2 { name="OUTRIDER"; version="1.0.3"; sha256="08zyyybcqa2izj36ckgz6phgqxk4bj56bg1q3sya6j5rdjhbvf7n"; depends=[BBmisc Biobase BiocGenerics BiocParallel data_table DESeq2 GenomicFeatures GenomicRanges ggplot2 ggpubr gplots IRanges matrixStats pcaMethods plotly plyr PRROC RColorBrewer Rcpp RcppArmadillo reticulate S4Vectors scales SummarizedExperiment]; }; + OUTRIDER = derive2 { name="OUTRIDER"; version="1.0.4"; sha256="0wivnc4dd8zlz7305jjps3iid5sjcy3z1q6sb5yj56i81hz5734j"; depends=[BBmisc Biobase BiocGenerics BiocParallel data_table DESeq2 GenomicFeatures GenomicRanges ggplot2 ggpubr gplots IRanges matrixStats pcaMethods plotly plyr PRROC RColorBrewer Rcpp RcppArmadillo reticulate S4Vectors scales SummarizedExperiment]; }; OmaDB = derive2 { name="OmaDB"; version="1.2.2"; sha256="16qy6p36mkw4fkyp9yis56zyn88x780767ahnqhnyzqlm9g5kv5w"; depends=[ape Biostrings GenomicRanges httr IRanges jsonlite plyr topGO]; }; OmicCircos = derive2 { name="OmicCircos"; version="1.20.0"; sha256="1akb3djkq0waq1f81zi3nnv8svqf2i8w9agaac732vbdr4cf821d"; depends=[GenomicRanges]; }; OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.14.0"; sha256="00a8wwk0z73ipdhjlwkwz4nqpjpyylafds88g8dhz0imk8f24gnj"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; }; @@ -625,7 +625,7 @@ in with self; { R3CPET = derive2 { name="R3CPET"; version="1.14.0"; sha256="0ifvifwilpski32pp1z904s97f5g109b8d4l5yds6alpl9663hls"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; }; R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.32.0"; sha256="15a9jfb5c9mnpas3qvq7ca90y8y1yfqbvhgz7k51rzyynzh5nkx8"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; }; R4RNA = derive2 { name="R4RNA"; version="1.10.0"; sha256="1n6fhlj0rmk67gdzknx3fysyg46r5lcqrilqq5rhdzrr4gacwx3j"; depends=[Biostrings]; }; - RBGL = derive2 { name="RBGL"; version="1.58.1"; sha256="1l5x2icv9di1lr3gqfi0vjnyd9xc3l77yc42ippqd4cadj3d1pzf"; depends=[graph]; }; + RBGL = derive2 { name="RBGL"; version="1.58.2"; sha256="0vhnh47pswnp27c0zqcbnnsayfmq3cxcgrs9g860555ldqfl4cyl"; depends=[graph]; }; RBM = derive2 { name="RBM"; version="1.14.0"; sha256="1yr1qjc7flgxxjngd55i9xjjc8r7gdhn8j8hwyhd4p5358z2qaqg"; depends=[limma marray]; }; RBioinf = derive2 { name="RBioinf"; version="1.42.0"; sha256="1l2vqnrc6ilsi50zn9f1p174hwc63qhbn05z1ng3d2va3x3qb9hm"; depends=[graph]; }; RCAS = derive2 { name="RCAS"; version="1.8.0"; sha256="0ss5hcg2m7gjji6dd23zxa5bd5a7knwcnada4qs5q2l4clgk39ad"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; }; @@ -665,14 +665,14 @@ in with self; { RTCA = derive2 { name="RTCA"; version="1.34.1"; sha256="0hhk3py6d1r4rl8xim2z3j266dx1bnxk1pxc24k61k5ni05nxjpw"; depends=[Biobase gtools RColorBrewer]; }; RTCGA = derive2 { name="RTCGA"; version="1.12.1"; sha256="15ibhz60z2fgvpji8kdmpvsdprzqnc0wk4gd6kdrkr4m2s0jgw4j"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; }; RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.12.1"; sha256="05gmj49hz4mdpsmp1brzha3swybgm1sqf6jyhnj8w2arwc0bh72y"; depends=[BiocGenerics data_table DelayedArray GenomeInfoDb GenomicRanges IRanges limma RaggedExperiment RCircos RCurl RJSONIO S4Vectors stringr SummarizedExperiment survival TCGAutils XML]; }; - RTN = derive2 { name="RTN"; version="2.6.2"; sha256="1r47a2v413h9s746c8jd4n98jf61jvj57hmr7xdw47dhj5xrpf0q"; depends=[data_table igraph IRanges limma minet mixtools RedeR S4Vectors snow SummarizedExperiment viper]; }; - RTNduals = derive2 { name="RTNduals"; version="1.6.0"; sha256="07lv2papqcihzkkax87fhgayzydygh9r5rp9209qf2rds7m45fa3"; depends=[RTN]; }; - RTNsurvival = derive2 { name="RTNsurvival"; version="1.6.0"; sha256="07kkrgpwd84ai8fpz63gqarz4kyddjqprsqbhjm4zmlhvbfibshq"; depends=[RColorBrewer RTN RTNduals scales survival viper]; }; + RTN = derive2 { name="RTN"; version="2.6.3"; sha256="1g0xpm31h9yj68cl0pqhlr386hjg0781gp4wcr4hcf52s812wvw5"; depends=[data_table igraph IRanges limma minet mixtools RedeR S4Vectors snow SummarizedExperiment viper]; }; + RTNduals = derive2 { name="RTNduals"; version="1.6.2"; sha256="13f9gw0nrmcznyjcixgk615c1zfyf8w8j30psq66fnsiyjr45p8x"; depends=[RTN]; }; + RTNsurvival = derive2 { name="RTNsurvival"; version="1.6.2"; sha256="0npmn1x5w8g15m14br44zc9vivxlbvgfa74gsa07gbsvlsm466dn"; depends=[RColorBrewer RTN RTNduals scales survival viper]; }; RTopper = derive2 { name="RTopper"; version="1.28.0"; sha256="0blpza1kq7qh9yb15hrmkfrc7awljafwxkr5kq368yk2gkvjny91"; depends=[Biobase limma multtest]; }; RUVSeq = derive2 { name="RUVSeq"; version="1.16.1"; sha256="0qk7q3ab7k133divfkp54zsmvsmb9p8r09pkh2caswrzrn8achzv"; depends=[Biobase EDASeq edgeR MASS]; }; RUVcorr = derive2 { name="RUVcorr"; version="1.14.0"; sha256="05lg37rmf9skqcpnd08v6wnh7sfs449hwwq6nw2hkgy9faip14lz"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; RUVnormalize = derive2 { name="RUVnormalize"; version="1.16.0"; sha256="1habqdv35v9ypvfmfaxjqpka67bs6hzf4ph9b0gqd67mbfnb49dv"; depends=[Biobase RUVnormalizeData]; }; - RVS = derive2 { name="RVS"; version="1.4.1"; sha256="0jvw1qvmsgnn5v4dy3aynfnic8njk1h376k4j2xh47dv93d0kg5v"; depends=[gRain kinship2 snpStats]; }; + RVS = derive2 { name="RVS"; version="1.4.4"; sha256="1zvbin60p81qyk2c0m88dl94ivzyf4cpjdf2hnw8igmvlxszmb8k"; depends=[GENLIB gRain kinship2 snpStats]; }; RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.6.0"; sha256="1w02nnxpmx05gn6d9kjnahdn9kynbg1szm96c03gh4961zknn3r3"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; RandomWalkRestartMH = derive2 { name="RandomWalkRestartMH"; version="1.2.0"; sha256="022vckcc46bkhfhi2fzgawhf54hi6y2p5ia4v3x3lj221d7hcaax"; depends=[dnet igraph Matrix]; }; RankProd = derive2 { name="RankProd"; version="3.8.0"; sha256="0jmpwpmj3y13ylk7riyicywpring14dhq4862jgalsjjwa22zzd0"; depends=[gmp Rmpfr]; }; @@ -697,7 +697,7 @@ in with self; { ReportingTools = derive2 { name="ReportingTools"; version="2.22.1"; sha256="1g9pw6gjc6a81758zd1c1ci9q2wy7jcg3kn3iq77cb0kgbqdb5ia"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; }; Rgin = derive2 { name="Rgin"; version="1.2.0"; sha256="0jj8asqp7p45rlag34m0x2lasw6mdj4rdi4ywnm5bk2cim50pji6"; depends=[RcppEigen]; }; Rgraphviz = derive2 { name="Rgraphviz"; version="2.26.0"; sha256="0bp6517xsih0wng2rgkh9z4r1afqhwl3h04z6ssm7p4cdj0ahm4y"; depends=[graph]; }; - Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.4.2"; sha256="06bxd3wz8lrvh2hzvmjpdv4lvzj5lz9353bw5b3zb98cb8w9r2j5"; depends=[]; }; + Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.4.3"; sha256="0hjhjvg2kss71fkmxlbgnyyy1agwzgq57rxkgkm4riw82x2rvw7q"; depends=[]; }; Rhtslib = derive2 { name="Rhtslib"; version="1.14.1"; sha256="13fv78sk5g0gqfl3ks3rps3zc1k66a4lzxvgn36r7ix43yxk7hnr"; depends=[zlibbioc]; }; RiboProfiling = derive2 { name="RiboProfiling"; version="1.12.0"; sha256="1njvkd1khmf3rbp3dkz5z63wp79z4wmk4kzd3p3amky3w5by070z"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; }; Ringo = derive2 { name="Ringo"; version="1.46.0"; sha256="1zg8sq4hqq3yldghfs1m2jn15qmdk6i1pr7c3aq73a6k99qyzihd"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; @@ -763,7 +763,7 @@ in with self; { Scale4C = derive2 { name="Scale4C"; version="1.4.0"; sha256="12d8l6j57gwnrigzyprfw03rzgsni7n75ws2hi1ldybx7bx3nlag"; depends=[GenomicRanges IRanges smoothie SummarizedExperiment]; }; Sconify = derive2 { name="Sconify"; version="1.2.1"; sha256="141iq9k1psyc25vf1i8hh52i3dckas1l928yjr59p25qng0z4hfy"; depends=[dplyr flowCore FNN ggplot2 magrittr readr Rtsne tibble]; }; SemDist = derive2 { name="SemDist"; version="1.16.0"; sha256="086lparkzxssz78dn67x4f7c3pw45y7gj2ldvhmkfqyynfm57giq"; depends=[annotate AnnotationDbi GO_db]; }; - SeqArray = derive2 { name="SeqArray"; version="1.22.5"; sha256="1fm1r4s7bxckzzd2309j0fa4q3k5bk2ghzwff697kawi5cxb0fhh"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; + SeqArray = derive2 { name="SeqArray"; version="1.22.6"; sha256="1aj6k5vr1rcjavm8q65cw93wwb3kjb1hg74r7nwc5rl94sg0gsan"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; SeqGSEA = derive2 { name="SeqGSEA"; version="1.22.1"; sha256="1c4lfs9bfdmbq732c13fvph5gwp6ac0fxa489al9lghwxnbkjpqf"; depends=[Biobase biomaRt DESeq doParallel]; }; SeqSQC = derive2 { name="SeqSQC"; version="1.4.0"; sha256="1dg4dm45s7l5dgq2cr6g9a5a65jlpf801z3a1x42h36ybgs7gg3j"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; }; SeqVarTools = derive2 { name="SeqVarTools"; version="1.20.2"; sha256="03z40cmymq6agbmp061kvk4xm4cgilb3gyls5ymwyn4p56m0ks2a"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf Matrix rlang S4Vectors SeqArray tidyr]; }; @@ -787,7 +787,7 @@ in with self; { SwathXtend = derive2 { name="SwathXtend"; version="2.4.0"; sha256="0986srxbi3f7pfnhghh9dznwrl9k5qrcmcf1vqa3lg06bwz7pbsc"; depends=[e1071 lattice openxlsx VennDiagram]; }; SwimR = derive2 { name="SwimR"; version="1.20.0"; sha256="0sgci3rs4kak79yibcvxw3mjb30y9q8hacqykrpav2sjyqc6fcy1"; depends=[gplots heatmap_plus R2HTML signal]; }; TCC = derive2 { name="TCC"; version="1.22.1"; sha256="0yfjlr5pgdnkrcv97cqhkm5xdn7dlspbf3fd60ai8zm2iw62x031"; depends=[baySeq DESeq DESeq2 edgeR ROC]; }; - TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.10.4"; sha256="04h3s4gxjpb8pgw7mcmw3mlbdmcxpvb4lc643snvg6z7j3asmykv"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr sesame stringr SummarizedExperiment survival survminer sva tibble tidyr XML xml2]; }; + TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.10.5"; sha256="1p73950jyvnbilpr4rzwmxw2bdi3h7lb2qiaqvm4rahmxmymy9nj"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr sesame stringr SummarizedExperiment survival survminer sva tibble tidyr XML xml2]; }; TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.8.1"; sha256="1bj4pvchg0fj6gifbkg79fi314ssl8zp4rylp2ib0jfliqjx5199"; depends=[caret clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr sesame sesameData shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks TCGAbiolinksGUI_data]; }; TCGAutils = derive2 { name="TCGAutils"; version="1.2.2"; sha256="00wi93lxq06aczjj9g5drs4jy6c4md550hbqxf6p11f07mh7kqcy"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; }; TCseq = derive2 { name="TCseq"; version="1.6.1"; sha256="01lakq59skdivgyb613x4rwxfap9iiccwi2ixd0nl7vw97wsjfc3"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; @@ -816,7 +816,7 @@ in with self; { TnT = derive2 { name="TnT"; version="1.4.0"; sha256="0cza7l550ly35w0c1xjvixgxwdl53v90q0rnb6i7jj6yxgq4ppwq"; depends=[Biobase data_table GenomeInfoDb GenomicRanges htmlwidgets IRanges jsonlite knitr S4Vectors]; }; ToPASeq = derive2 { name="ToPASeq"; version="1.16.1"; sha256="0j54fvcs7ynd6n81x07r2xra3l1fr1yfv8gf46r77gzmcn1y39vs"; depends=[graph graphite Rcpp]; }; TransView = derive2 { name="TransView"; version="1.26.1"; sha256="1y2cdyg0hixm3zxasib18ql9917vnf43cjn9wpkx52fqfwa62ly3"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; }; - Trendy = derive2 { name="Trendy"; version="1.4.4"; sha256="0vmm2gvg3yb5chqj4fg5l0x86zm19vj5zcj32nzgba6c1s38qxhb"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; }; + Trendy = derive2 { name="Trendy"; version="1.4.6"; sha256="0xk3xyx9094ymwfxabgqd0pykwhi8izjpck6dfm16chjlq3hik69"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; }; TurboNorm = derive2 { name="TurboNorm"; version="1.30.0"; sha256="0a3f1zgj914rklrdilcnqfcr4g3mhg1bzfzxr6nn2cqin47hlakp"; depends=[affy convert lattice limma marray]; }; TxRegInfra = derive2 { name="TxRegInfra"; version="1.2.1"; sha256="1qvc0lb3x3s1hv1qw1yih79kdd7pa5wa9wdd94yd8z4vfasmfvav"; depends=[BiocParallel GenomeInfoDb GenomicRanges IRanges mongolite RaggedExperiment rjson S4Vectors SummarizedExperiment]; }; TypeInfo = derive2 { name="TypeInfo"; version="1.48.0"; sha256="0h2jnshr2sgyay3isiapfagjjh4wnff7nw711j4gxw9wg328w24l"; depends=[]; }; @@ -825,7 +825,7 @@ in with self; { UniProt_ws = derive2 { name="UniProt.ws"; version="2.22.0"; sha256="02rb0ygc3pikb8qbi8134n9hjzza4n3bvqbqfl5dqb2n1ibkknmq"; depends=[AnnotationDbi BiocFileCache BiocGenerics rappdirs RCurl RSQLite]; }; Uniquorn = derive2 { name="Uniquorn"; version="2.2.1"; sha256="0wh57344icpd84l4gj7lz2n75mhpw6ywsir7zj4ky83p30x066sr"; depends=[data_table doParallel foreach GenomicRanges IRanges R_utils stringr VariantAnnotation WriteXLS]; }; VanillaICE = derive2 { name="VanillaICE"; version="1.44.0"; sha256="0v4bqcwbbzabmq1pcs55j3jlhqssr2jsr9hxh76p1n7d6fw4dgs6"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; }; - VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.28.11"; sha256="19bxi5b9fzqdjadb8bfm8xsgi6nvrwbgn1xcpk59bnmv9vzjkwrh"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; + VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.28.13"; sha256="1a7b0bg579ynpbfh5dk87fdgl62r9cwk4zmrl61m6zil7881p3gh"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; }; VariantFiltering = derive2 { name="VariantFiltering"; version="1.18.0"; sha256="13z1x1v9xbdzsfn9x66b6sd18pla98cwd5zvxkwaiph8rp8bgvic"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores graph Gviz IRanges RBGL Rsamtools S4Vectors shiny shinyjs shinythemes shinyTree SummarizedExperiment VariantAnnotation XVector]; }; VariantTools = derive2 { name="VariantTools"; version="1.24.0"; sha256="1ml3pl7xnxvzr6zkypr80xzw6nffswk29gzxycn42473sc4ixn7j"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; Vega = derive2 { name="Vega"; version="1.30.0"; sha256="035f2ly3y5i4cirwvfham5kpyawg9scfvfvyn7ys4lyjxx59y4dd"; depends=[]; }; @@ -872,7 +872,7 @@ in with self; { annotationTools = derive2 { name="annotationTools"; version="1.56.0"; sha256="0hqy0mq6pkn05p2dv4pw24p697yvikhdn351adf2ynldy6f3sl9z"; depends=[Biobase]; }; annotatr = derive2 { name="annotatr"; version="1.8.0"; sha256="1rknhlndn9fxa68dbkqjphiv50xqp28vf1259k5w7vlm75vvdkdv"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges readr regioneR reshape2 rtracklayer S4Vectors]; }; anota = derive2 { name="anota"; version="1.30.0"; sha256="182fp6dpws516y0igvwn6936higfqvy25haa0xs273f8aczr9cf0"; depends=[multtest qvalue]; }; - anota2seq = derive2 { name="anota2seq"; version="1.4.1"; sha256="0b8jm1g7kyvrh3h2xxwcrs28yf5bvxp56bxbbhgd51kdd3ww4m79"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; }; + anota2seq = derive2 { name="anota2seq"; version="1.4.2"; sha256="1x2l9c50j8pi8xk85pp4chvfb865zwj4ppaj02bi2lsjgqyda6wm"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; }; antiProfiles = derive2 { name="antiProfiles"; version="1.22.0"; sha256="1div92hqrri8c0y5g37cc4ysi30gcklf82n6g0p98xwv54ks2y7j"; depends=[locfit matrixStats]; }; apComplex = derive2 { name="apComplex"; version="2.48.1"; sha256="01vzk1blgwn0zqdgzhr19haa0ixd78gphxrhjab27n9g8s60i3jg"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; apeglm = derive2 { name="apeglm"; version="1.4.2"; sha256="13yhm14cxw2gmckh7sjr1yy8q2x1wggmnbj2qp6zd7raq4l48qrb"; depends=[emdbook GenomicRanges Rcpp RcppEigen RcppNumerical SummarizedExperiment]; }; @@ -881,14 +881,14 @@ in with self; { arrayMvout = derive2 { name="arrayMvout"; version="1.40.0"; sha256="1m3n2pqm40wsq7x7acspcq268608pnx58mndqfcbv813685b70p5"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; }; arrayQuality = derive2 { name="arrayQuality"; version="1.60.0"; sha256="0fbvlilz111ahlm50gmwwjydpasbplr0lpj3dz9apawi0jff4f4a"; depends=[gridBase hexbin limma marray RColorBrewer]; }; arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.38.0"; sha256="0xhzz9ixc5mp49cwpi4smdgdc3mrf1ppzhx8dpjahq1f7r3xnbb5"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; }; - artMS = derive2 { name="artMS"; version="1.0.10"; sha256="02ma6nsvr0yh8dwwwv29xxv1qm3lyglwagrzxzlys7kdz0crwvsd"; depends=[AnnotationDbi biomaRt bit64 circlize cluster ComplexHeatmap corrplot data_table dplyr factoextra FactoMineR getopt ggdendro ggplot2 ggrepel gplots gProfileR limma MSstats openxlsx org_Hs_eg_db org_Mm_eg_db PerformanceAnalytics pheatmap plotly plyr RColorBrewer reshape2 seqinr stringr tidyr UpSetR VennDiagram yaml]; }; + artMS = derive2 { name="artMS"; version="1.0.11"; sha256="0pcgvqfh6ypgq6ays8qfi4aws21mgkfxjblx0slzp6sz749hhr48"; depends=[AnnotationDbi biomaRt bit64 circlize cluster ComplexHeatmap corrplot data_table dplyr factoextra FactoMineR getopt ggdendro ggplot2 ggrepel gplots gProfileR limma MSstats openxlsx org_Hs_eg_db org_Mm_eg_db PerformanceAnalytics pheatmap plotly plyr RColorBrewer reshape2 seqinr stringr tidyr UpSetR VennDiagram yaml]; }; attract = derive2 { name="attract"; version="1.34.1"; sha256="1370w8qvmiv8r48hk29mlh53xs5a78qpz6pbax7fq7q9xip7fbs0"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; }; bacon = derive2 { name="bacon"; version="1.10.1"; sha256="1pd3p1cfggiy08458vplsy3s1zm5jqqcwrv4fks8ra2kf97j38df"; depends=[BiocParallel ellipse ggplot2]; }; ballgown = derive2 { name="ballgown"; version="2.14.1"; sha256="073jyv98s05cxx8n83c20chh0k1sbw8rndldcdfq3habahllf8si"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; bamsignals = derive2 { name="bamsignals"; version="1.14.0"; sha256="19irfx1y1izf903vq59wxsdbf88g143zy9l89gxqawh7jfxds8w8"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; banocc = derive2 { name="banocc"; version="1.6.1"; sha256="18n273xwc49mr3d7b83nxqivyr5zzgcbv6kajq8ha641f34nasw1"; depends=[coda mvtnorm rstan stringr]; }; basecallQC = derive2 { name="basecallQC"; version="1.6.0"; sha256="0l2w55lc8aknj3ivma3arp96j46hcfzw20k9js3dgx8k3sgalxmn"; depends=[data_table dplyr DT ggplot2 knitr lazyeval magrittr prettydoc raster rmarkdown ShortRead stringr tidyr XML yaml]; }; - bayNorm = derive2 { name="bayNorm"; version="1.0.8"; sha256="192q47w0m0ngj7523fpgq9s8dzgdsi2dkyxa44c6yr5iyqsvyb95"; depends=[BB BiocParallel doSNOW fitdistrplus foreach iterators locfit MASS Rcpp RcppArmadillo RcppProgress SingleCellExperiment SummarizedExperiment]; }; + bayNorm = derive2 { name="bayNorm"; version="1.0.9"; sha256="1jm06y6mv85hpjmn9qqikm3i2x6afzhkcby75r7k9dqg6an5zgra"; depends=[BB BiocParallel doSNOW fitdistrplus foreach iterators locfit MASS Rcpp RcppArmadillo RcppProgress SingleCellExperiment SummarizedExperiment]; }; baySeq = derive2 { name="baySeq"; version="2.16.0"; sha256="0f6yckihm5cwh3dycv2g54hf7nddhcqya4yrqwbir96y5k1d1km5"; depends=[abind edgeR GenomicRanges]; }; bcSeq = derive2 { name="bcSeq"; version="1.4.1"; sha256="0izmzb341h85ixxdriiavwjjpw96r2pd2y9kwx9zi2rrbxa6wakf"; depends=[Biostrings Matrix Rcpp]; }; beachmat = derive2 { name="beachmat"; version="1.4.0"; sha256="07zgmms0qg8gw7x0js46965bbhpfj2aa1h5ixdz9r332bxv9cdmr"; depends=[BiocGenerics DelayedArray HDF5Array Rcpp rhdf5 Rhdf5lib]; }; @@ -898,7 +898,7 @@ in with self; { bgx = derive2 { name="bgx"; version="1.48.1"; sha256="0ygqbqpbrp4hy5dp4g7nn7zrfar855a7bp16dxcv7646vp3yrzk4"; depends=[affy Biobase gcrma Rcpp]; }; bigmelon = derive2 { name="bigmelon"; version="1.8.0"; sha256="1wc5n5cq05a7qv0b46ywbgg1fbz0s8hyf83g861dxw8jhhmnm717"; depends=[Biobase BiocGenerics gdsfmt GEOquery methylumi minfi wateRmelon]; }; bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.30.0"; sha256="0pzqchv9namv73nm2vr6wjny7ghja8bs73s7xp4ixyfg4d1i9h06"; depends=[bigmemory]; }; - bioCancer = derive2 { name="bioCancer"; version="1.10.1"; sha256="0qqigpnq082fr45xg50a0z2s474m65zhd8qkpv3ini0gq8ydq80l"; depends=[AlgDesign AnnotationFuncs Biobase cgdsr clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier htmlwidgets org_Hs_eg_db plyr r_import radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; }; + bioCancer = derive2 { name="bioCancer"; version="1.10.11"; sha256="0v55y3scj9qmiqjvqm4caj3ccchfv1dzmbc5jxgdb39vw1hjqsc2"; depends=[AlgDesign AnnotationFuncs Biobase cgdsr clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier htmlwidgets org_Hs_eg_db plyr r_import radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; }; bioDist = derive2 { name="bioDist"; version="1.54.0"; sha256="1pl6z8yx1pns19y924x79ky4vqx180hifvy7n4mdhv6mjvhjkijl"; depends=[Biobase KernSmooth]; }; bioassayR = derive2 { name="bioassayR"; version="1.20.1"; sha256="1zf1ykmn3wq6jxb6k1v00qna5wjlh4yy7x35x2k6zqgn7df4607z"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; }; biobroom = derive2 { name="biobroom"; version="1.14.0"; sha256="1xfqa666n8h65y277a1g56r1z76x9fn0dnj45cqgx3ddaz0v1nil"; depends=[Biobase broom dplyr tidyr]; }; @@ -923,7 +923,7 @@ in with self; { bumphunter = derive2 { name="bumphunter"; version="1.24.5"; sha256="1f9vk3srffbx8jpza40nd18a4y0p0z8q40mx55dlcnddkwrqi19b"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; cTRAP = derive2 { name="cTRAP"; version="1.0.3"; sha256="14rfnqmp2mgnkyhgyvlplv4alnwm909pw586n7nc53r82ph4m0f0"; depends=[cowplot data_table fgsea ggplot2 httr limma pbapply piano plyr R_utils readr rhdf5]; }; caOmicsV = derive2 { name="caOmicsV"; version="1.12.1"; sha256="1nqa1f5dbx11lfripaz2l7pkymcgi5vbiglhhk0kz4n0p5p1pjz3"; depends=[bc3net igraph]; }; - canceR = derive2 { name="canceR"; version="1.16.01"; sha256="1ddjs8fvjkn8w59p1q3lxpn8s7pcd557f8dnbj6nm6zcpbyp6bll"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; }; + canceR = derive2 { name="canceR"; version="1.16.02"; sha256="1fzhd2mppzs3jkysyqg6brg62d6afxl2cm6dhnyz1sjp2951bvsv"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; }; cancerclass = derive2 { name="cancerclass"; version="1.26.0"; sha256="1fsfxi95iyb2bhy64xdja4231bfs9byzzvdpsf6abd8myqaflcpx"; depends=[binom Biobase]; }; casper = derive2 { name="casper"; version="2.16.1"; sha256="1wr7l1lri00g3fxafhjkj82y3nlh488x9ayjf4x3bcyv20d0lc2a"; depends=[Biobase BiocGenerics coda EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; }; categoryCompare = derive2 { name="categoryCompare"; version="1.26.0"; sha256="1kb4b833wn5qf3d6vic0jf0p0h6dhgcpjnxnqd6b4bhva0y3jcfd"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; }; @@ -941,7 +941,7 @@ in with self; { cghMCR = derive2 { name="cghMCR"; version="1.40.0"; sha256="0h2adfwa6afjik7zi6kn8i7gqbn7x2r7rh8kvi8v8c8y08166d3a"; depends=[BiocGenerics CNTools DNAcopy limma]; }; charm = derive2 { name="charm"; version="2.28.0"; sha256="1shf9f9b0dl5fskify0lqnqnr9rk4hk5rnrx7b028m83zphizxs8"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; }; chimera = derive2 { name="chimera"; version="1.24.0"; sha256="1zkwf6zbg1151br9kafbqs4k4d5h70lbzjgy4x3q5pj3iqwg6j8p"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; }; - chimeraviz = derive2 { name="chimeraviz"; version="1.8.1"; sha256="1nwlbmr99ixh95zwn302c4pknlvc0f7yjq40wm1vcamks5d2l9hy"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings data_table dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph gtools Gviz IRanges org_Hs_eg_db org_Mm_eg_db plyr RCircos RColorBrewer Rgraphviz rmarkdown Rsamtools S4Vectors]; }; + chimeraviz = derive2 { name="chimeraviz"; version="1.8.5"; sha256="0hh1a68g0m8i9iqhmy6r9m7j1diaraj3qryk7lzjr2l97d6q4d8j"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings data_table dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph gtools Gviz IRanges org_Hs_eg_db org_Mm_eg_db plyr RCircos RColorBrewer Rgraphviz rmarkdown Rsamtools S4Vectors]; }; chipenrich = derive2 { name="chipenrich"; version="2.6.1"; sha256="0nm55lfac405spccl9f19p5ij8mdaj6lm7qmaf4xqagsaf5x0pa9"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; }; chipseq = derive2 { name="chipseq"; version="1.32.0"; sha256="1pp1rm5fs3hlar5x4dl3a3b4gara7qwf81dbvka6r1n78hrf9x1b"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; }; chopsticks = derive2 { name="chopsticks"; version="1.48.0"; sha256="0r52z0hjaxinw11jzg8cyhdpg2g1027vd5aiijwi6bmipdzw4sfk"; depends=[survival]; }; @@ -1025,13 +1025,13 @@ in with self; { diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.64.0"; sha256="00f088phbix7wrcjrpf3n2a2ps102sbc85f4fg5sqwdw6bvchk9c"; depends=[minpack_lm]; }; diffHic = derive2 { name="diffHic"; version="1.14.0"; sha256="1yjsvwwai9jflg743nyksj7krm0f2pdy2y2rwnmd3cpwh73yy6al"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit Rcpp rhdf5 Rhtslib Rsamtools rtracklayer S4Vectors SummarizedExperiment zlibbioc]; }; diffcoexp = derive2 { name="diffcoexp"; version="1.2.0"; sha256="1kkm0mw7q81yls750ky9rvx0n9iljgq8j5p9h08yxpr46jc3j8k0"; depends=[BiocGenerics DiffCorr igraph psych SummarizedExperiment WGCNA]; }; - diffcyt = derive2 { name="diffcyt"; version="1.2.10"; sha256="1sfq2irrhc7g8nx74x0qf74zp5nbb1fmhf047fcwm9yf5y0y3cam"; depends=[circlize ComplexHeatmap dplyr edgeR flowCore FlowSOM limma lme4 magrittr multcomp reshape2 S4Vectors SummarizedExperiment tidyr]; }; + diffcyt = derive2 { name="diffcyt"; version="1.2.23"; sha256="08fsvn0phj4f3ih65vizi6bxj6yfwpanran5p79iv28gxbnxzll0"; depends=[circlize ComplexHeatmap dplyr edgeR flowCore FlowSOM limma lme4 magrittr multcomp reshape2 S4Vectors SummarizedExperiment tidyr]; }; diffloop = derive2 { name="diffloop"; version="1.10.0"; sha256="0fi1vvzfifhdgcnal1axn69dqbgpjqsicjgqw6gj41db50zi1fi6"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; }; diffuStats = derive2 { name="diffuStats"; version="1.2.0"; sha256="1hg8scxhndgp0r4m5r7rjliirb4371g9d3lqx2h9mgshadwz5h0r"; depends=[expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; }; diggit = derive2 { name="diggit"; version="1.14.0"; sha256="1kpi1ahwc90mpfwmy6rsf4argf7fss99lr2v0s99aj39m3lwd2dw"; depends=[Biobase ks viper]; }; discordant = derive2 { name="discordant"; version="1.6.1"; sha256="12zh1qm7l7zq310y4n5fimia1jkxm3ia81br0illyna0kx10b9wq"; depends=[Biobase biwt gtools MASS]; }; dks = derive2 { name="dks"; version="1.28.0"; sha256="0md8x07f117clhxmmrqaki5g5y8r13c4yrw8vk6yvcsf9prybdah"; depends=[cubature]; }; - dmrseq = derive2 { name="dmrseq"; version="1.2.3"; sha256="1dy5r96cffwml8g0r40nibz4qjy1x5m64z2ncwi728zp2fxg1hwh"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; }; + dmrseq = derive2 { name="dmrseq"; version="1.2.5"; sha256="1dlzkflfklipirwiam2bi65j6fy9kcpgigyayfiwss3l1nr9dz70"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; }; doppelgangR = derive2 { name="doppelgangR"; version="1.10.1"; sha256="14jlrvx6xb6h8x9qg0fm0hb11dk906ja8vfl1wn6wgdrh8fw6brl"; depends=[Biobase BiocParallel digest impute mnormt SummarizedExperiment sva]; }; drawProteins = derive2 { name="drawProteins"; version="1.2.0"; sha256="13zqpghzpqg92i4mlfmvwx1l1mb7swqmyhisqjp546jzs7vixv25"; depends=[dplyr ggplot2 httr readr stringr]; }; dualKS = derive2 { name="dualKS"; version="1.42.0"; sha256="0mn0mjzncd53wq0jwq2gfcj3mcsfl81hgsaxnf1dqjwqnw4jy1y3"; depends=[affy Biobase]; }; @@ -1046,7 +1046,7 @@ in with self; { eisa = derive2 { name="eisa"; version="1.34.0"; sha256="1717bpmrr1kmd1a8rqlarhqcrk786vjw55shn5sd8c89f25vspdx"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; }; enrichplot = derive2 { name="enrichplot"; version="1.2.0"; sha256="0cxqfpy6py4k3z3lnlkiwx89r4ymfpdc4hm25dfpazqgjflz5is7"; depends=[AnnotationDbi cowplot DOSE europepmc ggplot2 ggplotify ggraph ggridges GOSemSim gridExtra igraph purrr RColorBrewer reshape2 UpSetR]; }; ensemblVEP = derive2 { name="ensemblVEP"; version="1.24.0"; sha256="148phm407clbhp87snazan120bh5hcl90xgbhlwyz0a36i4kjfvc"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; - ensembldb = derive2 { name="ensembldb"; version="2.6.7"; sha256="1wqq0m1fgvgkzq5zr2s9cj2s7qkg9lx3dwwsqixzs5fn52p4dn7f"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; + ensembldb = derive2 { name="ensembldb"; version="2.6.8"; sha256="0gijx2l2y00h6gfj3gfr7rd4vva6qf2vkfdfy5gdmvqlxy84ka38"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; epiNEM = derive2 { name="epiNEM"; version="1.6.0"; sha256="1pzcajgqsm6mvw8i7aav0918856ghndrdp93831s6zmdkgxzpw2v"; depends=[BoolNet e1071 graph gtools igraph lattice latticeExtra minet nem pcalg RColorBrewer]; }; epigenomix = derive2 { name="epigenomix"; version="1.22.0"; sha256="0cyf35fygr3rgkcfqhb9p9xgl1lydqprzhn3m189yqm3xqck41il"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; epivizr = derive2 { name="epivizr"; version="2.12.0"; sha256="0ms29c5vl0nn8p4v1l5falmwc8xb6wa8fjbfwrgpz8dphidp7mnm"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; }; @@ -1056,7 +1056,7 @@ in with self; { epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.10.0"; sha256="0jvx2kc0wqq7rzi1a3lv94i33cgcqhdpny4563kgjcz9g3qaggsd"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; }; erccdashboard = derive2 { name="erccdashboard"; version="1.16.1"; sha256="0xf5nfzjp0jbhyvcia0bxj8rwcmd033gxgvrwrlcq2535v27sdz9"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; }; erma = derive2 { name="erma"; version="0.14.0"; sha256="0hj9iz904rr1y66442lkxjywkw1ydyxxlhmjirawbf09ic5ad4g9"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel GenomeInfoDb GenomicFiles GenomicRanges ggplot2 Homo_sapiens IRanges rtracklayer S4Vectors shiny SummarizedExperiment]; }; - esATAC = derive2 { name="esATAC"; version="1.4.4"; sha256="1azw914d18ny7qw8305gqly3cczr9kr2d0wgnb9fk2kl5zp7pkhm"; depends=[AnnotationDbi BiocGenerics BiocManager Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr motifmatchr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; }; + esATAC = derive2 { name="esATAC"; version="1.4.5"; sha256="0qi6f6pdyjzvsvxl6k5517vkb9c59wwf09439a4g5jx2hp383swq"; depends=[AnnotationDbi BiocGenerics BiocManager Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr motifmatchr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; }; esetVis = derive2 { name="esetVis"; version="1.8.0"; sha256="0n2b7qkgy0gh9jfxi5mgsr8g41141435maq1yniw9mqa3hddwjjp"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; }; eudysbiome = derive2 { name="eudysbiome"; version="1.12.0"; sha256="09lhzfhlmrw6f50c6d21lmyfh3k4hwrg6waiv1qjg6iavhnbc2a0"; depends=[Biostrings plyr R_utils Rsamtools]; }; exomeCopy = derive2 { name="exomeCopy"; version="1.28.0"; sha256="1y475ka8lkf3mh4xj0qvgk0nd0gf497dym9bvl5wpss1fqsks6im"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; }; @@ -1112,7 +1112,7 @@ in with self; { gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.22.0"; sha256="0jvn3h3hn2b8av0c901gbidhrkgkhhm4027qymn5dhg4xsg2dayg"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; }; gCrisprTools = derive2 { name="gCrisprTools"; version="1.10.1"; sha256="148ggbbhvg0ja55zs1vlcjpjgcc50mgfq58ixfi7pifiaszzwh6s"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; }; gQTLBase = derive2 { name="gQTLBase"; version="1.14.0"; sha256="1lbk1m1mkvbk30flk5pf3pcrnm2s0sj5r48kbjgad39dsvd8zgqx"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; }; - gQTLstats = derive2 { name="gQTLstats"; version="1.14.0"; sha256="1sg9kw59dlayj7qxql9pd93d4hmml504sa3kkfpzfh3xri7m5pxf"; 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]; }; + gQTLstats = derive2 { name="gQTLstats"; version="1.14.1"; sha256="1rkbnb3h02fdksc4nacqvmq4jgbj9fz4hm7j51yr2ggcgcykwraa"; 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.28.1"; sha256="017ga7m85qzxvfvg13gilsikc06vr8ggfp07aw36gdn9q8by76d5"; depends=[Biobase coda EBarrays mgcv]; }; gage = derive2 { name="gage"; version="2.32.1"; sha256="02g796sb1800ff0f1mq9f2m5wwzpf8pnfzajs49i68dhq2hm01a8"; depends=[AnnotationDbi graph KEGGREST]; }; gaggle = derive2 { name="gaggle"; version="1.50.0"; sha256="1yj10aahr1pmn7kspiplczalr1awmybr320y49cadh17l3p3i224"; depends=[graph rJava RUnit]; }; @@ -1141,7 +1141,7 @@ in with self; { genomes = derive2 { name="genomes"; version="3.12.0"; sha256="18pwqjr01qwjn93vyf2pfp5n88djyb0vln78m8kl598pcxr7ifkh"; depends=[curl readr]; }; genoset = derive2 { name="genoset"; version="1.38.0"; sha256="1z0iwp5pp3655kd63p3jf5fficd61p1i0g06p2n6pw4q38dp2h28"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; }; genotypeeval = derive2 { name="genotypeeval"; version="1.14.0"; sha256="0xi0n87g5qh1yswr3whv8wvmxswd66j6g8662qsfgy3cs69hxl3m"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; }; - genphen = derive2 { name="genphen"; version="1.10.0"; sha256="184iys5x8pwikrvkn7wh4fcclkcnx5s0pk0s3vhwq6kvi6bhgi8w"; depends=[Biostrings doParallel e1071 foreach ranger rstan]; }; + genphen = derive2 { name="genphen"; version="1.10.3"; sha256="0hjfgy3q4x1ib91cxgszay7fvjaiqi62915pg4z3hd9xd9lpjiqn"; depends=[BH Biostrings doParallel e1071 foreach ranger Rcpp RcppEigen rstan rstantools StanHeaders]; }; gep2pep = derive2 { name="gep2pep"; version="1.2.0"; sha256="1sxkps92hf85svngd5511j3sbwn8904nn9ijn168v7xzzmld3z5y"; depends=[Biobase digest foreach GSEABase iterators repo rhdf5 XML]; }; gespeR = derive2 { name="gespeR"; version="1.14.1"; sha256="1d8jvwnmnd27860n9qk5500mi73kdnvzwkfsqjp0xzz6ji5l9khs"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; }; ggbio = derive2 { name="ggbio"; version="1.30.0"; sha256="0wq49qqzkcn8s19xgaxf2s1j1a563d7pbhhvris6fhxfdjsz4934"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 rlang Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; }; @@ -1156,7 +1156,7 @@ in with self; { goSTAG = derive2 { name="goSTAG"; version="1.6.1"; sha256="0ib9a1v9zblysmk7a6wrg6cj1q6is2s9mranb28nn2r067kfx77l"; depends=[AnnotationDbi biomaRt GO_db memoise]; }; goTools = derive2 { name="goTools"; version="1.56.0"; sha256="0w2mb8g5fnn7vm35cqw437f2sdiba4c72ay1n7frh0z1xc7hqc3r"; depends=[AnnotationDbi GO_db]; }; goseq = derive2 { name="goseq"; version="1.34.1"; sha256="1j87j98cajcjqabv6rb6zmcqxsqxxhbb3w60w1iink4rhsh8m3mn"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; }; - gpart = derive2 { name="gpart"; version="1.0.1"; sha256="0p9cz9x1w9i3y4zjrznw67r2gdh1slm4j2m2wxzga3y9d8wi8s8m"; depends=[AnnotationDbi biomaRt data_table GenomicRanges Homo_sapiens igraph IRanges OrganismDbi Rcpp TxDb_Hsapiens_UCSC_hg38_knownGene]; }; + gpart = derive2 { name="gpart"; version="1.0.3"; sha256="0aqz4b8qbll80xqrf5x9y4y0iw3f94ncvnhw3ifalj2rh39p15cw"; depends=[AnnotationDbi biomaRt data_table GenomicRanges Homo_sapiens igraph IRanges OrganismDbi Rcpp TxDb_Hsapiens_UCSC_hg38_knownGene]; }; gpls = derive2 { name="gpls"; version="1.54.0"; sha256="14sffq2h6hqlzaq1nzw34rkg7nnshfp6k5r3wyvavq6k25384jr0"; depends=[]; }; gprege = derive2 { name="gprege"; version="1.26.0"; sha256="0b2zrxggljfgr8w2ns7h80ymqrvfi8kaliy32k2najm089kpv8dy"; depends=[gptk]; }; graph = derive2 { name="graph"; version="1.60.0"; sha256="1kgnsm6f0vmb9qbkmmrnvxbwqc0gar17dq5gv1v10hrksw6mh64i"; depends=[BiocGenerics]; }; @@ -1217,13 +1217,13 @@ in with self; { iteremoval = derive2 { name="iteremoval"; version="1.2.0"; sha256="0xmx4k6h8ii2mfqik5kkx7gwmhn4br8a7pnqv4bk9dbvphaqknk8"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; }; ivygapSE = derive2 { name="ivygapSE"; version="1.4.0"; sha256="0r9j2r0n5hw75ylbc8scq070p4kazc4m9vrjcbxvfkyv22qppjr2"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; }; joda = derive2 { name="joda"; version="1.30.0"; sha256="1v21j6maydhfxixfa27napp1k59f1jngz7p9hidijmm4nqbg4w60"; depends=[bgmm RBGL]; }; - karyoploteR = derive2 { name="karyoploteR"; version="1.8.5"; sha256="00qxhnwhrj0w35jqhh2j1pmlh9kcm6xjfb20py8ixyxh4bvblr1k"; depends=[bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; }; + karyoploteR = derive2 { name="karyoploteR"; version="1.8.8"; sha256="0hfv89383m5l4r3aswgscjl2r35b7k7wlgslj8il41grbzz3a55p"; depends=[bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; }; kebabs = derive2 { name="kebabs"; version="1.16.0"; sha256="1ibxymqpiq85a5zs5wrngkyjqvwb4n5k2jxiics4mqv28pg34023"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; keggorthology = derive2 { name="keggorthology"; version="2.34.0"; sha256="107wi6mlrz15pgwg7jrlb3q771v0yhxqph5i5c0h6v3yzr47xx15"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; kimod = derive2 { name="kimod"; version="1.10.0"; sha256="081vanahyk3figp6jc9cjvq9lrn1mchc08wbw79f6k5sind4ic7z"; depends=[Biobase cluster]; }; kissDE = derive2 { name="kissDE"; version="1.2.0"; sha256="0vqg7gjcj6z0v5ngj3z6zrmh5kdyk7hghj38yv7vp36miiqzrlw6"; depends=[aod Biobase DESeq2 doParallel DSS foreach ggplot2 gplots matrixStats]; }; lapmix = derive2 { name="lapmix"; version="1.48.0"; sha256="12s3k81bysmmqc6r524jsx9yv0vyd5ppw1xs7myk2y7067355wxc"; depends=[Biobase]; }; - ldblock = derive2 { name="ldblock"; version="1.12.0"; sha256="0xbf4pmhrk5fnd1iz5wzjvdr75v114bwpznhcig4wiqmxc27sips"; depends=[BiocGenerics erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; }; + ldblock = derive2 { name="ldblock"; version="1.12.1"; sha256="01lf74pby7si2g3kgc10qzr6lkcbigqcgqs2j3anc38vzxv0zhwv"; depends=[BiocGenerics erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; }; les = derive2 { name="les"; version="1.32.0"; sha256="0iv4srhkirw2ix0a2bv44byydwxgihy027wahcskamm6dzk0k9lz"; depends=[boot fdrtool gplots RColorBrewer]; }; levi = derive2 { name="levi"; version="1.0.0"; sha256="177zjvijca57f0hr4wb3zr83is3bgag5yfc07p9azic64ilwfqdb"; depends=[colorspace dplyr DT ggplot2 httr igraph knitr RColorBrewer Rcpp reshape2 shiny shinydashboard shinyjs testthat xml2]; }; lfa = derive2 { name="lfa"; version="1.12.0"; sha256="1lvkycg4d7grqj7x5s3bcq2h4936kvd75r029zsa9mxdakc94kld"; depends=[corpcor]; }; @@ -1297,7 +1297,7 @@ in with self; { miRSM = derive2 { name="miRSM"; version="1.0.0"; sha256="09z2ca1qpf2m3s5cc59y4xzcixlbl847c17lx1kmrakabqpsxy8i"; depends=[BiBitR BicARE biclust Biobase dynamicTreeCut fabia flashClust GFA GSEABase iBBiG igraph isa2 linkcomm MCL miRsponge NMF PMA Rcpp rqubic runibic s4vd SummarizedExperiment WGCNA]; }; miRcomp = derive2 { name="miRcomp"; version="1.12.0"; sha256="17b6bq70d6ly09vma5mdlk54620jdxw6k4bwdyxgghyk7kwmd753"; depends=[Biobase KernSmooth miRcompData]; }; miRmine = derive2 { name="miRmine"; version="1.4.0"; sha256="0zfdm5d6ifkq55v38xcjwzq19ifh6jgbg1pjp298mn15yjsjzfj1"; depends=[SummarizedExperiment]; }; - miRsponge = derive2 { name="miRsponge"; version="1.8.1"; sha256="1nxcdmsvbn0y0pgv74xl3lp6sgddax2mrh2hrqvz7q0hm1gljd26"; depends=[clusterProfiler corpcor DOSE igraph linkcomm MCL org_Hs_eg_db Rcpp ReactomePA survival varhandle]; }; + miRsponge = derive2 { name="miRsponge"; version="1.8.2"; sha256="0cpbhbjsb7sr3rjmc4cjn18j2rycma941qrwcjz8gyd4kgafd78f"; depends=[clusterProfiler corpcor DOSE igraph linkcomm MCL org_Hs_eg_db Rcpp ReactomePA survival varhandle]; }; microRNA = derive2 { name="microRNA"; version="1.40.0"; sha256="1asrjljh4bxgzvbgnp72sqyqv13kvzbfdn3jy01v3l98dppjnwsf"; depends=[Biostrings]; }; microbiome = derive2 { name="microbiome"; version="1.4.2"; sha256="0amla1m69axhlslbg1pbvl61qyxb6qjpdfd5g2j8b116h8xrmyab"; depends=[dplyr ggplot2 phyloseq reshape2 tidyr vegan]; }; mimager = derive2 { name="mimager"; version="1.6.0"; sha256="097fv7wfj0wj0chijcl5v52lf35pc48va1ddsq6qii5xzi626cpd"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; }; @@ -1369,7 +1369,7 @@ in with self; { openPrimeRui = derive2 { name="openPrimeRui"; version="1.4.1"; sha256="163a8frs637yvm6vqhi7sxashkbdc61m8mb5lc6n0i98zicmaj4p"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; }; oposSOM = derive2 { name="oposSOM"; version="2.0.0"; sha256="190sg040nxjja0phmw9k81s139756qsnk1pac3cby21ml6hwbr0j"; depends=[ape Biobase biomaRt fastICA fdrtool igraph pixmap Rcpp RcppParallel scatterplot3d tsne]; }; oppar = derive2 { name="oppar"; version="1.10.0"; sha256="012ypy3z2dgm6ddmbrq3vyyf5yk9ac18gs733s70jv61z2bd1rlw"; depends=[Biobase GSEABase GSVA]; }; - pRoloc = derive2 { name="pRoloc"; version="1.22.1"; sha256="1rgxj737nsbql88gvbqa98ivkawmxj7ij1iidspn8frwg3jk2x2s"; 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]; }; + pRoloc = derive2 { name="pRoloc"; version="1.22.2"; sha256="14psqkyiwghv51irngrc1r0h47dh8cjz4z1b9x6nas3a1wzbicc2"; 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.16.0"; sha256="13z6zd7m7hsjvm52lgy9v8ypkr6gs190c26qs0yzq7s4vfq48db2"; depends=[Biobase dplyr DT ggplot2 MSnbase pRoloc scales shiny]; }; paircompviz = derive2 { name="paircompviz"; version="1.20.0"; sha256="1iraq8n5q24zz3xdv15wiyhd5avz0yr6hh1mzygypp8bmhkgcixv"; depends=[Rgraphviz]; }; pandaR = derive2 { name="pandaR"; version="1.14.0"; sha256="0jm5xxxynrh08l0iz0wj7jl120a6vsglppryjhl4mgv7cs5pdx9w"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; }; @@ -1395,7 +1395,7 @@ in with self; { pgca = derive2 { name="pgca"; version="1.6.1"; sha256="1j55i52lz6k6bmvxw8vvbynmka43bcd857rl2dc5li5h3c04ympg"; depends=[]; }; phantasus = derive2 { name="phantasus"; version="1.2.1"; sha256="0nd4zfazkbny94s7jnvj8flnxdvhlv4878w0hklf0fnsyzgc9am9"; depends=[assertthat Biobase ccaPP fgsea GEOquery ggplot2 gtable htmltools httpuv httr jsonlite limma Matrix Matrix_utils opencpu pheatmap protolite rhdf5 Rook scales stringr svglite]; }; phenoTest = derive2 { name="phenoTest"; version="1.30.0"; sha256="0m9ginyg2jda48ihkvalzs89xpn3bshnyli26s0mb91hhdjcn55c"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; }; - phenopath = derive2 { name="phenopath"; version="1.6.0"; sha256="01xh4yf2h63p1zgh7a68wl7yyfyg50kixii2bcckvhvlw7ywsq1d"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; }; + phenopath = derive2 { name="phenopath"; version="1.6.7"; sha256="1bx7v90r180kb8rybhlh26zmq7n3110z7xqyy3cczzp6jrlwycr8"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; }; philr = derive2 { name="philr"; version="1.8.1"; sha256="1rdgz4x54m2wlqrhr4nn26q28gzmlivsppzjj8h8g6h1gy7iqsj5"; depends=[ape ggplot2 ggtree phangorn tidyr]; }; phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.6.0"; sha256="186580zsbbvjz1nck1nrnp81yfyll0rzpbfij127h26ghq49lccc"; depends=[matrixStats plyr]; }; phyloseq = derive2 { name="phyloseq"; version="1.26.1"; sha256="13ap1jj6rh82f5x6x2cb29c6p3q3rfg86i0dzmj2f0lvsnhr9spw"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; }; @@ -1417,7 +1417,7 @@ in with self; { polyester = derive2 { name="polyester"; version="1.18.0"; sha256="0acwamzwhqbavv0pxah20230mlanncc71lwbbxwki948j1qvg3rp"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; }; powerTCR = derive2 { name="powerTCR"; version="1.2.0"; sha256="16x8kzidv6d2zm61jw47dgr047ijfkm18xddkk70qxgkrqc0gdpa"; depends=[cubature doParallel evmix foreach magrittr purrr tcR truncdist vegan VGAM]; }; ppiStats = derive2 { name="ppiStats"; version="1.48.0"; sha256="1aclxj5y32rca97qv5gqfgsq2aly35gs12jxbvwikwbw6hwvi6pn"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; }; - pqsfinder = derive2 { name="pqsfinder"; version="1.10.0"; sha256="0f0q4vcrwghzv9lg9s4zf46b201nr3ny1b1l56xgd1mw5n7p3mqw"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; }; + pqsfinder = derive2 { name="pqsfinder"; version="1.10.1"; sha256="061105p51shc8ipwrrjflaxdqsyna3hi1ivk1yx5878msvv9pkkx"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; }; prada = derive2 { name="prada"; version="1.58.1"; sha256="0hasynlsbyvircf3njss8kvijkmrc0h7i5cch9x1c7zlsvz9ai6s"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; }; prebs = derive2 { name="prebs"; version="1.22.1"; sha256="0b9x855sqrpiz1rdkl1hrflsg0x6fbdcakkh7602zf14fbbdvdyd"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; }; predictionet = derive2 { name="predictionet"; version="1.28.0"; sha256="0hhxdvc30pdrpc96i4jvdn4q8gycdlk6hi9p8xdgmfin6pp375rk"; depends=[catnet igraph MASS penalized RBGL]; }; @@ -1431,7 +1431,7 @@ in with self; { prot2D = derive2 { name="prot2D"; version="1.20.0"; sha256="0ljggyj557zmbf51cgvq3sl42xqgqh3a2wayyd6s8501ww1xk7fg"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; }; proteinProfiles = derive2 { name="proteinProfiles"; version="1.22.0"; sha256="1jjricjdc9l2lk7m48x3isrzmn8jxsy8x865ijnmqz9zlzgzz8zs"; depends=[]; }; proteoQC = derive2 { name="proteoQC"; version="1.18.1"; sha256="0p2wc5lp7ls80lkjcr5f0zjiq0y9xdallg8yjhprb1cicwxdnd5g"; depends=[dplyr ggplot2 MSnbase Nozzle_R1 plotly plyr reshape2 rmarkdown rpx rTANDEM seqinr tidyr VennDiagram XML]; }; - psichomics = derive2 { name="psichomics"; version="1.8.1"; sha256="1y8yzbjv947kccfzgxka2df5zl58n0wndimhvpffyx8r361dj824"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp recount shiny shinyBS shinyjs stringr SummarizedExperiment survival XML xtable]; }; + psichomics = derive2 { name="psichomics"; version="1.8.2"; sha256="15v0vi348n2xjv0mxis5vbh3a7qzzsgl5ah597xb06dxqxn4q795"; depends=[AnnotationDbi AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools org_Hs_eg_db pairsD3 plyr R_utils Rcpp recount reshape2 shiny shinyBS shinyjs stringr SummarizedExperiment survival XML xtable]; }; psygenet2r = derive2 { name="psygenet2r"; version="1.14.0"; sha256="11vsh96pmbf4ypyszgz3yqr0y3q7rxxd61hx2xhwy4v82fq8il2f"; depends=[BgeeDB Biobase BiocManager biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; }; puma = derive2 { name="puma"; version="3.24.0"; sha256="1mjl2zkf6kxcadb0pcp157hhq4dgrxzjvs5i5s8mfxx54d7i80ih"; depends=[affy affyio Biobase mclust oligo oligoClasses]; }; pvac = derive2 { name="pvac"; version="1.30.0"; sha256="0r92vrsbvbmyqajcldnjfnyigq5ppsh3bgm5h1i299sr4q7m85iv"; depends=[affy Biobase]; }; @@ -1512,7 +1512,7 @@ in with self; { scone = derive2 { name="scone"; version="1.6.1"; sha256="0l1x4cjnfjbpx6k55sjqx03555daa6v63rq0rg6b7jpz8xxzwa7p"; depends=[aroma_light BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SummarizedExperiment]; }; scoreInvHap = derive2 { name="scoreInvHap"; version="1.4.0"; sha256="03d7pny3qkcs279869yry8rkw7js3xyrc8b7p4i7hlpzd44x25a3"; depends=[BiocParallel Biostrings GenomicRanges snpStats SummarizedExperiment VariantAnnotation]; }; scran = derive2 { name="scran"; version="1.10.2"; sha256="07mgilr3gq3lnrm1fjm9zhz4w7970bjhsykln1drqy9gkzj5sn7g"; depends=[beachmat BiocGenerics BiocNeighbors BiocParallel DelayedArray DelayedMatrixStats dynamicTreeCut edgeR igraph limma Matrix Rcpp Rhdf5lib S4Vectors scater SingleCellExperiment statmod SummarizedExperiment]; }; - scruff = derive2 { name="scruff"; version="1.0.1"; sha256="0m7lab7ac1jvp4y092rsyrr4l40gdrqi92khhkq30261f2fm6cf6"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 ggthemes plyr Rsamtools S4Vectors scales ShortRead SingleCellExperiment stringdist SummarizedExperiment]; }; + scruff = derive2 { name="scruff"; version="1.0.3"; sha256="0ckqlmdclpfbm4y32h9625wzh7g1bx6gx2n460m2kqig9r17cfkl"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 ggthemes plyr Rsamtools rtracklayer S4Vectors scales ShortRead SingleCellExperiment stringdist SummarizedExperiment]; }; scsR = derive2 { name="scsR"; version="1.18.0"; sha256="11mf5kv8mk1nlfxd081a7dx1v60yf94cg46b5bjflidp3qhrsi9g"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; }; segmentSeq = derive2 { name="segmentSeq"; version="2.16.0"; sha256="0pljd8hn2vxcsh22wmv53a7wkw3cdxpdv8q4ksfj5mvasa2mmkvi"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; }; semisup = derive2 { name="semisup"; version="1.6.0"; sha256="0lizf5x3abv4g8j4jxmsbbdiqj4f4gybc3jvw7zz12bd3fsj3c1i"; depends=[SummarizedExperiment VGAM]; }; @@ -1528,7 +1528,7 @@ in with self; { seqsetvis = derive2 { name="seqsetvis"; version="1.2.1"; sha256="0x5410b3qwqn34lzs1x75ldlv6xmvdbjyxg8ja0gyg4hz5bc4vaj"; depends=[data_table eulerr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges limma png RColorBrewer Rsamtools rtracklayer S4Vectors]; }; sesame = derive2 { name="sesame"; version="1.0.0"; sha256="01qxdnpkilxv18fpl3rizxri2l7crs62z8nd7ywhxfm6g4ch5l1z"; depends=[DNAcopy GenomicRanges ggplot2 illuminaio IRanges MASS preprocessCore R6 randomForest S4Vectors sesameData wheatmap]; }; sevenC = derive2 { name="sevenC"; version="1.2.0"; sha256="1p2xkv0n8hl9s4dlg54wgry73vnnlzylwximhan2ymnp3hgbg4j0"; depends=[BiocGenerics boot data_table GenomeInfoDb GenomicRanges InteractionSet IRanges purrr readr rtracklayer S4Vectors]; }; - sevenbridges = derive2 { name="sevenbridges"; version="1.12.4"; sha256="14gwmfvbhyzywqmggc3s4g2f6vlxx28ndlibh3a4x7rrny04285i"; depends=[curl docopt dplyr httr jsonlite objectProperties S4Vectors stringr uuid yaml]; }; + sevenbridges = derive2 { name="sevenbridges"; version="1.12.5"; sha256="15rvjlv7abcic06sbvhyy4ii6cccc06xiyk45qk638n279ixl7aa"; depends=[curl docopt dplyr httr jsonlite objectProperties S4Vectors stringr uuid yaml]; }; shinyMethyl = derive2 { name="shinyMethyl"; version="1.18.0"; sha256="0dzg1idkdy4x9h3z5yashrb03ad8ncjxz5j05jlaxx6k4aa7z8j8"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.20.1"; sha256="0lz4jr96g20fbrd34f9km6rj08yb2y09gp7zxnm0inlpdkvb4dby"; depends=[mixtools rTANDEM shiny xtable]; }; sigFeature = derive2 { name="sigFeature"; version="1.0.0"; sha256="0kjf4ss0baq4p7nn305szpvpdssagndxjmggdgfm6mfjsgfi5nj1"; depends=[BiocParallel biocViews e1071 Matrix nlme openxlsx pheatmap RColorBrewer SparseM SummarizedExperiment]; }; @@ -1600,7 +1600,7 @@ in with self; { tofsims = derive2 { name="tofsims"; version="1.10.1"; sha256="0wgpl4az21zbixjl3ngwpxq81i86yhd41lhhnphrvrwnl7n7gk8x"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; }; topGO = derive2 { name="topGO"; version="2.34.0"; sha256="1j1jcd16j564kr6qz28140fzmnh9xasi84v1c1fi98sqv30zq9bh"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; }; topdownr = derive2 { name="topdownr"; version="1.4.1"; sha256="19v8m0lr1y69x1b3k01vlimfi6nzqgjg83ifc7xvzzqfsl45z09w"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR ProtGenerics S4Vectors]; }; - trackViewer = derive2 { name="trackViewer"; version="1.18.0"; sha256="031bamc10gfwdk0vxcrb75yv9qxrk2n5sfwnmsfvbv7n9pdkg7lp"; 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.18.3"; sha256="1i64px5f3iymaz933998b63wf6flal7cbr36v3i7w5xr9p2fnp04"; 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.16.0"; sha256="160zh73yripvd150jfwm1xpk1amrg1qqjcyl8wwclpss0ks04ayb"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; }; transcriptR = derive2 { name="transcriptR"; version="1.10.1"; sha256="17m1i36jj7fdh4qqd29zia68q7yjhxgh47xndcbgbik78pfnnig7"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; }; transcriptogramer = derive2 { name="transcriptogramer"; version="1.4.1"; sha256="1qd447glnwk3ysxnfjyn5i2smyq79mn6qgsa0klrgr3v1909ib57"; depends=[biomaRt data_table doSNOW foreach ggplot2 igraph limma progress RedeR snow tidyr topGO]; }; @@ -1621,7 +1621,7 @@ in with self; { uSORT = derive2 { name="uSORT"; version="1.8.1"; sha256="1z6vlcgs83pc7388c6jwpm9dgv9rr95gsksqy5gaiyy0pa0bga8j"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; }; unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.18.0"; sha256="110kb1g1kkfgk3nw099wyaww8l2jk3kk41bsz3gmbb2jni9v0ykx"; depends=[BiocGenerics HTqPCR]; }; universalmotif = derive2 { name="universalmotif"; version="1.0.22"; sha256="016r859xn2306zsckg0xpwv3ssngngw7drc27h7jhikmf5wkvbv1"; depends=[ape BiocGenerics Biostrings ggplot2 ggseqlogo ggtree gtools processx Rcpp Rdpack]; }; - variancePartition = derive2 { name="variancePartition"; version="1.12.1"; sha256="18z6g633scn8p5s17nr02832i8kh7gvdx8pz1ggx4p5jpdh562v1"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS pbkrtest reshape2 scales]; }; + variancePartition = derive2 { name="variancePartition"; version="1.12.3"; sha256="1ssb41g22440xcv05c3ggfzawjkl3mp74b58spjg5wcwp1rx3xyi"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS pbkrtest progress reshape2 scales]; }; vbmp = derive2 { name="vbmp"; version="1.50.0"; sha256="08iyryhmahmm1p93c0kgvknf9gkd7i4l4jd3b9a234vwx5xy0zx2"; depends=[]; }; vidger = derive2 { name="vidger"; version="1.2.1"; sha256="1gz2v4zg6ry06msmxrr3f47i4gc2sfijrbkd0l5x7crp8a2mkcm3"; depends=[Biobase DESeq2 edgeR GGally ggplot2 ggrepel knitr RColorBrewer rmarkdown scales SummarizedExperiment tidyr]; }; viper = derive2 { name="viper"; version="1.16.0"; sha256="0pi9s37xw03pkqmsyqnigzfjmq9llk0gwh92ply07mbppldssrwc"; depends=[Biobase e1071 KernSmooth mixtools]; }; @@ -1640,8 +1640,8 @@ in with self; { xps = derive2 { name="xps"; version="1.42.0"; sha256="0x391j5rlihp64k5wslghlrw6vi4xwwjphskvl1k3iffda5yqknb"; depends=[]; }; yamss = derive2 { name="yamss"; version="1.8.1"; sha256="13pln09j08fjsr7bj17apy4j0sr79n7jzshi8jbnz57jil7k6ia9"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; }; yaqcaffy = derive2 { name="yaqcaffy"; version="1.42.0"; sha256="192n1zvd54nm9q71vyb6dcr7ia6givf4bjwf6542jjig085lwhxk"; depends=[simpleaffy]; }; - yarn = derive2 { name="yarn"; version="1.8.0"; sha256="1vy8ilnp62bckq587ls42mp1lhkxq9if2l7jlqh12a8bf1848mrg"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; }; + yarn = derive2 { name="yarn"; version="1.8.1"; sha256="0c84x1zq34hadpsyaa873r8kg0jcxp09c2z63377hlmhsll90l7s"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; }; zFPKM = derive2 { name="zFPKM"; version="1.4.1"; sha256="0rvfrjxxvfng9fxxn316gm96v4rahx62vlk3axr2bzjbi1r4s8v5"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; }; - zinbwave = derive2 { name="zinbwave"; version="1.4.1"; sha256="0856rypmmir52rr9w8dy3pg8akqzq326sbk4awn4ik14r9zqpxd2"; depends=[BiocParallel copula edgeR genefilter glmnet Matrix SingleCellExperiment softImpute SummarizedExperiment]; }; + zinbwave = derive2 { name="zinbwave"; version="1.4.2"; sha256="1gsh4wgbdb021hqscm8j4mln55xxwrnqkmnllxn3vvbyf4c6zb08"; depends=[BiocParallel copula edgeR genefilter glmnet Matrix SingleCellExperiment softImpute SummarizedExperiment]; }; zlibbioc = derive2 { name="zlibbioc"; version="1.28.0"; sha256="0bjvzy24kab7ank02cc1qk2ikcz4dllgf66wpsdl0d3zp4gn3l2h"; depends=[]; }; } diff --git a/nixpkgs/pkgs/development/r-modules/cran-packages.nix b/nixpkgs/pkgs/development/r-modules/cran-packages.nix index 34e3b7d25f19..a91c415fe6ab 100644 --- a/nixpkgs/pkgs/development/r-modules/cran-packages.nix +++ b/nixpkgs/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 = "2019-03-10"; }; +let derive2 = derive { snapshot = "2019-04-07"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; }; @@ -36,16 +36,16 @@ in with self; { AF = derive2 { name="AF"; version="0.1.4"; sha256="1ych5b2bin65lk415l8rhql2cpma3djnxvdi8ja1hgd9absm7j04"; depends=[data_table drgee stdReg survival]; }; AFM = derive2 { name="AFM"; version="1.2.4"; sha256="12k0rx7mi45anyg31gbi8ni9jrfh6asp3cbpwvbhl6kv7ypip9ww"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; }; AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; }; - AGHmatrix = derive2 { name="AGHmatrix"; version="0.0.4"; sha256="1l9gk7fl39gwpy5r6fnbzycixj9k22hma2hxlfwqxr3vrvpj66zq"; depends=[Matrix]; }; + AGHmatrix = derive2 { name="AGHmatrix"; version="0.0.5"; sha256="015wyvrrry4vfdg6qhjj3phjnrdx9707sp2mpf7fr67n2irc65d5"; depends=[Matrix]; }; AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; }; - AGread = derive2 { name="AGread"; version="0.2.0"; sha256="0ar4lq3l0dkxwmkp42fxv3834j1y7i14bg5626iz8f3l1a55jz6s"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr reshape2 rlang seewave stringr]; }; + AGread = derive2 { name="AGread"; version="0.2.2"; sha256="08d705fh11ksxijqjlc3ny7rclq7hw12f161h277fjdx71wgn8hp"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr rlang seewave stringr]; }; AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; }; AHR = derive2 { name="AHR"; version="1.5.0"; sha256="0sscw80cz4r1xmdymp9knz0dfans7yzwjwklv7ahafxlflw5527h"; depends=[etm MASS Rcpp RcppArmadillo survival]; }; AICcmodavg = derive2 { name="AICcmodavg"; version="2.2-1"; sha256="0wpzc20mq1vq3r3h0pdbd40kb6afyjxmayswh24g0gmw6h3rdyzq"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; AID = derive2 { name="AID"; version="2.3"; sha256="0p3cjbd6kxdy5igmgzkc2bd3w0p0w1jb9jkn9n0id5lv44b5gskj"; 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.6.2"; sha256="19jpcmg8gijpm6c0mka8hdkxdbw20drid60rmbw9l07rrkls4hgp"; depends=[assertthat data_table digest httr jsonlite RCurl sp stringr wellknown]; }; + ALA4R = derive2 { name="ALA4R"; version="1.7.0"; sha256="1vprq3w8pzla2ffsalpqgzkdv8wqialr45sq0qa0xjdlsrdwxipp"; 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]; }; @@ -56,12 +56,12 @@ in with self; { AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; }; AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="1.0.0"; sha256="1vgncc61gmqhax2a7072jb36bzkycv80xqihkr5qs8jxnqqkndxd"; depends=[]; }; AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; }; - AMIAS = derive2 { name="AMIAS"; version="1.0.2"; sha256="142bp8yaa87dpxkjrbcq57pr65x8q921hb5kxrcpghg157y5byn3"; depends=[limSolve Matrix zoo]; }; + AMIAS = derive2 { name="AMIAS"; version="1.1.0"; sha256="08scimlbr22cjr6fqi13rsvpc52sp4psnhrwir5pfl6qcpl1k22j"; depends=[limSolve Matrix zoo]; }; AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; }; AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; - AMR = derive2 { name="AMR"; version="0.5.0"; sha256="1y1fnbxmrfz04y4lfqszav0m1nr4szqrmpz1a2gbri0c1hqfwygf"; depends=[backports crayon curl data_table dplyr hms knitr rlang rvest tidyr xml2]; }; - ANN2 = derive2 { name="ANN2"; version="2.1"; sha256="0jj01k51hjbclfi97kj595y15y5z3hb736hgzjhjl93rj0l2yp1n"; depends=[ggplot2 Rcereal Rcpp RcppArmadillo reshape2 viridisLite]; }; + AMR = derive2 { name="AMR"; version="0.6.1"; sha256="0vfakzyhrc6pmrq1w3v9h55jpig9addm8vzfxgbvhfslvhxg0c6y"; depends=[backports crayon data_table dplyr ggplot2 hms knitr microbenchmark rlang tidyr]; }; + ANN2 = derive2 { name="ANN2"; version="2.3.1"; sha256="135c7na31ksfh1mmjn63ac7xpnwjlg298cfmw4fsqf6a29nmf98q"; depends=[ggplot2 Rcereal Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; }; ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.3"; sha256="1cmps21lrmk6lh6gx0q9fz2736q7cibfcisvir6hnik3ablv70bn"; depends=[quadprog shiny]; }; @@ -110,6 +110,7 @@ in with self; { AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; }; Actigraphy = derive2 { name="Actigraphy"; version="1.3.2"; sha256="0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574"; depends=[fda SDMTools]; }; 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]; }; ActivityIndex = derive2 { name="ActivityIndex"; version="0.3.6"; sha256="14k6d78s15j7kb7jhixf4msrdjdl28d0r264cbvy41p8dkq7ysvk"; depends=[data_table matrixStats R_utils]; }; AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; }; @@ -134,18 +135,17 @@ in with self; { 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=[]; }; - AlphaSimR = derive2 { name="AlphaSimR"; version="0.9.0"; sha256="08gqy1gbr9wgn3yq66jadg08v3k7n4jdr0rk04gnvqcvmyb16748"; depends=[BH R6 Rcpp RcppArmadillo]; }; + AlphaSimR = derive2 { name="AlphaSimR"; version="0.10.0"; sha256="14fd9d9k88hw7dw2yipbkgxj0aj8mk5ki3kl8v92lm55522nchzz"; 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.5"; sha256="1mnvms3bgc5i0v7wdmfx7nikr8wxyzmqi36sj2fz4qv5b0mf4zpa"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; AmesHousing = derive2 { name="AmesHousing"; version="0.0.3"; sha256="1fr01ka8x8gdnky6cbd2bjlh1lx71gzq440zsknn9kxvf01s6pxm"; depends=[dplyr magrittr]; }; - AmigaFFH = derive2 { name="AmigaFFH"; version="0.2.0"; sha256="02w492lajmykh9hzrgyq6bvk98hpc37h75vc1w2dzf8d0hjsij9f"; depends=[tuneR]; }; + AmigaFFH = derive2 { name="AmigaFFH"; version="0.3.1"; sha256="0mvw5zr7l29fgm6dan285gjnmmzz59a19v8b2w4j035jzbf1vffw"; depends=[tuneR]; }; AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; }; AmostraBrasil = derive2 { name="AmostraBrasil"; version="1.2"; sha256="06y555gl9g89gygrv1rhg8j1bhb38m09mvvw67wvwhdl56j0fqbd"; depends=[foreign RCurl rgdal RJSONIO sp stringr]; }; AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1"; sha256="1vqpahavsksphxjyhd94dghg9ddskbfbs5vl5qcwl3jkjfvl7lwy"; 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.2.2"; sha256="1qcjb0kkcqm8phcb9giiahk79zgv95jlbbsqalbq9h10qxki48ps"; depends=[Rcpp]; }; AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-17"; sha256="1gqhjknqq325m0ryabcdw1r3j5b9xwxg09ndqdcyw4rknc2mdzn1"; depends=[fastICA R_matlab tkrplot]; }; AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; }; AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; }; @@ -155,7 +155,7 @@ in with self; { 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]; }; - AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.2"; sha256="0a34fxinjp30yvglfw3szpb9cm2f3d0wfc80snw7lng3vy2vvijj"; depends=[scatterplot3d shiny smacof]; }; + AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.3"; sha256="03xgnpzy6acb8zrhspjlv75vq46cbiprsm0vy2slcn7665axa60x"; depends=[scatterplot3d shiny smacof]; }; Anthropometry = derive2 { name="Anthropometry"; version="1.11"; sha256="02isyl6imiv4havvjic2gc1d1ppd6yhw2dacnavxrm867f836jq3"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; }; ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.3"; sha256="0h4snigh1yhp34vw52h4b6qbh9c4cvwz2cx8fwvbnw6lslmg5cgv"; depends=[doParallel foreach stringr]; }; @@ -188,11 +188,12 @@ in with self; { AutoStepwiseGLM = derive2 { name="AutoStepwiseGLM"; version="0.2.0"; sha256="0wwi8hg2q1zkf28rq7bj0f9fcxc5hj59hkmk0gl9p8i3rghlyrms"; depends=[caret formula_tools]; }; 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=[]; }; - AzureAuth = derive2 { name="AzureAuth"; version="1.0.0"; sha256="195641zbakc4rzmch1sjbf3rcny1iyr0kmb49hxxnsc2wyzfl358"; depends=[httr jsonlite openssl R6 rappdirs]; }; + AzureAuth = derive2 { name="AzureAuth"; version="1.0.1"; sha256="0wbxgnvsxrwgp5qlphl5lzqyhdwlzklsxdypng26j6b3x1xf5248"; depends=[httr jsonlite openssl R6 rappdirs]; }; AzureContainers = derive2 { name="AzureContainers"; version="1.0.1"; sha256="1k1kwwfzbss3irkvn6z0p5jan98ax0b8mxpcmhjywgn6la6kjs9b"; depends=[AzureRMR httr openssl R6]; }; + AzureGraph = derive2 { name="AzureGraph"; version="1.0.0"; sha256="0x3d1pwffdnzqmh86j0xprd6mdlg1bq71jxz1n417lfwcf6q277i"; depends=[AzureAuth httr jsonlite openssl R6]; }; AzureML = derive2 { name="AzureML"; version="0.2.14"; sha256="1jhlbgfm3mr772hdkfi8jbv5lw8a08yb49sqaa14m1nz4ar9rckv"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; }; - AzureRMR = derive2 { name="AzureRMR"; version="2.0.0"; sha256="1h0pinir8vlnkza64z0f3ndyjb7mdm01wjad3sh3n63pkxcy0wig"; depends=[AzureAuth httr jsonlite openssl R6]; }; - AzureStor = derive2 { name="AzureStor"; version="2.0.0"; sha256="1zzv8a2g8m51vlv3ir725jvgg7mbin3q7ak4hmpmnccjxdw83vi7"; depends=[AzureRMR httr mime openssl R6 xml2]; }; + AzureRMR = derive2 { name="AzureRMR"; version="2.1.0"; sha256="1x9pnx802l16ss72ilf6cdv5wfkqlh0265xqiam9a3l6vwxfcgap"; depends=[AzureAuth httr jsonlite R6 uuid]; }; + AzureStor = derive2 { name="AzureStor"; version="2.0.1"; sha256="0kq8jvcizji0v6ciafalgzzk1yppdc091ayj1pv6mcpn181s1qvj"; depends=[AzureRMR httr mime openssl R6 xml2]; }; AzureVM = derive2 { name="AzureVM"; version="1.0.0"; sha256="0gx3qvml07siz3x81xlbax3wqnwffpjxhdv1i5cnb2w4vccxsg3b"; depends=[AzureRMR R6]; }; B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; }; BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; }; @@ -202,11 +203,11 @@ in with self; { BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; }; BALCONY = derive2 { name="BALCONY"; version="0.2.10"; sha256="1wfy0dmwfzd9jp6g92ld8jqzx97grgq4h6dy4y5063vfd9i4slwx"; depends=[Biostrings dplyr progress readr Rpdb scales seqinr]; }; BALD = derive2 { name="BALD"; version="1.0.0-3"; sha256="1azyqami07g3ax60j0ws3d1qha65k0svn2v5c9pisni0qch5xql0"; depends=[lattice logspline rjags]; }; - BAMBI = derive2 { name="BAMBI"; version="2.0.1"; sha256="0mmigmgh37jbjnaafnisv7i30nfa605r2k3w22mpg1n3lcjdpmdk"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve]; }; + BAMBI = derive2 { name="BAMBI"; version="2.1.0"; sha256="029yzjv6zj54g9g0g4c6aj89dilcasnjipsf2d95n1xkzpvssvyp"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; }; BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.2"; sha256="0yxsgk4p7i8arjkchsiml6lx97inpmaihb61787vcl8kxyx7v6wr"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; }; BANOVA = derive2 { name="BANOVA"; version="1.1.2"; sha256="04f11394z3zni1fxk60zd61kgy1603nfb81wkkqg8jh4997nhbmi"; depends=[coda rjags rstan runjags]; }; - BART = derive2 { name="BART"; version="2.2"; sha256="0rl0yd1fr04mdrp6ma6mp87nddj62hcmxm28h29d95n8wdhjr7c5"; depends=[nlme nnet Rcpp survival]; }; + BART = derive2 { name="BART"; version="2.3"; sha256="0b4mg1c2380via28abakpw9sg9wdwllpgz41zg1ya6mr08z8r7wh"; depends=[MASS nlme nnet Rcpp survival]; }; BAS = derive2 { name="BAS"; version="1.5.3"; sha256="0xf8wd42mlk6dkkiwzf9lyb5fvqmpjsqyzay146d6p2y1zk65lc0"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; @@ -234,9 +235,10 @@ in with self; { 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.2"; sha256="0w35pwv3y00pmi4qjnzii3q44k7lk13x0cmh1zq3cl42gpi31p7f"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; }; + BDEsize = derive2 { name="BDEsize"; version="1.1"; sha256="0bxfl2hgqwxz97qn21j2gm3lc30h64h41ij6w89rdlad4hkz7vxp"; 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.55"; sha256="00cxf4sq9p5m0kadr5h8703jjs05q32mm6qzjf9k21vg26hx5vm8"; depends=[igraph Matrix]; }; + BDgraph = derive2 { name="BDgraph"; version="2.56"; sha256="1g3j2j5zfv1w7prnmssibvzqdfkgqapw8lmgxkwblmpdjw9l0zk8"; depends=[igraph]; }; BE = derive2 { name="BE"; version="0.1.1"; sha256="1ldzj1fvbgmnp0cn7g348md2xskm2q5b7y6l1sm3pa2am8jc7ixa"; 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]; }; @@ -253,16 +255,16 @@ in with self; { BH = derive2 { name="BH"; version="1.69.0-1"; sha256="18mckfwxxv8m8rzaz03mg2h6vhaj7y131h6yasfg0s73nxj47zd0"; depends=[]; }; BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; }; - BHSBVAR = derive2 { name="BHSBVAR"; version="1.0.1"; sha256="0hbj14cwhji4503pq9003xs3z5v7zjvw9slnrhppaxvphap3b9is"; depends=[Rcpp RcppArmadillo]; }; + BHSBVAR = derive2 { name="BHSBVAR"; version="1.0.2"; sha256="0nw7achlkxsgazippj3my2hk854kp4000nvspr9mvcjhr4zjrzxz"; 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.3"; sha256="0p23kahba55gkk6wx10ii6vrni3b7ia2a4jb64ww4kwp86bknx3d"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; }; - BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="3.0-14"; sha256="14d9pab2wafg0r7i2p3jk0shlfs4cqkp15kipspvbbnvds8pqgbg"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; }; + BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="3.1-33"; sha256="1s1xk471nzf8hamcq6yj9jh22c5dg9difqs4ndggdfy7v7jmrnp4"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; }; BIGDAWG = derive2 { name="BIGDAWG"; version="2.1"; sha256="0zvy5sl94qi20gdrnxb2lmadfy7p0wqfngjsf6jc2cgwyzk4gnrj"; depends=[haplo_stats httr knitr rmarkdown XML]; }; BIGL = derive2 { name="BIGL"; version="1.3.0"; sha256="13f5fybhipgxbfsacz2xl9v99blszzlpikrx9iiq73j23x6j44v6"; depends=[ggplot2 MASS minpack_lm 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.0"; sha256="16wfkdj5sa694jqxx78p6vlvlbkh80bgi0qx4wadzvhj2y73n4bq"; depends=[data_table jsonlite minpack_lm rappdirs raster sp]; }; + BIOMASS = derive2 { name="BIOMASS"; version="2.1"; sha256="0d0h97bs93db08hq17dwh5149lk83njrhwsgw73zgll40znl5cpv"; depends=[data_table jsonlite minpack_lm rappdirs raster sp]; }; BIOdry = derive2 { name="BIOdry"; version="0.5"; sha256="0isvqs2bgirxwb7b1dbn70zfx9b4mw7fp33fwmxq0dx6k1r4f87g"; depends=[ecodist nlme]; }; 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]; }; @@ -289,6 +291,7 @@ in with self; { BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; }; BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; }; + BNPmix = derive2 { name="BNPmix"; version="0.1.1"; sha256="1a1lacyvxqkl99xw66ckk2bggq7cqklyg9dqjblx3j5jqq61vv1q"; depends=[ggplot2 Rcpp RcppArmadillo]; }; BNSL = derive2 { name="BNSL"; version="0.1.4"; sha256="0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp"; depends=[bnlearn igraph Rcpp]; }; BNSP = derive2 { name="BNSP"; version="2.0.8"; sha256="03pl4rvcrsd471nb56rsichzyay57ij1pqn3vvi3dpnr6rnfv4xm"; depends=[coda cubature Formula ggplot2 gridExtra mgcv plot3D plyr threejs]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; @@ -306,7 +309,7 @@ in with self; { BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; }; BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; BSquare = derive2 { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; }; - BTLLasso = derive2 { name="BTLLasso"; version="0.1-9"; sha256="13af3mq07xklqlzgwk0rk2qpwgsagv2l60szzn7sadbi3vg6w7cm"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; }; + BTLLasso = derive2 { name="BTLLasso"; version="0.1-10"; sha256="0ab19dcn55nzkl3q865affiqjkd4j9yiil0a7kxcpbm0rva9x6zj"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; }; BTM = derive2 { name="BTM"; version="0.2"; sha256="0cd9yjfip05l3bgp8qvflnaggwl4pw7p9jbj3pflqan8f9gpma5x"; depends=[Rcpp]; }; BTR = derive2 { name="BTR"; version="1.2.4"; sha256="0vf71a36id6zgx0phb0kyry7y9xcdhnincxh3fryzhdigxkahg4h"; depends=[diptest doParallel entropy foreach igraph infotheo poweRlaw Rcpp]; }; BTSPAS = derive2 { name="BTSPAS"; version="2014.0901"; sha256="0ankkhm38rvq06g0jnbvjbja4jv8lg21dsc0rxsy174b1i6vjhwi"; depends=[actuar coda ggplot2 plyr R2OpenBUGS rjags]; }; @@ -324,7 +327,7 @@ in with self; { BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; }; BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.11"; sha256="0gab9iz1ra72hw8j31n97ysyr3cclhgvdxriyjk8wwv2nrmbw12h"; depends=[foreach iterators R6 RColorBrewer rTensor]; }; BacArena = derive2 { name="BacArena"; version="1.8"; sha256="09iknsxcp2yqwa93frzw20d8p0ayzrpwrgmbsd75jagm0iidv7a0"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr Rcpp RcppArmadillo RcppEigen ReacTran reshape2 sybil]; }; - BalanceCheck = derive2 { name="BalanceCheck"; version="0.1"; sha256="09mkssic173glgcn592cb6zmz80kndggqc4hc800f91xnfql0332"; depends=[ade4 mvtnorm]; }; + BalanceCheck = derive2 { name="BalanceCheck"; version="0.2"; sha256="0aal641vfbjk3w6ipwbqqmm9nnxs962hjmpph9wnqaqk5r6s7brs"; depends=[ade4 mvtnorm]; }; BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.5"; sha256="01ayvjfs83dbnk0m9xb7y9rnxxpfpb6w4qjdffd6hdhcn2s5f73d"; depends=[Rcpp SamplingBigData]; }; Ball = derive2 { name="Ball"; version="1.3.7"; sha256="0bf19zvcylx6rjql59gcc561rzj040c4jbi5blz9lykh1fg0z1km"; depends=[gam mvtnorm survival]; }; BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; }; @@ -332,7 +335,7 @@ in with self; { Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; }; 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.3"; sha256="1w9dwzh1yavp8k7zpkddkyxwi0046w4k0dbsjisyniygz4ml8zqq"; depends=[curl dplyr lubridate quantmod rvest scales stringr tidyr XML]; }; + BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.4"; sha256="18i2da0ciy0a95ff00y04nxl2j52z48wzaf3k7f7phama72qivkf"; depends=[curl dplyr lubridate quantmod rvest scales stringr tidyr XML]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.7"; sha256="035658marnw57p4f38g99rwmvmb6hpbq0fhlxp3qbw22zfnnkvs9"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; BatchMap = derive2 { name="BatchMap"; version="1.0.2.0"; sha256="0v3k4xrmsbyhzgmph8xna11dgpp10yxqmss95asrj6n814jxj19b"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; BayClone2 = derive2 { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; }; @@ -415,11 +418,11 @@ in with self; { BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; }; BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.2"; sha256="0la8mi2wadcxwrq882n4zxvihyqkp8m383c28gl9gm4fs8cqwlxi"; depends=[expm Formula lmtest numDeriv]; }; BinarybalancedCut = derive2 { name="BinarybalancedCut"; version="0.2"; sha256="1rs7x7ggqzaz9r2912g0fi9x7przd8gjy6pianx457w5f39fqx4v"; depends=[ggplot2 reshape2]; }; - BioCircos = derive2 { name="BioCircos"; version="0.3.3"; sha256="0l8kd1imb8022n631psm9na0vp502ndn2q7m3mshx9c0mnqsv8n3"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; }; + BioCircos = derive2 { name="BioCircos"; version="0.3.4"; sha256="1gl57r47p5z1wzs94xzc26j2r8z5hpqr4163b01x6jwzvbrlfwhz"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; }; BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; }; BioInstaller = derive2 { name="BioInstaller"; version="0.3.7"; sha256="0xbxv2ln39z70javxbx5rf77yf9zyjif3ppnr3id7cmy24hhqcab"; depends=[configr devtools futile_logger git2r jsonlite liteq R_utils RCurl rvest shiny stringi stringr]; }; BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; }; - BioMedR = derive2 { name="BioMedR"; version="1.1.1"; sha256="19c2alcm28y6qb1ssfni7hq04lnw53apnx9ian0mmji9vd9zlhlz"; depends=[Biostrings ChemmineR fmcsR GOSemSim org_Hs_eg_db pls randomForest rcdk RCurl rjson]; }; + BioMedR = derive2 { name="BioMedR"; version="1.1.2"; sha256="0b72fqp2kkvszv4rrz42xidivy6lk4w92rcq1zjqd9vlkvmgx7h8"; depends=[Biostrings ChemmineR fmcsR GOSemSim org_Hs_eg_db pls randomForest rcdk RCurl rjson]; }; BioPET = derive2 { name="BioPET"; version="0.2.2"; sha256="0zgq7i37d0rnjhlkcrl44x62vhz0njsv2fldm64j9r4wc02z1q9n"; depends=[ggplot2 gridExtra pROC VGAM]; }; BioStatR = derive2 { name="BioStatR"; version="3.0.0"; sha256="1fv37xckhpn0b744r71q7h57pr5j2y0v8hcc97cgzdsqd8p4axmk"; depends=[ggplot2]; }; BiocManager = derive2 { name="BiocManager"; version="1.30.4"; sha256="0kxs76pixk1d2lpvkyrq6nnvv1rqf55ph5f7igkadyyqirf3y2ah"; depends=[]; }; @@ -509,7 +512,7 @@ in with self; { CB2 = derive2 { name="CB2"; version="1.1"; sha256="0gqbwz989j7d7s05d1fnxbnrmhlj92x7hszb1x9knkj1cwwbyly5"; depends=[dplyr ggplot2 glue magrittr metap pheatmap Rcpp RcppArmadillo stringr tibble tidyr]; }; CBCgrps = derive2 { name="CBCgrps"; version="2.3"; sha256="07cy8z1fyr328jpa98sdxwd1vydx8sr93jx79hjn9hgm157240mg"; depends=[nortest]; }; CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; }; - CBPS = derive2 { name="CBPS"; version="0.19"; sha256="0rb04x8lin5p6h0ziiv2zh98qvah5mkpd3qbgrmhczacavvpb8hl"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; + CBPS = derive2 { name="CBPS"; version="0.20"; sha256="016fldahmivs8fr3nmm3azgivnnqgslhc62azcdkfgac37mpm5hw"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; }; CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; }; @@ -520,7 +523,7 @@ in with self; { CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; - CDM = derive2 { name="CDM"; version="7.2-30"; sha256="0g07wf06f21nqmqh9vkn1hc9xzg0wx1fjy6s6j0knfzsxh80fwq9"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; }; + CDM = derive2 { name="CDM"; version="7.3-17"; sha256="06487k920b7alp6b6115zdfb2laaaqwwlhc3zjpzchhsbc6ly4vy"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; }; 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]; }; @@ -531,7 +534,7 @@ in with self; { CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; CFC = derive2 { name="CFC"; version="1.1.0"; sha256="0yhb314qcdxig5vg0nbzvsqiddlsqlm50vzddhpp0z5n3xfa7h2c"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; }; - CGPfunctions = derive2 { name="CGPfunctions"; version="0.4"; sha256="05rfv923bisg8270vc6hnh3sb1fldbyqwdwj7xqghbvcrgch2b4k"; depends=[car devtools dplyr ggplot2 ggrepel rlang scales tibble]; }; + CGPfunctions = derive2 { name="CGPfunctions"; version="0.5.2"; sha256="1pn0ic8j95sf6gjmj6wirb1bffjkswlq6hzydih5j40g53xkyp5g"; depends=[broomExtra car devtools dplyr ggplot2 ggrepel pwr rlang scales sjstats tibble]; }; 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]; }; @@ -546,10 +549,11 @@ in with self; { CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; }; CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; }; CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; }; - CJAMP = derive2 { name="CJAMP"; version="0.1.0"; sha256="0kvmb8vh3dfhdavmvkfmr8293p5lgjws6p7kzmc7r9h6bzmc2hcr"; depends=[optimx]; }; + CJAMP = derive2 { name="CJAMP"; version="0.1.1"; sha256="0caznbqy5hsp7h0gkdbv966vfpq8z1khvbizi4vpc9mxck1nqc99"; depends=[optimx]; }; CKLRT = derive2 { name="CKLRT"; version="0.2.3"; sha256="1d8sg3ncns3fpjaghz1h1z9nfrl31v09xijrzzsias8xjrpi191b"; depends=[MASS mgcv nlme Rcpp RcppEigen]; }; - CLA = derive2 { name="CLA"; version="0.90-1"; sha256="1rpklm21i9rjw0vfhaz9brq9571yjynwfhpv6dp6fbl3cj7bwb8g"; depends=[]; }; + CLA = derive2 { name="CLA"; version="0.95-0"; sha256="1yfi1fvcnyjswfkjhdiq8vlc38fd6z3kpbmqk369laqvy7rk3rk2"; depends=[]; }; CLME = derive2 { name="CLME"; version="2.0-11"; sha256="0p43nnnphzaxrna7y57kgjy2qih535k45s3hxlj89p1x0yhy0mga"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; }; + CLONETv2 = derive2 { name="CLONETv2"; version="2.0"; sha256="0v69pfb2lzq064nkdk7mdbyjzrbih1jpq104jhrshb5cv11lww9w"; depends=[arules ggplot2 ggrepel sets]; }; CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; }; @@ -589,6 +593,7 @@ in with self; { CRANsearcher = derive2 { name="CRANsearcher"; version="1.0.0"; sha256="09gw1s28gb0l2cn4w3asl6zlr7wfacxwafbdrayajwckyfkjl5dl"; depends=[curl dplyr DT lubridate miniUI shiny shinyjs stringr]; }; CREAM = derive2 { name="CREAM"; version="1.1.1"; sha256="1lccpwn6c5pmykgf689gvvpqdcilkys4vclpxjhllhanjrfhcs3q"; depends=[]; }; CRF = derive2 { name="CRF"; version="0.4-2"; sha256="0pgq9xp5qwr221026p5g5qlfwgj9ri1qq8m03pqjxpc6qlr4935l"; depends=[Matrix]; }; + CRFCSD = derive2 { name="CRFCSD"; version="1.0"; sha256="028pqacjg4pb23z976rp6qanx74xs92a4id7875ydvdrgmmi7s14"; depends=[numDeriv orthopolynom Rcpp RcppArmadillo splines2]; }; CRM = derive2 { name="CRM"; version="1.2.4"; sha256="0jv2z1y3zyj1m86p4pmqww58hj8pvid1ss6ym67y46n9srzxsmj5"; depends=[]; }; 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=[]; }; @@ -611,11 +616,11 @@ in with self; { 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="0.99-3"; sha256="1yvv7fgdi4834fw2gai1zxpn8rpvxi92ii1ip14qzscks117z9xc"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; }; + CVXR = derive2 { name="CVXR"; version="0.99-4"; sha256="12y868bn6nahyannzz41j1irjb25aqzi6xicakrzwmq3m0s14wjr"; depends=[bit64 ECOSolveR gmp Matrix R_utils 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]; }; CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; - Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; }; + Cairo = derive2 { name="Cairo"; version="1.5-10"; sha256="1mdmd5zmjkh1b0x928zizgzh42x8swbajffb88rvnjfdhk1z0dvq"; depends=[]; }; CalSim = derive2 { name="CalSim"; version="0.2.2"; sha256="10bk7cgrw71ff3rsabnv35v70p4c8xi8cj5dm2izh7wsbsm5vmpv"; depends=[spatstat]; }; Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; }; CaliCo = derive2 { name="CaliCo"; version="0.1.1"; sha256="16a6hfd3s7dzb6mvpyn4fkdi5irfjsbal7niky2g6p54290va982"; depends=[coda DiceDesign DiceKriging ggplot2 gridExtra gtools MASS Matrix R6 Rcpp RcppArmadillo]; }; @@ -635,6 +640,7 @@ in with self; { CausalImpact = derive2 { name="CausalImpact"; version="1.2.3"; sha256="16qwf1kcs7x6qw18zpabs4zsv3m7xwxixf89krnipydiwlpxjjn6"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; }; CePa = derive2 { name="CePa"; version="0.6"; sha256="1qpxx9x656g678wp190q29vxkb54sfkalg0csg0ndlcvi03dvl3d"; depends=[graph igraph Rgraphviz]; }; + CeRNASeek = derive2 { name="CeRNASeek"; version="1.0"; sha256="016z4wsv6mz622rrvnaxbd6ri21pinahasmdswf62vp9l8jahq25"; depends=[gtools igraph]; }; CensMixReg = derive2 { name="CensMixReg"; version="3.1"; sha256="1r7w84bjdxnkhiw7gh499scc6m3ba9b2a8cwayn6sg5a524yn9gs"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; }; CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; }; @@ -645,7 +651,7 @@ in with self; { ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; }; ChainLadder = derive2 { name="ChainLadder"; version="0.2.9"; sha256="13qllc39gjxysqvzfli769l5igwqy1qwrsr91dsm4si1gvac8g5q"; depends=[actuar cplm ggplot2 lattice MASS Matrix statmod systemfit tweedie]; }; ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; }; - ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.14"; sha256="1rasn1ghk4k0crdvxs9l8xjajdxvjsy7rwx9gz0nf41rw8pm16qa"; depends=[Rcpp RcppArmadillo]; }; + ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.15"; sha256="142sif5za41hrpy6g1606klfdyc4klrcfsb7rizpmp313h1mdp45"; depends=[Rcpp RcppArmadillo]; }; ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; }; Chaos01 = derive2 { name="Chaos01"; version="1.1.1"; sha256="0ibxibmlyc6wkhqj2achwkwdkniin60y8xh8b80nq6ggmm7w9crw"; depends=[]; }; ChaosGame = derive2 { name="ChaosGame"; version="0.4"; sha256="10bq8i6b6zkg8nzq5np998xabyvijizxfbvw1m2nvfh74vxspj4p"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; }; @@ -680,10 +686,9 @@ in with self; { ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; }; ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; }; ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.2"; sha256="178jsjhz3c2aq8bix34rs569qv6l0c8428zi10aadvzkip4xxbk7"; depends=[climdex_pcic multiApply PCICt plyr]; }; - ClinReport = derive2 { name="ClinReport"; version="0.9.1.10"; sha256="1a22cg93rjfriqrg8g92pbzyzprvklw9qfpd7hdml53klmy8svi8"; depends=[dplyr emmeans flextable ggplot2 officer reshape2 xtable]; }; + ClinReport = derive2 { name="ClinReport"; version="0.9.1.12"; sha256="0c0ixr28p8gj3mx2pkrmjvs13g9h8fv1y6ririvrwkbmrdikq7g3"; depends=[dplyr emmeans flextable ggplot2 officer reshape2 xtable]; }; ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; }; - CluMP = derive2 { name="CluMP"; version="0.7"; sha256="10k37ksqv3i5pgrhvi9wl1agpa2hbp95d89sssf91fkxsmdbk3jj"; depends=[amap dplyr ggplot2 MASS NbClust rlang tableone]; }; - CluMix = derive2 { name="CluMix"; version="2.3.1"; sha256="058mxpn399v35k8fa69plkwqzk5qdyifvzvy29m07vl5mfb6mgy4"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; }; + CluMP = derive2 { name="CluMP"; version="0.7.1"; sha256="1vkh0v4q2s7l9f295kw7101v86ar8hb9kdcbzij4rykqdm9pyj18"; depends=[amap dplyr ggplot2 MASS NbClust rlang tableone]; }; ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; }; ClusVis = derive2 { name="ClusVis"; version="1.1.0"; sha256="17cn3hm37jv10aybaidy89kch6814hdi8g44s94xa9li7nixzass"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; ClustBlock = derive2 { name="ClustBlock"; version="1.0.0"; sha256="1qfk2dyx2wnc81x6wc3c6lrbxbwiwyxxvgy89sslwy4c0i61gpp0"; depends=[FactoMineR]; }; @@ -728,8 +733,8 @@ in with self; { CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-5"; sha256="0p1wb97riv9mb4wiyyb1m4n2z6jf8nnfa6znwjdriphdhdwhpnha"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; }; CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.2"; sha256="0zyawv3kh3hxp771bh01jck2cvy3mz92nkv454lk70h35qm4sgrb"; depends=[data_table expm Matrix]; }; CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; }; - Compind = derive2 { name="Compind"; version="2.0"; sha256="1qadyl96c9cmk1i763gc055hgv414ha59418lqk183kwl5sgbqy5"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; }; - Compositional = derive2 { name="Compositional"; version="3.3"; sha256="1javm917fflbjwjvaznfw0dmrajw7wlvhdhqmykxk4jr0wh1hvfq"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; }; + 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.4"; sha256="0sy0y00js53rxjpll67hc9nfcp99mbg268m5qfw1af6ikivk0q4z"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; }; ConR = derive2 { name="ConR"; version="1.2.2"; sha256="0my9cb7psm0zinyfr1p8a53lbfbqf6hx7lfyxkqszckpj7gsg3hr"; depends=[doParallel fields geosphere maptools plyr raster rgdal rgeos sp spatstat spatstat_utils tibble writexl]; }; @@ -737,6 +742,7 @@ in with self; { Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; }; CondIndTests = derive2 { name="CondIndTests"; version="0.1.4"; sha256="0588by7rxrzm2zjigk44snsfv89vkp4fh7y72qm39g57vdz3ykjx"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; }; CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; }; + ConfIntVariance = derive2 { name="ConfIntVariance"; version="1.0.2"; sha256="0xm3vh3vmf16faa3934100rnrg4rvlqkgjlsqa2smzcvy5vb86z4"; depends=[]; }; ConfigParser = derive2 { name="ConfigParser"; version="1.0.0"; sha256="0jjh6gz5qcqhirzkmg7a4lnf8n3mjly15x2mvbvdpjkk7iv3w9m3"; depends=[ini R6]; }; ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; }; CongreveLamsdell2016 = derive2 { name="CongreveLamsdell2016"; version="1.0.1"; sha256="14vxkww10ljrfkz83bl0kmi77yp8gn150h35n9r4jhm6cmaiks8z"; depends=[Ternary]; }; @@ -748,13 +754,14 @@ in with self; { ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.0"; sha256="1hlff3wx8r1wpkhrz0n27wjnzy6z2q8s9smyb906gwwa9xga7njy"; depends=[]; }; ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.4.3"; sha256="0glfnwmfs6xv4d1h5y0859srvj3y68192589mdjcx0jgkgk2c9np"; depends=[lmtest sandwich]; }; ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; }; - CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-7"; sha256="1cs2i0wjrdiksc9cvz733mkf91na6yis8figg4yh9xwv0ndd6y3n"; depends=[dplyr geosphere ggplot2 raster rgdal rgeos rnaturalearth sp tidyselect]; }; + CoopGame = derive2 { name="CoopGame"; version="0.2.1"; sha256="1c11b5l6r5csa6zw5a6lfqaygzhnp5jfdf0vkrxpl7fb4bbxhm31"; depends=[geometry gtools rcdd rgl]; }; + CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-9"; sha256="0a6dps0f3vk3396h1cb2a7vjm58ilalx5272dgkfn1rnym3rld9x"; 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.3"; sha256="0kr558y7l6mlcdj01yq6wc350bxqvhgi3mngxxwi6abqm58sj96i"; depends=[]; }; + Copula_Markov = derive2 { name="Copula.Markov"; version="2.4"; sha256="1qzc1clj6i1msqy6405w2vqxsx8hyzhd4zz6cqirv1zl4r2743vv"; depends=[]; }; Copula_surv = derive2 { name="Copula.surv"; version="1.0"; sha256="1cq12vmsvrxd6anpv6b5jig7x1lf6pj589353h2ba9k0fhkpk51y"; depends=[]; }; - CopulaCenR = derive2 { name="CopulaCenR"; version="1.0.0"; sha256="03w31qh1008jxib1qpfzxasd52pyl4x9nisis35s9c9wmaa5l38j"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; }; + 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.2"; sha256="1njfqz7p5nnr3pw9qkb5kzsv0swwm21mxdb6mz8ynhv7g1958bfp"; depends=[matlab mc2d statmod tensor]; }; + 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]; }; CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; }; CorReg = derive2 { name="CorReg"; version="1.2.8"; sha256="18l9aiv2ipvs14ycnzq99yvnkws38wnj42zbk5jqgv33kn37qbx2"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; }; @@ -775,7 +782,7 @@ in with self; { 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.1"; sha256="0fz7cvyfnf082kf5wymds3rzn4qln4s371i2qlpcmqgsszcxjkvj"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; }; CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; }; - CoxPhLb = derive2 { name="CoxPhLb"; version="1.0.0"; sha256="1j8dvbjv4h0zdjvwvpswdlsb9pf3gxixh2rhl0m1kxm6f6h5ig0z"; depends=[survival]; }; + 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]; }; CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; }; @@ -794,7 +801,7 @@ in with self; { Cubist = derive2 { name="Cubist"; version="0.2.2"; sha256="1m45dpnr5djsfgqlinng6z0f2wbig2vbidlg19r3zcraqwn1agnd"; depends=[lattice reshape2]; }; CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; }; CutpointsOEHR = derive2 { name="CutpointsOEHR"; version="0.1.2"; sha256="0r772zb7g10akcfnf2hnyvpvba4px9pgslyns7drmijdsh0ncnvj"; depends=[survival]; }; - Cyclops = derive2 { name="Cyclops"; version="2.0.1"; sha256="10zx49qhbzgkc18vv4yk1x63ywamxijwir92ls6zbsrdifn412pv"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen survival]; }; + Cyclops = derive2 { name="Cyclops"; version="2.0.2"; sha256="0pgarrk6znfsl75bq8rvrfl371cs5qjy9xb8zp607pwlprwapvfp"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen 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]; }; @@ -806,9 +813,10 @@ in with self; { DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; }; 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="0.1"; sha256="1wzcp9nhpwxgc63vfgmrkx7kg2s0scn5w73ci8dyxy7vqqxl7vb1"; depends=[]; }; DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; - DALEX = derive2 { name="DALEX"; version="0.2.7"; sha256="1vsvliz0q79s5w8n086f0nv8wm5c3rabq1pw0slcifq8ii77d390"; depends=[ALEPlot breakDown factorMerger ggplot2 ggpubr pdp]; }; + DALEX = derive2 { name="DALEX"; version="0.3.0"; sha256="13l435l88r6wqaypxbf8jszc8wv5la1c3ahcxif2jcqlj4b1dks6"; depends=[ggplot2]; }; DALEX2 = derive2 { name="DALEX2"; version="0.9"; sha256="1k39gswksicrb60nx7zzna3mqdm36ckg590iw511ga7frnb8fjl9"; depends=[]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; }; @@ -824,7 +832,7 @@ in with self; { DBfit = derive2 { name="DBfit"; version="1.0"; sha256="19jdf693ygwfchlqvh0kywid14v0b53p33rr2dvmaqmsc6pfxbbf"; depends=[Rfit]; }; DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; }; - DCEM = derive2 { name="DCEM"; version="0.0.1"; sha256="0mk9x17c0jhlgcvn1n98mw8cykims0q0qwd067zzbinwhja2d9sv"; depends=[MASS matrixcalc mvtnorm]; }; + DCEM = derive2 { name="DCEM"; version="0.0.2"; sha256="126qfk1zbmmlcqm7rbrq61z9l5wm4dspqfzglhqjb92m14i2pnm3"; depends=[MASS matrixcalc mvtnorm]; }; DCG = derive2 { name="DCG"; version="0.9.2"; sha256="1s2dz0vnhdhq23fqds1m2jspaz8k5zvd76z1zlbi6nb5ja5n3j3w"; depends=[]; }; DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; }; DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; }; @@ -833,7 +841,7 @@ in with self; { DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; }; DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; }; DClusterm = derive2 { name="DClusterm"; version="0.2-1"; sha256="1xnnm73ivz4pgsszjj5wxzq1f2az110wmn88j89xy2wgk8rp0rab"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; }; - DDD = derive2 { name="DDD"; version="3.7"; sha256="0clcrmdxfvlk8kay9qhx8lxwf22w042l4ffvl097i8pfqlik97g1"; depends=[ade4 ape deSolve expm Matrix phytools pracma SparseM subplex testthat]; }; + DDD = derive2 { name="DDD"; version="3.9"; sha256="0h034y93b7aic1vgnw1jda7db2n6956ybr722mckxkzphzgs53nr"; depends=[ape deSolve expm Matrix phytools SparseM subplex]; }; DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; }; DDIwR = derive2 { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; }; DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; }; @@ -855,7 +863,7 @@ in with self; { 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.2.4"; sha256="0fkzf05p5k22kvicbiizx8aricjkgvkvg2874kmibkycld3qrblq"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; }; - DHS_rates = derive2 { name="DHS.rates"; version="0.6.0"; sha256="0qykxfx7akbn2m48q0pimk6x27kxrr4bv04pylh5ajlli452154c"; depends=[crayon haven matrixStats reshape survey]; }; + DHS_rates = derive2 { name="DHS.rates"; version="0.7.0"; sha256="11rzwwx6vvr66nfklqh6j86k3d0cdccg6l99azwqif0cmj81rdw5"; depends=[crayon haven matrixStats reshape survey]; }; DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; }; DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; }; DIFtree = derive2 { name="DIFtree"; version="3.1.4"; sha256="1q02229vlmyxqasbxiscxvqpcip1r0sbwbp7ja909ljhc5b76pr8"; depends=[gridBase penalized plotrix VGAM]; }; @@ -892,8 +900,8 @@ in with self; { DRR = derive2 { name="DRR"; version="0.0.3"; sha256="1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; DRomics = derive2 { name="DRomics"; version="1.0-2"; sha256="0kvhby807h4ilmrlbcxlmw3rncvg9i428n8rl40v2w865a0p6861"; depends=[ggplot2 limma]; }; - DSAIDE = derive2 { name="DSAIDE"; version="0.7.0"; sha256="0n99d9ry5svp3fpvkzv3z6mfwlnzd7grf4yrsmn6cpw9m2cmy5yz"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr XML]; }; - DSAIRM = derive2 { name="DSAIRM"; version="0.5.5"; sha256="1kkia5qxqliwqfyc14igjqg6qjph46vzdfiacxzb9nhkahay8cf8"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr shiny XML]; }; + DSAIDE = derive2 { name="DSAIDE"; version="0.8.0"; sha256="07nngh3gs7n2myr1fwfqaq9ys56h16mjrha19gxjgsmcf5dp3bi4"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs plotly shiny XML]; }; + DSAIRM = derive2 { name="DSAIRM"; version="0.8.0"; sha256="1mc3xqbciim53d7gglnpgla4c4i0ps3vw83d64rp39wzhrpnxv5c"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; @@ -912,14 +920,15 @@ in with self; { DTRlearn = derive2 { name="DTRlearn"; version="1.3"; sha256="0ngzvjlzn20pff1ihw87nar7riiva4pnfih7hlsr0iszd3v3b1gq"; depends=[ggplot2 glmnet kernlab MASS]; }; DTRlearn2 = derive2 { name="DTRlearn2"; version="1.0"; sha256="0aly8byygpgsjfa1lzarcig2dvz852ihdlw7xhb7kx62y8prjzz1"; depends=[foreach glmnet kernlab MASS Matrix]; }; DTRreg = derive2 { name="DTRreg"; version="1.3"; sha256="1144kcqblyrpdqyj9as6y47iq3x99bf76hdw6j43cmgcs11gapc3"; depends=[]; }; + DTSg = derive2 { name="DTSg"; version="0.1.2"; sha256="0j83ysgw5sq4m4sg4a2k2fpmc8g0xbc9hgnlkmyr1cwl3r4xw4ks"; depends=[assertive_base assertive_numbers assertive_sets assertive_types 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.7"; sha256="1syxw49pzh36nfq0zfr83cwpac86fnj0b7nlqiin4jb00h8vrf6i"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; }; + DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.8"; sha256="1d4ykhy0x2ypfb52n8b2lcyd7nsrcixk7dsnkajc8avkbn4ylgrw"; depends=[ggplot2 KernSmooth shiny]; }; DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; }; DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; }; DWreg = derive2 { name="DWreg"; version="2.0"; sha256="0bgahzgcxz86n0ady97l48zyahv3p2iyc2ivbij1xrfx3wcx3b5n"; depends=[DiscreteWeibull Ecdat maxLik survival]; }; DYM = derive2 { name="DYM"; version="0.2"; sha256="1rk0xs224xi68f0mrygny2rklggl4grk866q7y9xck38bwy7aw94"; depends=[]; }; - DZEXPM = derive2 { name="DZEXPM"; version="1.0"; sha256="0qk93jsfrlbq4b9mgwq0fpyad7w81b0hcfa4xgaahd05p2jbcqrj"; depends=[]; }; + DZEXPM = derive2 { name="DZEXPM"; version="2.0"; sha256="0izwxy1dcwd5fz7407xjlk86yvxxfg0llivbi87qz4f79hlxkbjq"; depends=[]; }; DamiaNN = derive2 { name="DamiaNN"; version="1.0.0"; sha256="09viy1lilz0b29s3myky03981bfnhxjxxgfhdah33cn5x682rbp4"; depends=[caret testthat]; }; DandEFA = derive2 { name="DandEFA"; version="1.6"; sha256="1ir1z76c8742vqdlwv35l4rhr0x7lhghz24g35zn7b30671lypf8"; depends=[gplots polycor]; }; Dark = derive2 { name="Dark"; version="0.9.8"; sha256="1f01aq4g50f07005c8k91cfy9hvl3fmb4yl2924d7512m3884xlv"; depends=[]; }; @@ -929,10 +938,11 @@ in with self; { 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]; }; DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; }; - DataExplorer = derive2 { name="DataExplorer"; version="0.7.0"; sha256="0mhynbsiamcxd208pr75n23ccd5sajlry2c3rl0yxyv7wn6axkyj"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; + DataExplorer = derive2 { name="DataExplorer"; version="0.8.0"; sha256="0s84fcw3iqxddl3mkcflvv09d8j1dwsi25xipp4pikskfgkr5ag4"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; }; DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; }; - DataPackageR = derive2 { name="DataPackageR"; version="0.15.4"; sha256="1q9n0684hi1y87zq25274s2kgdk7slsb2nchww36yy45vlzi3jsn"; depends=[assertthat crayon desc devtools digest futile_logger knitr purrr rmarkdown roxygen2 rprojroot stringr usethis yaml]; }; + DataPackageR = derive2 { name="DataPackageR"; version="0.15.7"; sha256="11bra0kgmvag4mp6hpljd8m3r1306cbncmz3x71iybkahimws813"; depends=[assertthat crayon desc devtools digest futile_logger knitr purrr rmarkdown roxygen2 rprojroot stringr usethis yaml]; }; + DataSpaceR = derive2 { name="DataSpaceR"; version="0.6.3"; sha256="13hbh2wm9vfwzrr5vsq1nyd6670msd47wbq3smdpwk5vwl8w7m35"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; }; DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.6"; sha256="0xw40nq6r64c5z2q3kwnr7nn97ar1mwnzifpd0j3l65nyar9dswf"; depends=[AdaptGauss ggplot2 Rcpp RcppArmadillo sp]; }; DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.3.0"; sha256="1mzdc57jlrmi7v7whgjwjy1pmkq9hn4fr6nwgn0biwdfbk6jc2q5"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; }; DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.0.0"; sha256="1m739q9x5w2xcwx19qm633z6xfijqdgcdvfjj6c5jhn66hc401nq"; depends=[rJava]; }; @@ -958,9 +968,10 @@ in with self; { DengueRT = derive2 { name="DengueRT"; version="1.0.1"; sha256="11qfg4l6y3j8qh4dcsz13xjjj1n0q71c9a3c180nm5lgqv0nwb81"; depends=[drc ggplot2 nlme]; }; DensParcorr = derive2 { name="DensParcorr"; version="1.1"; sha256="1ifkg7cpimf27yhr60rks77r16kmhwa5h10wv7b64sbfncnyzfmj"; depends=[clime gplots]; }; 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.0.4"; sha256="1dh159pvvn2hbjydb9ys8ndblpzpyg72g2hfiqrdi3bkz865xvg5"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; Deriv = derive2 { name="Deriv"; version="3.8.5"; sha256="0815ws2zmla3ici1n8amkc8fz8lwpbg5z68m8j3nhc79m2ikvm20"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.27"; sha256="1rvpkgzc51x6lq3sbdbn9wa0kd4xqih6barnfc4hdkjpm45q7d1s"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; + DescTools = derive2 { name="DescTools"; version="0.99.28"; sha256="001xjyf19c7sy8x7gfs7krjcj39zsbx2cgc5ds3c4p16fhxnw8vg"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.1"; sha256="1hkilb034iqypq5vdxwcjvxrxgmrri89cx4fc04d8yhgd3afaq27"; depends=[DescTools rstudioapi]; }; 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.1"; sha256="1bqq56m4vhmgijxpyllpy08xx29k0p7lhmd0iwa06jdw4lj5rdah"; depends=[dplyr jsonlite magrittr RCurl reshape]; }; @@ -991,7 +1002,7 @@ in with self; { DirectEffects = derive2 { name="DirectEffects"; version="0.2"; sha256="0cawn1i1cyczsr9zpcaky79dfdl9anfjgiaa2404capacnj3call"; depends=[Formula glue sandwich]; }; DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; }; DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; }; - Directional = derive2 { name="Directional"; version="3.4"; sha256="1q3ld6nwd120h6rhf9nwaj8irqks580vgdg7n6pkdhq5q88yhw2h"; depends=[doParallel foreach MASS RcppZiggurat Rfast rgl]; }; + Directional = derive2 { name="Directional"; version="3.6"; sha256="1k6lrsy9gb7d2xbig61m4d1yll7gf8hc7nxnl3gbdg39l5jymncj"; depends=[doParallel foreach MASS RcppZiggurat Rfast Rfast2 rgl]; }; DirichletReg = derive2 { name="DirichletReg"; version="0.6-3.1"; sha256="1lz4b166grrs6vs98mf6a0wg4hvh0p901h697h9dkfhkxw8cqj3f"; depends=[Formula maxLik rgl]; }; DisHet = derive2 { name="DisHet"; version="1.0.0"; sha256="056jcs1qpiyadnmlzd0cj4kp0qzkichxi0pdnxypyq1fsqnpvan3"; depends=[gtools matrixStats]; }; DisImpact = derive2 { name="DisImpact"; version="0.0.3"; sha256="1xmbwhbhb2jyzar8am77zma7l5siyhzna6l69y2068lqrk7l5w32"; depends=[dplyr magrittr rlang]; }; @@ -1003,11 +1014,12 @@ in with self; { DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; }; Distance = derive2 { name="Distance"; version="0.9.7"; sha256="0g2zb7im3l4043bml7akd2cbss3p7mlvds6iv1libimlpy1dr71f"; depends=[mrds]; }; DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; }; + DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.1"; sha256="0ywf7i26lhcibm45g40i84gsnijmg5haz3730yzxlhv7nnnsyj1l"; depends=[AdaptGauss GA ggplot2]; }; DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-0"; sha256="08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl"; depends=[]; }; 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.11"; sha256="0plwvji2rrxmjnf61mj1ijglc9z62n26ijqsf65s35c19qv2g0y1"; depends=[DoE_base]; }; + DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.12"; sha256="1dxz7iv0m6fs92y9m9wija73gnm4xhq5j0z04fnvp8m5v1wynjiy"; depends=[combinat DoE_base]; }; DoE_base = derive2 { name="DoE.base"; version="1.1-1"; sha256="1py9ml1gdibjqklqw2gzrppkgcpp2418sxdbg7ciw9vkwivwbrsn"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.9"; sha256="0l4dxb0f4ql5k3x1avfzs1w54qwjxfp8rl9h9vg6p1zhbkz4qz06"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; @@ -1032,7 +1044,7 @@ in with self; { Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; }; DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; }; - DynTxRegime = derive2 { name="DynTxRegime"; version="4.0"; sha256="0z3pj0nndijf3zg5843757z3gdqnjlrg94wha7v0jg4f4is7grbq"; depends=[dfoptim kernlab modelObj rgenoud]; }; + DynTxRegime = derive2 { name="DynTxRegime"; version="4.1"; sha256="1gjklpyjf9gl1h94v8lhra0vg90bnci7f70nzmvg2gkfyin7jygv"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynaRankR = derive2 { name="DynaRankR"; version="1.0.0"; sha256="1smxgsxl0s5ynlphssd2q59f40zxin8im91fdcvawchc4qj2lmgg"; depends=[dplyr rlang]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; DynamicGP = derive2 { name="DynamicGP"; version="1.1-2"; sha256="0myw6k2jnb1g1cfyacbib5bv43jiv2n451220hv5v87514y3z5kf"; depends=[lhs]; }; @@ -1046,7 +1058,7 @@ in with self; { 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.4"; sha256="14dpja9wr1qqip388c8b6xvdvdpwwmyq5piv182ir0rwrla5nzdb"; depends=[Matrix]; }; + ECOSolveR = derive2 { name="ECOSolveR"; version="0.5"; sha256="0q92ngx3sa2yd7chnvwjpxgk4c1nadf2pv9igxq8qfh1rdrjp7dh"; depends=[]; }; ECctmc = derive2 { name="ECctmc"; version="0.2.5"; sha256="0prryvc17bm1xrhzlqk2w9nj181bg99j1dph3d36h0n1vfq1d7if"; depends=[Rcpp RcppArmadillo]; }; ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.13"; sha256="0dq8ja4ydxnc7qx35qhh9ryqgi7ambwz6ka2821mmq3p994crswn"; depends=[jsonlite shiny]; }; ECoL = derive2 { name="ECoL"; version="0.2.0"; sha256="17j2z05gdh8mbgc4k01m83rgbps9fjf1l6ykql0225bk4ai25h5a"; depends=[cluster e1071 FNN igraph MASS]; }; @@ -1060,8 +1072,9 @@ in with self; { EFDR = derive2 { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; EGRET = derive2 { name="EGRET"; version="3.0.2"; sha256="02c9cakj7szywx0r4rylbdnk63b4npqp2i5x1fhxjy0j5bn0hc2f"; depends=[dataRetrieval fields foreach survival truncnorm]; }; - EGRETci = derive2 { name="EGRETci"; version="2.0.2"; sha256="1dcafjmh84f91xbfj9crb96bcb0vwmf1qazq23736mdd3zwna40f"; depends=[binom EGRET]; }; + 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.0"; sha256="1j634ccs2c13l60spqnlm21089qnajs2s7w8dpvssy6nkzwcfnq1"; depends=[devtools dplyr lubridate plotly RColorBrewer scales shiny viridis xts zoo]; }; EIAdata = derive2 { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; EKMCMC = derive2 { name="EKMCMC"; version="0.1.0"; sha256="0sfj6w8780fik0ar9bg8zrxkj10wqagvwrngd58g50fc0z4lhr53"; depends=[numDeriv]; }; @@ -1076,7 +1089,7 @@ in with self; { EMA = derive2 { name="EMA"; version="1.4.5"; sha256="16iq5a3yrilchqmkyb4g5bmmgpw6psm88n52gmlax75xbiwk8261"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; }; EMAtools = derive2 { name="EMAtools"; version="0.1.3"; sha256="1kzna29kd6s2hgli5azrfz85mbyl1x6knvhhhny2scf7a1fcijsy"; depends=[DataCombine ggplot2 lmerTest sjstats]; }; EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; }; - EMCluster = derive2 { name="EMCluster"; version="0.2-11"; sha256="18h0my8w6wy8jvmwcdw6z5fda0hbwiix7n0z8q2jaj3v23sxxaqx"; depends=[MASS Matrix]; }; + 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="1.0.3"; sha256="04qz4rwq0amy9lp6358qjjql46ky2slqrvipngym5klqvm9vi0zi"; depends=[uuid xml2]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.4"; sha256="1i36s8mzp04alff6lqkc798xjzgn61wdpl5i0awjdvg26ka8v7lj"; depends=[GPArotation limSolve shape shiny]; }; @@ -1109,9 +1122,10 @@ in with self; { 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.4.1"; sha256="07wqrg7mnxmbdf2ibxj5kppl4sd3l608yfhbbsngkhpsrm203qva"; depends=[bit ff]; }; - EValue = derive2 { name="EValue"; version="1.1.5"; sha256="0lfm3458mh1rfcxhr4gm8gls9lssy277fxi5rbkysls88282j4dc"; depends=[devtools ggplot2 metafor msm]; }; + EValue = derive2 { name="EValue"; version="2.0.0"; sha256="1dgvkmcjzgxhdarahsf8l5jrhizp1zm3qw3zx1i6fihy6z580bzk"; depends=[devtools ggplot2 metafor msm]; }; 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]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; EZtune = derive2 { name="EZtune"; version="1.0.0"; sha256="0a74wnmxbvnm1zil0slg4kphvqc1n03y26zp1a0gpawpkfxcmbch"; depends=[ada doParallel e1071 GA gbm mlbench]; }; Eagle = derive2 { name="Eagle"; version="1.3.0"; sha256="1vafvbbclqjp82hgygb6fs84acfcmqlns12rf02abmzb5c080y8q"; depends=[data_table matrixcalc Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; @@ -1124,13 +1138,14 @@ in with self; { Ecfun = derive2 { name="Ecfun"; version="0.2-0"; sha256="1clxwmwd4lmhh7zqspqgn13vrzg40lbqzb0a7b90qla4hk9r4zm4"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML xml2]; }; EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-5"; sha256="1953q374msvdw91m2nagxkwh5r9gnq5qss6l6mf34hayq3kwm8s9"; depends=[d3heatmap 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]; }; - EcoIndR = derive2 { name="EcoIndR"; version="1.4"; sha256="07ny5v03h75yhpi7p4nq5azdx8s6vrrjm0knhgaj6j9indnipmyx"; depends=[]; }; + EcoIndR = derive2 { name="EcoIndR"; version="1.5"; sha256="1qzh2lybfqgnh34w0izvdzz322big4p3r9bwdd9qdazqrcxp5zyf"; depends=[rgeos]; }; EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.2"; sha256="1gz3h97i8bcd3nkkrfl5wwxwjkw0z7qvj1bjksdjplchkag0nk3x"; depends=[ggplot2 igraph]; }; EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; }; EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; 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.3.2"; sha256="1cw0s2jpgb7jkcly5vk96jpdgdy7nlf0ri37ab17f108mi8gb8nn"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg RColorBrewer readr readxl rvest stringi stringr tibble wCorr WeMix xml2 xtable]; }; EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.1"; sha256="1l19k9741p4yjnyiyfg7c064q7j64bzqf3bl6flllmj6qm8v0lwk"; depends=[editrules igraph Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-3"; sha256="05yydwi40m5hrda01l9nj8y3d85l2n04nr39k1kni4zbciinls2b"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; EffectStars = derive2 { name="EffectStars"; version="1.9"; sha256="15n5mrba2s0qxcg3zikfwpxqwv38h39zmvj8sz62ni4pdhrhhjh3"; depends=[VGAM]; }; @@ -1139,12 +1154,12 @@ in with self; { EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; }; ElastH = derive2 { name="ElastH"; version="0.3.1"; sha256="1xgmz0xirvdyjz8l31zb2j91nj0g8ffhvzp44b97473fsj06n1g6"; depends=[dlm]; }; + EleChemr = derive2 { name="EleChemr"; version="0.9.0"; sha256="0lmhgl6501f34h1l1zj09d6m0cjx1x5ciz2bbxwwh57rpvfwz15p"; depends=[ggplot2 matlab pracma]; }; ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26.1"; sha256="09hz283vwg0sdxavqw5rp6izqjf8slvv7sraa355cklz5n27xgag"; depends=[]; }; EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; }; Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; }; - EmiStatR = derive2 { name="EmiStatR"; version="1.2.1.2"; sha256="0csk745ck8mq91fx26cbg0774rmyacgijrv0wmpj9cg9xbb48pqb"; depends=[doParallel foreach lattice shiny xts zoo]; }; - EmissV = derive2 { name="EmissV"; version="0.664.9"; sha256="0y7bmkv5lwlgimc5prfib321z1wq7xvyfgrfv8wk0wb17d6kk0dp"; depends=[data_table lwgeom ncdf4 raster sf sp units]; }; + EmissV = derive2 { name="EmissV"; version="0.665.1.0"; sha256="1xzpsr43pyvmvzbcw66cxv7qs9i8s7pg1w90l3ivx9mz7p8bfz8a"; depends=[data_table lwgeom ncdf4 raster sf sp units]; }; EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.4.0"; sha256="07q8il0hn8jz1h94nic3kxh09yz7biphakbx45xy0spyv23q01m6"; depends=[ggplot2 gridExtra]; }; EncDNA = derive2 { name="EncDNA"; version="1.0.1"; sha256="1mp9blxa29jwimgp58ligayzq3ydfa2sccs2ppn3ki2sqq01xdpp"; depends=[Biostrings]; }; EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; @@ -1175,7 +1190,7 @@ in with self; { EpiStats = derive2 { name="EpiStats"; version="1.2"; sha256="102s7637afm3scif20r75wcfkz9g8k4w55qxv1gqqc1kcmn2zqar"; 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.1"; sha256="16cs9hmr14byy11dapkh8c7ygpkks00lirbbpmy5bxgi4pvif8a3"; depends=[]; }; + Equalden_HD = derive2 { name="Equalden.HD"; version="1.2"; sha256="1lwqnm2xg7x79xajjb4fx5b5yaqs0rn8myb2h52pfgm0v37lzvmb"; depends=[]; }; 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]; }; @@ -1188,11 +1203,11 @@ in with self; { EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; }; Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.12"; sha256="065rd8hwbzanfd0px0nli9szj9afm06a07vxl9bwj9n744whi3r3"; depends=[zoo]; }; EventDetectR = derive2 { name="EventDetectR"; version="0.3.1"; sha256="1nh859q9d2k9fpgyj9g7dvhbhbychhng174mlmyl8x9l7dvmiydx"; depends=[forecast imputeTS]; }; - EventStudy = derive2 { name="EventStudy"; version="0.35"; sha256="0akgik6spy98r6kx098xnls13q5pjbr0av9kvhww8bldhv0q5sqk"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rlang rstudioapi scales shiny stringr testthat tidyquant tidyr]; }; + 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]; }; 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.3.0"; sha256="1d6jzgdyawyvs72jxlw4dxkk6566ya67p6lsj70wdakmaixwfsmj"; depends=[corrplot dplyr DT ggplot2 Hmisc kableExtra lfe lmtest multiwayvcov PKI rio scales shiny shinycssloaders stargazer tictoc tidyr]; }; + ExPanDaR = derive2 { name="ExPanDaR"; version="0.4.0"; sha256="0clvdjhlkjw6wyfczp5lxkn0cmmxhwfna5p454aix7nkqnvck4wa"; depends=[corrplot dplyr DT ggplot2 Hmisc kableExtra lfe lmtest multiwayvcov openssl rio scales shiny shinycssloaders stargazer tictoc tidyr]; }; ExPosition = derive2 { name="ExPosition"; version="2.8.23"; sha256="0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"; depends=[prettyGraphs]; }; Exact = derive2 { name="Exact"; version="1.7"; sha256="0d0h406w2l99gxq6pmh9crxxrvdidcajk7bqzmifl7nfb77vp1av"; depends=[]; }; ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; @@ -1264,7 +1279,7 @@ in with self; { FRK = derive2 { name="FRK"; version="0.2.2"; sha256="0m0ngxanyq19myzza4fb75k9vb67mv17iny847bv9qrgg2vbm5r8"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; }; FRegSigCom = derive2 { name="FRegSigCom"; version="0.3.0"; sha256="0w0yhch75wdx6phf5h4radipgpndv5bfxva2pzzd99fkmws4sswn"; depends=[fda Matrix Rcpp RcppEigen]; }; FSA = derive2 { name="FSA"; version="0.8.22"; sha256="171z8ywr31h38jpgy583hlwdrhp3k4l7blv5ji34nbwdbxbl3hx0"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot withr]; }; - FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; }; + FSAdata = derive2 { name="FSAdata"; version="0.3.7"; sha256="1mvqhmp403m1qqsn490m7mp6hxmbkr9zm3yj3wbni45k1yqhn9kd"; depends=[]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; }; FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; }; @@ -1282,7 +1297,7 @@ in with self; { FactorsR = derive2 { name="FactorsR"; version="1.4"; sha256="1nw63j9bi4x09pgdvdml0w0qxfy1dda5hkxbhd3d6f7rky1z0nyf"; depends=[]; }; Factoshiny = derive2 { name="Factoshiny"; version="1.0.7"; sha256="1s4pnikv6n767z2x8s5gqqsj64yf9ivpdb5xw0qviizf9qwg8yvi"; depends=[colourpicker FactoMineR shiny]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; - FamEvent = derive2 { name="FamEvent"; version="1.3"; sha256="0jf4ph9mskycyckyg9biy0h1zk5q6nvj8669zfh8nfnnn2yh3s48"; depends=[kinship2 MASS survival truncnorm]; }; + 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="1.0.3"; sha256="1lpl49bhnch3i56z1lrvn55qr4dimc4xp8jm3w3xiccxkpr933jj"; depends=[Rcpp RcppArmadillo]; }; @@ -1299,7 +1314,7 @@ in with self; { FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; }; FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; }; FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; }; - FateID = derive2 { name="FateID"; version="0.1.6"; sha256="08qphzrn1cp5fqjdk3w1vfj76zxs9qp1h5543bp4b5cbp03cfbad"; depends=[lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; }; + FateID = derive2 { name="FateID"; version="0.1.7"; sha256="00rhqbwpzxbkxmgg6blv186pngz0fsm448g61qcm40dy6mpf9yd0"; depends=[lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som umap]; }; FeaLect = derive2 { name="FeaLect"; version="1.14"; sha256="1h6jc8n57mvyz3gi2jdx5xacwv5iim5sx86qzrg3v1higfr54b1l"; depends=[lars rms]; }; FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.3"; sha256="0k8n3c0yiz6bb9rq6ra8z2hypb4hw4qcsdfbrgrw74kqivscs62i"; depends=[BH digest magrittr Matrix Rcpp]; }; FedData = derive2 { name="FedData"; version="2.5.6"; sha256="14dp3fs1xzirxj2qys4h01z7mvwddgdwysawilgpkk33q0w0ysay"; depends=[curl data_table devtools dplyr foreach Hmisc httr igraph jsonlite lubridate magrittr ncdf4 raster readr rgdal rgeos sf sp stringr tibble xml2]; }; @@ -1311,6 +1326,7 @@ in with self; { FinAsym = derive2 { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; }; FinCal = derive2 { name="FinCal"; version="0.6.3"; sha256="1clvnvhpf2krrf8flhmdxmys6ym3xw3v4v07kk1if4xb0dfk9wgy"; depends=[ggplot2 RCurl reshape2]; }; FinCovRegularization = derive2 { name="FinCovRegularization"; version="1.1.0"; sha256="0h3i46s0rpqvgnqgjwqrlrfa3vv5jn2hm6bqc0ijwmrr9f80g4ir"; depends=[quadprog]; }; + FinTS = derive2 { name="FinTS"; version="0.4-6"; sha256="1lj1lzyglfphgas17j9isd7ama05m3qr0mkfisyh2w1srgqxi32r"; depends=[zoo]; }; FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.3.1"; sha256="0f1zaclrcmpkdhcfc8a09f7lsf2b7gfyd7js3173qckn84a01f3w"; depends=[quantmod TTR xts zoo]; }; FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; }; FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; @@ -1322,7 +1338,7 @@ in with self; { 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]; }; FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; }; - FixedPoint = derive2 { name="FixedPoint"; version="0.6"; sha256="05zxqggffhxyhd7ikj46cj5zhqpp9bzv8920wyyzj7kkifiphwlx"; depends=[MASS]; }; + FixedPoint = derive2 { name="FixedPoint"; version="0.6.1"; sha256="0fxs95rhx17bxv1xx207f83rn4x35gahws4a0n85mfmlb5x2rf5d"; depends=[MASS]; }; FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; }; FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-5"; sha256="1404cn3bhcdr3mjhpr072zcyl0wnksarsg2sry5d1scsmrn4xq83"; depends=[nlme]; }; @@ -1330,7 +1346,7 @@ in with self; { 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.5"; sha256="1kslqvxm73s8fvhf6ahmxmjgs73b78lcbcf4af1cp7axksp4bv8v"; depends=[changepoint evir zyp]; }; + FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; }; Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; }; ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; }; @@ -1374,7 +1390,7 @@ in with self; { GABi = derive2 { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; }; GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; }; GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; }; - GADMTools = derive2 { name="GADMTools"; version="3.5-1"; sha256="1hjar8i4vxhbqsljnhiz5nl7jcqqkzyqmjr2yrfqa7frmcix65ll"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr tidyverse]; }; + GADMTools = derive2 { name="GADMTools"; version="3.6-1"; sha256="1mrh9i3k5b7hj512hx8ykmy4idkyah8hjpsxfs114j65809wa2j8"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr tidyverse]; }; GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; }; @@ -1396,7 +1412,7 @@ in with self; { GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; }; GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; - GDINA = derive2 { name="GDINA"; version="2.3.2"; sha256="1cidawm6ccj86k9f0f2lrfll2xzx7l0sgj0rzld8nl3yaj3kllpv"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; + GDINA = derive2 { name="GDINA"; version="2.4.0"; sha256="1gpylmlnd6161s4s9zcj35xcv4h7sp8xrrhqjm3vn293scbpj208"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; }; GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.16"; sha256="19j06q2igd261qmnwc35mprpr4ljcwia14wvj9rky9rj6fhklfr2"; depends=[changepoint GENEAread MASS rpart signal]; }; @@ -1418,8 +1434,8 @@ in with self; { GFORCE = derive2 { name="GFORCE"; version="0.1.2"; sha256="1bxc0id3vivva4d62h468vv4zrvjgzh91mlm97ga9qnlhd1r20wr"; depends=[lpSolve MASS]; }; 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="1.8-1"; sha256="10ki1p1gv1j2dg4b5zn1f6ipbq6wfz60n0lfrqpmp3wkvwqnxnxf"; depends=[data_table Rcpp]; }; - GGMM = derive2 { name="GGMM"; version="1.0.0"; sha256="18haggjagp0bwy451ghz18nbjgp8zdw1m9iavjj38s57igs611n4"; depends=[equSA huge mvtnorm]; }; + GGIR = derive2 { name="GGIR"; version="1.9-0"; sha256="1460wks8c3z4a0vzck0xs9ca69j65hgdbpjyzsqypkmsk0ckwwnm"; depends=[data_table Rcpp]; }; + GGMM = derive2 { name="GGMM"; version="1.0.1"; sha256="1d0qxxdk7b3hzg7dimsbjabpf5rxn3azn2hy00pa1c6wya7kxyvv"; depends=[equSA huge mvtnorm]; }; GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; GGMselect = derive2 { name="GGMselect"; version="0.1-12.1"; sha256="0nrkbai9jps54ldx3cvwd4x4wingfj73najwx4bv98z8zxpbnky5"; depends=[gtools lars mvtnorm]; }; GGUM = derive2 { name="GGUM"; version="0.3.3"; sha256="1ndqm4wal2xp9sdhj0aj8828ygm2g4fx23cpnlmg3vjz4m2mjc1r"; depends=[abind psych Rdpack viridis xlsx]; }; @@ -1440,13 +1456,13 @@ in with self; { GLSE = derive2 { name="GLSE"; version="0.1.0"; sha256="1snzcz637ppz3lkg1575ln3shfidkrnynqh1d8b5rk0z0974bpm1"; depends=[gRbase igraph mvtnorm]; }; GLSME = derive2 { name="GLSME"; version="1.0.4"; sha256="1bh56dv4czl89dm9b6syfpsbds4wni03d5vamvjbp6wblhysxnpm"; depends=[corpcor mvtnorm]; }; GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; }; - GMCM = derive2 { name="GMCM"; version="1.3.1"; sha256="1pq44ivwvmzdcfmcy14yxalf3f49nz9bgidgvvgb937ggpjl4j7l"; depends=[ellipse Rcpp RcppArmadillo]; }; + GMCM = derive2 { name="GMCM"; version="1.3.2"; sha256="0sm08kf6ia2fi69zqv4nhnlk71v75b5sz2vd3aj0kfhgan7bl93i"; depends=[ellipse Rcpp RcppArmadillo]; }; GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; }; GMDH2 = derive2 { name="GMDH2"; version="1.4"; sha256="13vbzqxmqvp39rbxw41nqfrmk0w6w8qc9nzgfbfpc07h3gcwva41"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; }; GMDHreg = derive2 { name="GMDHreg"; version="0.1.0"; sha256="0z6xk2av3b124941ysx332kid3adxinyin5ly9kdfc432gbwx0iz"; depends=[]; }; GMMAT = derive2 { name="GMMAT"; version="1.0.4"; sha256="16g7xw6j9f6gb7br03hf2j04gzcy1ffyx65xmn8hz87p9wnpm1z9"; depends=[CompQuadForm foreach Rcpp RcppArmadillo SeqArray SeqVarTools]; }; GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; }; - GMSE = derive2 { name="GMSE"; version="0.4.0.7"; sha256="00fws183mndi2zdfkcsdki3nbd983y9g35fgxkacjck9mpn48an3"; depends=[shiny shinydashboard shinyjs]; }; + GMSE = derive2 { name="GMSE"; version="0.4.0.11"; sha256="1by65202swxcj453q3frac02b2lwny1mm1i95vcjhkqihqkffl2z"; depends=[shiny shinydashboard shinyjs]; }; GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; }; GNAR = derive2 { name="GNAR"; version="0.2.9"; sha256="05pf0n1sxdyv9gc833igcrl1ms2rqdxfhg2w4kb0jiy0v4b8yafp"; depends=[igraph wordcloud]; }; GNE = derive2 { name="GNE"; version="0.99-2"; sha256="16mivsa4r8d2cg5qsh5rpg2244f74zk2ln3vbys7ivjgnjpjn7z8"; depends=[alabama BB nleqslv SQUAREM]; }; @@ -1455,12 +1471,12 @@ in with self; { GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; }; GPArotation = derive2 { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; }; GPB = derive2 { name="GPB"; version="1.0"; sha256="18cdgz00j0j1rchzn2l253rii3b0iv9ipnh5sk3yvmwrqiabmrf8"; depends=[]; }; - GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-3"; sha256="0zgh0838ysaazbjd16s2nplbvfvfrrrvkxs0vbnz5m7kvh9hhj8r"; depends=[caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos]; }; + 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]; }; GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; - GPM = derive2 { name="GPM"; version="3.0.0"; sha256="0g5hb6iyg1p5kj14cizfrdql02z2yrlkyfhzbpq62p0bs9kb9nch"; depends=[doParallel foreach iterators lattice lhs pracma randtoolbox Rcpp RcppArmadillo]; }; + GPM = derive2 { name="GPM"; version="3.0.1"; sha256="01vd68w5pnwhng83x5i0k9c5fhsn9siyzzndkvkmpis4mjm42sgv"; depends=[doParallel foreach iterators lattice lhs pracma randtoolbox Rcpp RcppArmadillo]; }; 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]; }; GPareto = derive2 { name="GPareto"; version="1.1.2"; sha256="0vwnn2hm8k6bdds91id1fri2pda7apqfmad0yrk0i2arfm8krzfp"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; }; @@ -1540,12 +1556,11 @@ in with self; { GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; GerminaR = derive2 { name="GerminaR"; version="1.2"; sha256="10x22xl3r93i5mc6w7m5mqm3z386dsffwrb8h9c1bznrnynnsy63"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; }; - GetDFPData = derive2 { name="GetDFPData"; version="1.5"; sha256="0x44sxyrnyxamf0107q12zyab7pcrik5n3kv4viiy94l1a8hgc07"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; }; + GetDFPData = derive2 { name="GetDFPData"; version="1.5.1"; sha256="1smnglqqjva8dp12paw0jvd1zz4dx362i99zsif7rxdfz6wd68fa"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; }; GetHFData = derive2 { name="GetHFData"; version="1.6"; sha256="1yhj97ag817jd2qzfbk363vmy4qpv1p6343krm3z0c9wjp2i97n5"; depends=[curl dplyr lubridate RCurl readr stringr]; }; - GetITRData = derive2 { name="GetITRData"; version="0.7"; sha256="0cmqbncd5bjxgb1r9yvdv2hkx4qdmnpn2a62bgndnaya1yk5050l"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; }; GetLattesData = derive2 { name="GetLattesData"; version="1.2"; sha256="0mwbyb3wk2l4nrzx4n6gbx4h4a1fz7p8kmysbihysdlz8brnr0av"; depends=[curl dplyr readr stringdist stringr XML]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; - GetTDData = derive2 { name="GetTDData"; version="1.3.1"; sha256="1a8f22nxs85g2zznh1ma37lmycypg8f7d5kdhyb5vrirvrpi5p05"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; }; + GetTDData = derive2 { name="GetTDData"; version="1.4"; sha256="0dl5wbq0w28l05jfw12mw5c2ghzvf0aq3qcc0il9373pd29mx4v9"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; }; GetoptLong = derive2 { name="GetoptLong"; version="0.1.7"; sha256="1fl3w2n602ldybc5qj7qw4xmzzb804bsjkqwf6dswzj0vf0qiadr"; depends=[GlobalOptions rjson]; }; 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]; }; @@ -1607,11 +1622,11 @@ in with self; { HDoutliers = derive2 { name="HDoutliers"; version="1.0"; sha256="0pby640bad0jcf1lkwg2g6flassb1pimnjm411c6x8rgvmiphc23"; 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.3.6"; sha256="0xy658na8zq9s8ccyi8gnlzxmsjs1aggipf1rjmfcyz4va6zr9yv"; depends=[doParallel foreach graph iterators plyr precrec preprocessCore RBGL]; }; + HEMDAG = derive2 { name="HEMDAG"; version="2.4.7"; sha256="1ripk2sx4n9ld8z4f6r089k5h24amksx6rmrdcfkfvw9v1zbj057"; depends=[doParallel foreach graph iterators plyr precrec preprocessCore RBGL]; }; HGNChelper = derive2 { name="HGNChelper"; version="0.7.1"; sha256="1yfgragyp6zfzm7aq74r9gkzqlrzggw87msm9cqqqy62a8y9y92w"; depends=[]; }; HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; }; HH = derive2 { name="HH"; version="3.1-35"; sha256="0sykmmipbph9x7k371liiyj2vmqv0as2hr9x6yrn38ls6bscjlj4"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; - HHG = derive2 { name="HHG"; version="2.3.1"; sha256="0gvprz3v9843pm64p3s87m41gyx7zri9p1qx0a4rk3468pab1vzi"; depends=[Rcpp]; }; + 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]; }; HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; }; @@ -1703,10 +1718,10 @@ in with self; { IATanalytics = derive2 { name="IATanalytics"; version="0.1.1"; sha256="10g9iscfjmlxrkzls9320h9azpc5fnhh6276p7zn8sxqgp1nvnz9"; depends=[]; }; IATscores = derive2 { name="IATscores"; version="0.2.1"; sha256="1nm07wlrnjx36wr3jbv2faayh1vrlfid124b27w9v0x0dk145i82"; depends=[dplyr qgraph reshape2 stringr]; }; IAbin = derive2 { name="IAbin"; version="1.0"; sha256="1cpj2mx72n4v0yd8jbbnhj2w5d0sc8pw7rc8ahnn1hfa38pwwsyx"; depends=[]; }; - IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.5-1"; sha256="0isy9pcb0gf5mpzil4kqaspi99rx40vzbjvf4rx66ad4vmy6iqys"; depends=[dplyr lsa tidyr]; }; + 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-7"; sha256="1wq0w9d4kwvq1hc5l0m8wrqfhnncapmnrh29x9vvafv50ym7yb3l"; depends=[paramlink]; }; + IBDsim = derive2 { name="IBDsim"; version="0.9-8"; sha256="1a0xz1khl6cz6ajcn903fcmsv8g7hfdh7684zhk0g6awsgwqdf5q"; depends=[paramlink]; }; 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=[]; }; @@ -1753,6 +1768,7 @@ in with self; { 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]; }; + IMWatson = derive2 { name="IMWatson"; version="0.5.0"; sha256="11nzjhidgv53yxijdhw3j35xb9b30fv1yzhb0y2qxjhfyja6pc50"; depends=[assertive glue httr jsonlite magrittr R6 shiny shinydashboard shinyjs V8]; }; IMaGES = derive2 { name="IMaGES"; version="0.1"; sha256="086i6nk9q11b278b0vn2yb52yh3pwlnhp5nyan230xczn1k47sgm"; depends=[BH ggm graph igraph lavaan Rcpp RcppArmadillo Rgraphviz sfsmisc]; }; IMak = derive2 { name="IMak"; version="1.2.1"; sha256="0yvmwqxp4y1bsbv37sdw3aa5w1j1hyqs5fs7nf2kkr6wj6ixq7ny"; depends=[]; }; IMmailgun = derive2 { name="IMmailgun"; version="0.1.2"; sha256="09acmi6xj186fb8nhj8q0nxmkp2p32a1l95glzvz84gax4xakhz8"; depends=[httr]; }; @@ -1810,6 +1826,7 @@ in with self; { IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; }; IndepTest = derive2 { name="IndepTest"; version="0.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; }; IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; }; + IndexConstruction = derive2 { name="IndexConstruction"; version="0.1-1"; sha256="16swmbkb6shxl0vxby4pi246ji7qqb849nzqr4pbdg4gdg1a36f5"; depends=[fGarch KernSmooth lubridate RcppBDT xts zoo]; }; IndexNumR = derive2 { name="IndexNumR"; version="0.1.1"; sha256="0979v4wc3w9jxvwzpdrn8snrnicw9i41r9r9rpmkqbfrzc0xv6l3"; depends=[]; }; IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; @@ -1852,7 +1869,7 @@ in with self; { IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; IsoSpecR = derive2 { name="IsoSpecR"; version="1.9.2"; sha256="0hcwqmwv827jcxmahgjx6bf90z432kzqwfrb1hqnk6d8iayl84pa"; depends=[Rcpp]; }; - IsoplotR = derive2 { name="IsoplotR"; version="2.4"; sha256="1nx2r1ifqgyrlk701zn2i0d05ddvf7gd8ip4qsjv8pr3fgnjyzaj"; depends=[MASS]; }; + IsoplotR = derive2 { name="IsoplotR"; version="2.5"; sha256="1d2mi9igiy3gdvgsk9j9j968ggyngg1kwyc291ikwfirwxpdxyk7"; depends=[MASS]; }; IsoriX = derive2 { name="IsoriX"; version="0.8.1"; sha256="0rr9frj0mhismls60vgax357jgfyq2wci7rvhvp70fh5k998mzid"; 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]; }; JADE = derive2 { name="JADE"; version="2.0-1"; sha256="0s7cdvhjcdxdqv4mgjd07xi3s0ngjvpxsmy0ary735rs5y6198mm"; depends=[clue]; }; @@ -1865,7 +1882,7 @@ in with self; { JGR = derive2 { name="JGR"; version="1.8-6"; sha256="0n3z4dm4q93did5b7hw802akhr6gyidshvlj2db4sghmf07czk2c"; 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-71"; sha256="0vbw3z1njl3jm4qixzh5fs3gmiqz7n3kz3a4a9sdxj498z063svj"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; + JMbayes = derive2 { name="JMbayes"; version="0.8-83"; sha256="0x5839sqmy1za6ybmd54vhc1sg505k5y4qwk7hr1lv8sr85yxllh"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.3"; sha256="0bjaiygn2sq40f2cwa1c6j73748j2cx5q69pd4jgfgbpm9r25r4f"; depends=[MASS Rcpp]; }; JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; }; @@ -1875,6 +1892,7 @@ in with self; { JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; JSM = derive2 { name="JSM"; version="0.1.3"; sha256="1p5vlk2fcrb42pi7srkymjacfg05vlaspvhaw94lq1rhvxdw87yl"; depends=[nlme Rcpp RcppEigen statmod survival]; }; JWileymisc = derive2 { name="JWileymisc"; version="0.3.1"; sha256="1683sq0fb8ms0kzfc46azkjfsk2khhq43y265k1g920s5pc7bn8q"; depends=[cowplot data_table devtools emmeans foreach ggplot2 ggthemes lavaan lme4 lmerTest MASS Matrix mgcv mice multcompView nlme psych quantreg rms robustbase VGAM zoo]; }; + JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-3"; sha256="1zcs9qhf2216c590hj6qc837rnciyfsirg4zg655vxn59fgzpvyb"; depends=[Rcpp]; }; JavaGD = derive2 { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; }; Jdmbs = derive2 { name="Jdmbs"; version="1.3"; sha256="0jjnn1lrrakai34srp9ks8a563amd1rp9vd4ydnpmgfma5qlify0"; depends=[igraph png]; }; Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; @@ -1884,7 +1902,7 @@ in with self; { JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; JointNets = derive2 { name="JointNets"; version="1.0.0"; sha256="1kvpx1xmpw1pns8x9wk4s27vf8wq6bq3r5bv1w9kbdd7130bpspz"; depends=[brainR igraph lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; - JuliaCall = derive2 { name="JuliaCall"; version="0.16.4"; sha256="03baj8gv0xxcacz67lf5d8l8g6awrv59dh3hpcc5fpqmgn8ld6lh"; depends=[knitr Rcpp]; }; + JuliaCall = derive2 { name="JuliaCall"; version="0.16.5"; sha256="1gw35al0q9mvcm93xgkkykx0dj2gbhbq81ijizmf2q3ir56bh96i"; depends=[knitr Rcpp]; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; }; JuniperKernel = derive2 { name="JuniperKernel"; version="1.4.1.0"; sha256="1zghlfwh4wsjjp7ldp5y86ffyzc27ccl5j9lcwlp1di9slaqjign"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; @@ -1900,6 +1918,7 @@ in with self; { KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KODAMA = derive2 { name="KODAMA"; version="1.5"; sha256="1pb7qba7dp25x4znhvihc21z5jk6bgk6sg0v24gbvqhv5irm7kwf"; depends=[Rcpp RcppArmadillo]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.2"; sha256="1vz0099gp1r10n7w4p480l8rswdw100sns196d9xin2ibmmd2fx9"; depends=[pheatmap]; }; + KONPsurv = derive2 { name="KONPsurv"; version="1.0.1"; sha256="0ycdzd88hy5n59p160fwpfhkq74p4j56cdahjr3c969sjml50zpi"; depends=[Rcpp survival]; }; KRIG = derive2 { name="KRIG"; version="0.1.0"; sha256="1hpmjzzrh5b042xh14dgxvn5x5ini63vq5jz1i6rjgvsdf734f98"; depends=[Rcpp RcppArmadillo Rdpack]; }; KRIS = derive2 { name="KRIS"; version="1.1.1"; sha256="0v2xgdwd8lp399il6grjkysq2gj38fmjlxlvg5ciq3g3cp7cdy3m"; depends=[rARPACK]; }; KRLS = derive2 { name="KRLS"; version="1.0-0"; sha256="1zyf3smfzfm3n43i35rlj1w6vcip2hxkvk4f8lp77xbsry0gmwjw"; depends=[]; }; @@ -1934,7 +1953,7 @@ in with self; { LAM = derive2 { name="LAM"; version="0.3-48"; sha256="12a38rvb0krfl0yffhyn7nmxcgkga46kfn4h7wzvnr0hpl5a7kjf"; depends=[CDM coda MASS numDeriv Rcpp RcppArmadillo sirt TAM]; }; 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]; }; - LBSPR = derive2 { name="LBSPR"; version="0.1.2"; sha256="09jvdjagf4icnigbfw18z36ya4llg84fa6j2khd22cl60y81r5i3"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; }; + LBSPR = derive2 { name="LBSPR"; version="0.1.3"; sha256="0wbqr3zxyfrjr0fdvx39hsxs841flaqhq6h8ynkdy2qnxx1spq7q"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; }; LCA = derive2 { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; }; LCAextend = derive2 { name="LCAextend"; version="1.3"; sha256="1l75y3vkbsmsm3pjd5pwy0hlv6gz5ryxs4pkx9aiyhxz2y9wnhpb"; depends=[boot kinship2 mvtnorm rms]; }; LCAvarsel = derive2 { name="LCAvarsel"; version="1.1"; sha256="0aqc9rbrc8n6s9xllmamby219qsnxd4ajvffjr21qlkhkaklirb1"; depends=[doParallel foreach GA MASS memoise nnet poLCA]; }; @@ -1965,10 +1984,10 @@ in with self; { LLM = derive2 { name="LLM"; version="1.0.0"; sha256="0x4488mg8q4nhyjhqlzkwmh51frkkjn0gir22rk8rfzg4r6d18d6"; depends=[partykit RWeka stringr]; }; 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.4.3"; sha256="0ynkm4f1ri80h5fraywyvwhrm6f6sa7hp95rzl29zc91904yycx1"; depends=[MASS mmm MultiLCIRT mvtnorm]; }; + LMest = derive2 { name="LMest"; version="2.4.4"; sha256="0kr1sljmbpnj9nq83c5cxhca29631vsllmnfs96njmq8d3fkpymr"; depends=[MASS mclust mmm MultiLCIRT mvtnorm]; }; LMfilteR = derive2 { name="LMfilteR"; version="0.1.2"; sha256="10agjrljnqw689nn9af9ihhb9sq2gmsx7l3zfmrizkavjjk67mcd"; depends=[MASS]; }; LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; }; - LNIRT = derive2 { name="LNIRT"; version="0.3.5"; sha256="0gbdai9kfl31wrh5smf8gvzs5g5abwbnnfkszdsz6h9qcqf7l75a"; depends=[MASS]; }; + LNIRT = derive2 { name="LNIRT"; version="0.4.0"; sha256="0g2yqpsxz2fsvgvgn60yv2k8mv63anf6g2zzd9njarc524n874r8"; depends=[MASS]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; }; LPCM = derive2 { name="LPCM"; version="0.46-1"; sha256="0k3np39lgfnpys39dd64by42d73vqkslbn7prcsa4fh3g8pnxvrd"; depends=[]; }; @@ -1978,7 +1997,7 @@ in with self; { LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; }; LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; }; LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; }; - LPWC = derive2 { name="LPWC"; version="0.99.4"; sha256="0sra41xm6s7qsw2rd0bclm885lairln4jirv3s0ss8maxrfi4g0k"; depends=[devtools ggplot2 knitr]; }; + LPWC = derive2 { name="LPWC"; version="0.99.5"; sha256="13iv2v8lkyz9rpjzz2pr6b5g6nh79j8vd5hpx03vjyx08ii0dnq6"; depends=[]; }; LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; }; LPower = derive2 { name="LPower"; version="0.1.0"; sha256="0g9y5s4k3l4zw97qh6c9jj6ysl39y4fprvqw1ybykirvgflisi8x"; depends=[MASS nlme]; }; LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; }; @@ -2034,6 +2053,7 @@ in with self; { LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; }; 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="0.1.0"; sha256="0bnlhgkqfv3v3567ylf22k51wjndqy4bb5pjphvlhiia51xp3lfd"; depends=[beepr dplyr e1071 FNN ggplot2 keras reshape2]; }; LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; }; LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; }; @@ -2044,7 +2064,7 @@ in with self; { LinkedGASP = derive2 { name="LinkedGASP"; version="1.0"; sha256="1win1yd8y677rmic531dyd29f49p7pr1r3kbjysvv9syi5nkydyj"; depends=[nloptr spBayes]; }; LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.3.1"; sha256="01rsgk2v1r1jhpkvvhgqqa5lf6qncxy56f7jwfgxfig3dvgjf96r"; depends=[crochet]; }; LipidMS = derive2 { name="LipidMS"; version="1.0.0"; sha256="0pr41rdpwxmq67k94vm91dddf6gj6r46l9jy0lwqp63f8s0dij3a"; depends=[CAMERA CHNOSZ enviPick purrr]; }; - Lmoments = derive2 { name="Lmoments"; version="1.2-3"; sha256="13p0r4w16jvjnyjmkhkp3dwdfr1gap2l0k4k5jy41m8nc5fvcx79"; depends=[]; }; + Lmoments = derive2 { name="Lmoments"; version="1.3-1"; sha256="0pc63bj9a8hzr5m3yssrc4kin39fffwkl8rggs3sagzr12d4i7bw"; depends=[Rcpp RcppArmadillo]; }; LncFinder = derive2 { name="LncFinder"; version="1.1.3"; sha256="15zsll766n97q5rf3xvc3m5s7faxiybayxjzyfhsh7q9x12qnnd7"; 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]; }; @@ -2070,18 +2090,19 @@ in with self; { 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.0.0"; sha256="0kp5z0jg266w4mhy1hx52h14dnyhy1fjllw7z473gj4fskikp5gg"; depends=[MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; }; - MALDIquant = derive2 { name="MALDIquant"; version="1.18"; sha256="18nl214xjsxkcpbg79jkmw0yznwm5szyh2qb84n7ip46mm779ha6"; depends=[]; }; + MALDIquant = derive2 { name="MALDIquant"; version="1.19.2"; sha256="11zbvm1vw8zn2vmymvydgdczvwj961s2knvrn1q4gbziwi5gqvlc"; depends=[]; }; MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.12"; sha256="1r37x1hnhq246dazc76d17jfjc57khxayswbzvc4md39z8dnbihx"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.1-2"; sha256="1jl26ndi0zvyq29qjkmdxg9psgwyv8wapd7f0cv4w88d9gk257az"; depends=[lattice MALDIquant robustbase signal wmtsa]; }; MAMS = derive2 { name="MAMS"; version="1.3"; sha256="181i1p84pacl31qsh5vkvyxnca9sx6rabi7cs42w9qpzk2fxcmzj"; 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.1"; sha256="0lxqv85hc299r28m5z4id3xdgd2dism1b1zs09qly3i6byndn4gw"; depends=[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]; }; MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; MARSS = derive2 { name="MARSS"; version="3.10.10"; sha256="03kkg6slq3z12saw0vf6z9wqadzpy4yjh9bm47zl4av4pj03y6lr"; 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-51.1"; sha256="14907ia8418mp3p1rs1i2f1x5b6kk5z998dk353a29j3xqf3ybyq"; depends=[]; }; + MASS = derive2 { name="MASS"; version="7.3-51.3"; sha256="1dh8cvvdsf9dx29x6va47qdkswmr03k3yjycinq98fnl0ivhw3jv"; depends=[]; }; MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; }; MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; }; MATA = derive2 { name="MATA"; version="0.4"; sha256="0x155izylzwajlnlbdnawb3b8gwxd1cx03xb1sqi3w2g50bcljbf"; depends=[]; }; @@ -2104,7 +2125,6 @@ in with self; { 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]; }; - MCDA = derive2 { name="MCDA"; version="0.0.19"; sha256="0r8l6q5aisjfk0xpv4pyccnngjlkm3978lba62rspd9kyhjlz64n"; 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.1"; sha256="1d8grg2a3c0nyl9wqxfsi0nq5qb5qbaspr5p2v791mhnbnfzkyhf"; depends=[MCI osrm REAT reshape tmaptools]; }; @@ -2115,6 +2135,7 @@ in with self; { MCMCglmm = derive2 { name="MCMCglmm"; version="2.28"; sha256="0apwgdwmvv6fkfwqlsi7hq9s20pw3cxjrfchlmhf1r9qav9yd4kx"; depends=[ape coda corpcor cubature Matrix tensorA]; }; MCMCpack = derive2 { name="MCMCpack"; version="1.4-4"; sha256="1xzrgib2mjz0xpqranhdyc5m4fmg2fir9mcf51ciw5pp53b97qcp"; depends=[coda lattice MASS mcmc quantreg]; }; MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.9"; sha256="1zmlz2kwrp1qiyvq3v5vv1rsy3s2idlifmckmgznk4nkqds5ifwh"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; + MCMCtreeR = derive2 { name="MCMCtreeR"; version="0.1"; sha256="16alvgy55f34rqxygcmxyxnmd03y924bfly4kwahk940bf0zphsl"; depends=[ape coda sn]; }; MCMCvis = derive2 { name="MCMCvis"; version="0.12.2"; sha256="0zj94akw48bgj9bvk6zssn41829znv1pyi73m43ldq4vgqj5zp2s"; depends=[coda overlapping rstan]; }; MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; }; @@ -2140,8 +2161,8 @@ in with self; { MFDFA = derive2 { name="MFDFA"; version="1.0"; sha256="1gy1v49525i2bhr14nvpz8rqcz3lchfnvm0g53qlln55jdndgsx4"; depends=[]; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; - MFPCA = derive2 { name="MFPCA"; version="1.3-1"; sha256="00kr64ih16ymigyd1w5ijkk7clif18dg5fq9g3vd9j773zqg7dh2"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; - MFT = derive2 { name="MFT"; version="1.3"; sha256="029apjg1fqrqfg98jczbxfy267m3f68qxvxqjzbsw1xisq4j7wc0"; depends=[]; }; + MFPCA = derive2 { name="MFPCA"; version="1.3-2"; sha256="1p467zc8lvdcl8n0mf6aazm39flbn62ykwc6c6brkxy46cdvc5jv"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; + MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; @@ -2166,15 +2187,18 @@ in with self; { MKmisc = derive2 { name="MKmisc"; version="1.2"; sha256="01797n3sfab384v1dpa2pj5xrwj1w4y8rwwr0qmjkl3gv0ibp7i4"; depends=[ggplot2 RColorBrewer robustbase scales]; }; ML_MSBD = derive2 { name="ML.MSBD"; version="1.1.1"; sha256="1j110kz2k5hyk3la771yx41k6c2pam2k5hzzx42fm5n127aq3q56"; depends=[ape]; }; MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; }; + MLCM = derive2 { name="MLCM"; version="0.4.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; }; 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.5"; sha256="020z18x5hlc1v975a7wi6vlairl8w7prjsfsvdiydl6xh56pdrr9"; depends=[FactoMineR fastcluster gglasso MASS Matrix]; }; MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; }; - MLML2R = derive2 { name="MLML2R"; version="0.3.1"; sha256="1s4d4w9hlvllngdm0l1g9qlxzz8g8r4rl08k3ivjwpy46ay7lyqr"; depends=[]; }; + MLML2R = derive2 { name="MLML2R"; version="0.3.2"; sha256="0ii1hzbv21x96jancz30rg0jd6kz9miq22j9xx1i9zrzxx1rlh0p"; depends=[]; }; MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; }; MLZ = derive2 { name="MLZ"; version="0.1.1"; sha256="1x2mmd7rb6rk2qb84i7k71w8l14m5dvkwg1xpjqgy9lzqnwhxi45"; depends=[dplyr ggplot2 gplots RcppEigen reshape2 TMB]; }; MLmetrics = derive2 { name="MLmetrics"; version="1.1.1"; sha256="061129b36h7xqw4zsznik694n8yy9qq6aaqfhdxkhdv8n5v1nzvp"; depends=[ROCR]; }; MM = derive2 { name="MM"; version="1.6-5"; sha256="0vi6wp6p48jjfmnspdsnmw0yqz39sjk6nrkxdw7kan5h17h4rwd7"; depends=[abind emulator magic Oarray partitions]; }; + MM2S = derive2 { name="MM2S"; version="1.0.6"; sha256="1knr15vjc81cp7j67nc2gwkgds6ar3ribi1h0ihg0ch6rfz5c5zs"; depends=[GSVA kknn lattice pheatmap]; }; + MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.3"; sha256="0hlm6jp8jq38vkszwdgpf30w11l1fhpblg26zv05j50a6whpmhqd"; depends=[Biobase]; }; MM4LMM = derive2 { name="MM4LMM"; version="1.1.5"; sha256="1mwb10vq5mnfdq47qxr58xq8iq4n343m4xb9jpzf3a65nnxsgl95"; depends=[Matrix Rcpp RcppEigen]; }; MMAC = derive2 { name="MMAC"; version="0.1.2"; sha256="1xwz48iizf0lvmhc7krsraabc49ky85qvgr23w4ip6jzfv4sn1jr"; depends=[]; }; MMDai = derive2 { name="MMDai"; version="1.4.0"; sha256="0bb7hg8fkmzg87xr1b2hxhy75xi461ks6w12z85k4c77kswfpx3b"; depends=[DirichletReg]; }; @@ -2184,6 +2208,7 @@ in with self; { MMS = derive2 { name="MMS"; version="3.0.11"; sha256="0gc4iz371bi65sp49gvjh99f8jvii8l0k12kn1vbpzk4a3cw7iad"; depends=[glmnet Matrix mht]; }; MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; 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]; }; 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]; }; MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; }; @@ -2203,12 +2228,12 @@ in with self; { MPDiR = derive2 { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; }; 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.2.0"; sha256="054ldjsgx5a9ln9a9gvbcip06mhaiwb563qccdy3spk9qp3535cd"; depends=[]; }; + 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.0"; sha256="0rr66f3ijzvqzj6b0hl7i065r5ndzcb2r5sjhx32rihgjdg60lr3"; depends=[]; }; MPSEM = derive2 { name="MPSEM"; version="0.3-4"; sha256="0pj3gv2waxg5v1xv0qcwscq2c0g5w4w2b9ip3b761gs75mdy07g0"; depends=[ape MASS]; }; MPTinR = derive2 { name="MPTinR"; version="1.11.0"; sha256="1pflypcysc43yp4rh1lxnf7f0qklc6rl4y1mvj6ydwv5nlz52mbh"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; - MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.1"; sha256="1pvmrrh48q5kbk79gcv0cxy2l3cg65x0r3fy242kq3dfy13jb54d"; depends=[broom coda dplyr ggplot2 magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; + MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.2-0"; sha256="0bhxzg5q3slq5x281xnyqwlgazkddlcaw4z6k7nc419v5ym75cqz"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; MPV = derive2 { name="MPV"; version="1.53"; sha256="14qnvcqqscd9hwn2mxf5dclv3ncj7w6vc3blxaml3rflriha6rls"; depends=[]; }; MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; }; MPsychoR = derive2 { name="MPsychoR"; version="0.10-7"; sha256="10nphm5dzxha4xb7a21b0nxbqy55fg8k748qax7nq3rj4nfjaml7"; depends=[]; }; @@ -2249,23 +2274,23 @@ in with self; { MTurkR = derive2 { name="MTurkR"; version="0.8.0"; sha256="0q498chr2s67ai7lfxi6kdficqbs5sxj9asyv69z2a37fmsr4va7"; depends=[base64enc curl digest XML]; }; MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; }; MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; }; - MUS = derive2 { name="MUS"; version="0.1.5"; sha256="1vjfd9jhjs8llkqsdaynrlny93mb8y7wifg6cdjmnaq5fm9gyv9j"; depends=[]; }; + MUS = derive2 { name="MUS"; version="0.1.6"; sha256="0xid624rz0mvd03iy7ydvmx7gkscvsg4kdbaf2nji54ahai3pmn3"; depends=[]; }; MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; }; MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; }; MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; }; - MVN = derive2 { name="MVN"; version="5.6"; sha256="05d0cy76bwj2dxy6l1jll6n6jfbszm568jbakv8h537a2z8rcavi"; depends=[boot car energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; }; + MVN = derive2 { name="MVN"; version="5.7"; sha256="1knll6hppbskny70j1a1vj3ad5yph76mq6swqcbmwh2d46fwdbln"; depends=[boot car energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; }; MVNBayesian = derive2 { name="MVNBayesian"; version="0.0.8-11"; sha256="1iaxyp480v91887cn4w3l74907wvbzs3ay4cjgzd8xk2dp47w8bg"; depends=[mvtnorm plyr]; }; MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; MVTests = derive2 { name="MVTests"; version="1.0"; sha256="1d6vwh8zb13207yn92fi81h9f925ldd8xcgpi825sxv9lwbnabs7"; depends=[matrixcalc]; }; - MVar = derive2 { name="MVar"; version="2.0.4"; sha256="1mv49kg7df4gjvksvc2k8nlg4pvc9ajc2kx2vkbjr16vswps4vsp"; depends=[]; }; - MVar_pt = derive2 { name="MVar.pt"; version="2.0.4"; sha256="0y1jkwp1q88yr9plfzqrv4sz361i16nhmkhccbrqk72kcvbhxmcj"; depends=[]; }; + MVar = derive2 { name="MVar"; version="2.0.5"; sha256="14iabdvaval02mgx0h3v9zw9j1844bi1jnbrvki637lainwrvgqb"; depends=[]; }; + MVar_pt = derive2 { name="MVar.pt"; version="2.0.5"; sha256="1kvdxnfhs28fqw7y1cshb500lg8qiys26kr7h7qnl75wq2ia1lmm"; depends=[]; }; MVisAGe = derive2 { name="MVisAGe"; version="0.2.1"; sha256="1plrzzj7cr2hxk1npadvjnk7sanhilh99l5vrkjjh3l6li2ym09b"; depends=[]; }; MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; }; MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; }; MXM = derive2 { name="MXM"; version="1.4.2"; sha256="1kk394m6h3n8ndinhnld0gc32i9bdg438xni63qsc0b0bkv73d3q"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack knitr lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; - MachineLearning = derive2 { name="MachineLearning"; version="0.0.3"; sha256="0bj4cjcc55ahzb4zpq2lc3bc7si40l43s098kpmrr6zv95km300k"; depends=[arules crayon dplyr formula_tools FSelectorRcpp ggplot2 magrittr NbClust rpart rpart_plot]; }; + MachineLearning = derive2 { name="MachineLearning"; version="0.1.3"; sha256="0yvrsqzvx8ss614ixa9mwkg2ig3hmfixm78fi8c3wmpc2frvsqrk"; depends=[arules crayon dplyr formula_tools FSelectorRcpp ggplot2 magrittr NbClust rpart rpart_plot]; }; MachineShop = derive2 { name="MachineShop"; version="1.2.0"; sha256="14zwv5lb336hfnh551sj58gw0k5q9qfk8dfjp8nphqqzlga5yh7l"; depends=[abind foreach ggplot2 Hmisc kernlab magrittr party polspline recipes rsample Rsolnp survival]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; @@ -2284,16 +2309,18 @@ in with self; { Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MasterBayes = derive2 { name="MasterBayes"; version="2.55"; sha256="14532l41x5k3z2qg0vklafqyzmn45qny9hlrrgriykajv3xjf2lz"; depends=[coda genetics gtools kinship2]; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; + MatTransMix = derive2 { name="MatTransMix"; version="0.1.1"; sha256="19v9bscipj5w9a3s0yndibkps3wphk24wj25lpqab681mf8qx5hw"; depends=[]; }; MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; }; MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; }; Matching = derive2 { name="Matching"; version="4.9-5"; sha256="1bjj4c6h2myjcxxj1pbq0wpwadcfgzpzd83q4ghc63lpaixs90f4"; depends=[MASS]; }; MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; }; - Matrix = derive2 { name="Matrix"; version="1.2-16"; sha256="10fh0y1wd0bvnqbzlyck08pn1vxcd58bskx2lrf9m42v5792ba9p"; depends=[lattice]; }; + Matrix = derive2 { name="Matrix"; version="1.2-17"; sha256="1k1zf92ycqr7fz44w7bp1p354ww7jg0wm23ybb8dzmbg37qfchyv"; depends=[lattice]; }; Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.7"; sha256="1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va"; depends=[grr Matrix]; }; MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.2"; sha256="0s4gxgl6fsy0fnjmsdz4k7p96vl6p00xl9w2fg7v0gikjpz6h5bg"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.2"; sha256="1205jxx5aj783r2dmpawiq4rr30b60fq1qf053i7wylw07pz6vba"; depends=[]; }; MatrixLDA = derive2 { name="MatrixLDA"; version="0.2"; sha256="0fixq35gp0fzmin75sfld2ln0zvnjgzrhk3b5yi7wdqzp99200yy"; depends=[glasso plyr Rcpp RcppArmadillo]; }; MatrixModels = derive2 { name="MatrixModels"; version="0.4-1"; sha256="0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy"; depends=[Matrix]; }; + MaxMC = derive2 { name="MaxMC"; version="0.1.1"; sha256="0n6m5h8n3gwmlqq563rpdx4l8ldzl6jx3ga50ygvlnamdj3wjqgm"; depends=[GA GenSA NMOF pso scales]; }; 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]; }; @@ -2305,6 +2332,7 @@ in with self; { MeTo = derive2 { name="MeTo"; version="0.1.0"; sha256="14hdyh3p3q8yb9w2li2y9pc356jnymsn6n2750zdsrh52b751lpm"; depends=[lubridate]; }; MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.0"; sha256="1gggia97ww4kiqhh2lnsmadgdxvpr36mdx1yrbgarj0sp6ilrd3l"; depends=[]; }; MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; + MedSurvey = derive2 { name="MedSurvey"; version="1.1.0"; sha256="06caa7d49z59628rv5p2bmv7blpbvsm1yhrvkac5pphca97scvm7"; depends=[lavaan Matrix survey]; }; MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; Mediana = derive2 { name="Mediana"; version="1.0.7"; sha256="136yzp8c9yiiw0x8y3ym516sxx36ca3wa945xmhjwkbvz33cc22j"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; }; Mega2R = derive2 { name="Mega2R"; version="1.0.5"; sha256="18fhkghlx4rkafyx0jpxxyjq20xv6y6sfjyz7m68fi73akjz2rw7"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; }; @@ -2325,11 +2353,11 @@ in with self; { MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.0"; sha256="0pmbq6f5dqq29h56wsrnq3nyk5s281jc8vh89h2wkbj9djay4bw0"; depends=[caTools DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr]; }; 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.60"; sha256="13qffirv0lnj0bflzjpr2hd0d8j4bkakyfjvicp40f0v4v3cack2"; depends=[SKAT]; }; + MetaSKAT = derive2 { name="MetaSKAT"; version="0.71"; sha256="1bfy1zqblwz7a9fr9i6hs18x2n422x52b928v77r3924nasa67a8"; depends=[SKAT]; }; MetaStan = derive2 { name="MetaStan"; version="0.0.3"; sha256="19v0qlcz1jmqnz188y0v64m29l2lrvj7gjkw3xq8dxpdzyizpad4"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; MetaSubtract = derive2 { name="MetaSubtract"; version="1.43"; sha256="15xjlzzjyx581kfr33jkn7gw6pnwrd1j7ic28425wzdigm8ym6h4"; depends=[]; }; - MetaUtility = derive2 { name="MetaUtility"; version="1.0.0"; sha256="0hp6d02sxj6xc3jh64xbfxjdsg4zamwwj4198cwl6wg83718369w"; depends=[metafor]; }; - MetaboList = derive2 { name="MetaboList"; version="1.2"; sha256="15wkj29s1mxi1wzqzlh8lkr5jkw15dbc37h3hzsc0r72a3ddzf38"; depends=[enviPick]; }; + MetaUtility = derive2 { name="MetaUtility"; version="1.1.0"; sha256="075x666kz2bdhxdlp16sziz104z517rargn9rz91gjchd3z4lf5n"; depends=[metafor stringr]; }; + MetaboList = derive2 { name="MetaboList"; version="1.3"; sha256="0np6z0vqqiqaicnxzlnva6bypx0lkwhnbwqh7lyxbf80cfsnh4hm"; depends=[enviPick ggplot2 scales]; }; 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"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; }; @@ -2364,7 +2392,7 @@ in with self; { 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.4.2"; sha256="1m3jkavamx1c2zzalh9j8psk69jmbh4lyl0sxn4x30whv0km5mvp"; depends=[Rcpp rtkore]; }; - MixGHD = derive2 { name="MixGHD"; version="2.3"; sha256="1fnvhqqvqkvw3j5q3wwcidbklk75c225ny9y3sjwifc99m4bj91g"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; + MixGHD = derive2 { name="MixGHD"; version="2.3.1"; sha256="12ldqqbpw5ay6id36z85n9fk72ac47lqsh3yiqwmzcp0q9wachg6"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; }; 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]; }; @@ -2377,7 +2405,7 @@ in with self; { MixfMRI = derive2 { name="MixfMRI"; version="0.1-0"; sha256="08k8j52mrjpcrnwz74va4w3cdfrbkzp00wdzrrrzifx7lcmxrqzv"; depends=[EMCluster fftw MASS Matrix MixSim RColorBrewer]; }; MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; }; MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; }; - MlBayesOpt = derive2 { name="MlBayesOpt"; version="0.3.3"; sha256="0aazcf94gckgxd51r21hv3msa18br5xcq8xp03w448di546qzbnn"; depends=[data_table dplyr e1071 foreach Matrix ranger rBayesianOptimization rlang xgboost]; }; + MlBayesOpt = derive2 { name="MlBayesOpt"; version="0.3.4"; sha256="063jc7x2ra0maln39a2w9jjzycac6rkqb96wjnmk36x7vb6z4xy1"; depends=[data_table dplyr e1071 foreach Matrix ranger rBayesianOptimization rlang xgboost]; }; MmgraphR = derive2 { name="MmgraphR"; version="0.3-1"; sha256="0nfv2cax2v2zhsbprwykngq5n6i5qcf8189rci9d48d5k9qm4a5r"; depends=[colorspace march msm TraMineR]; }; MoEClust = derive2 { name="MoEClust"; version="1.2.1"; sha256="14gzcgga8471k8nm9ix1d3kibakf0kxk4hpwdh74nvac04phnacf"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; }; @@ -2399,7 +2427,7 @@ in with self; { MoonFinder = derive2 { name="MoonFinder"; version="1.0.1"; sha256="0crfh0g95vmwllvgppl2mjfd5kdlb0g9rwrxw8izbl0h6bpgcjxj"; depends=[annotate clusterProfiler igraph org_Hs_eg_db pheatmap RColorBrewer]; }; Morpho = derive2 { name="Morpho"; version="2.6"; sha256="11v0lv1mfyp252y20jxlr9bym3rh8mcr2v25qhvq1133jr420lyd"; 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="1.2-1"; sha256="13g78q9165b6528pflrfrcay5fl151jy13497g9xcr7dxkjr8ms9"; depends=[wpp2017]; }; + MortCast = derive2 { name="MortCast"; version="2.0-1"; sha256="1zmlwhvqw3818g96v4yks75d2wlrsrvjnmngxcdsjqyvpg51ic16"; depends=[wpp2017]; }; MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; }; MortalityLaws = derive2 { name="MortalityLaws"; version="1.7.0"; sha256="1h3ihsgn8fyi7442k9pvnxpxscnsywp3f6hvasy6n9w2gq1ppfh3"; depends=[minpack_lm pbapply RCurl tidyr]; }; MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; }; @@ -2419,7 +2447,7 @@ in with self; { MultNonParam = derive2 { name="MultNonParam"; version="1.2.6"; sha256="1w9kp7qswz38r2xfi8sc52kc52c8hi2jzjsh8gj4491ds1lilv0r"; depends=[]; }; MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; }; MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; - MultiFit = derive2 { name="MultiFit"; version="0.1.2"; sha256="0nyjyjznpl902mv9f05xzgh2y3ckv28zlp1wf87hpigly7491nyz"; depends=[data_table Rcpp RcppArmadillo]; }; + MultiFit = derive2 { name="MultiFit"; version="1.0.0"; sha256="1i15m30bnydxyghp8jpfr6rs2gnilbw38d6ifs2jzdr83qbxyls3"; depends=[data_table Rcpp RcppArmadillo]; }; MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.2.0"; sha256="00prkn5awxrh365j1jz312har1x4p8v52a0sqfy00pqr44ncmqqq"; depends=[fastGHQuad Matrix mvtnorm]; }; MultiJoin = derive2 { name="MultiJoin"; version="0.1.1"; sha256="0cfk6yc5jagj9y8xybw6yg0yph4zah2vzaxv0384ad6r0r3x3nm8"; depends=[]; }; MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.11"; sha256="1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4"; depends=[limSolve MASS]; }; @@ -2427,11 +2455,11 @@ in with self; { MultiOrd = derive2 { name="MultiOrd"; version="2.4"; sha256="0qyjf5fbmirgzqax0rf4lh757103338b18haf2x6r28lbr0zpcmm"; depends=[corpcor Matrix mvtnorm psych]; }; MultiRNG = derive2 { name="MultiRNG"; version="1.2.1"; sha256="01lhxm8vh38zqq405f6c1kpsg2xrz7n4zw7mm40rmx9wzgxar6ln"; depends=[]; }; MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; }; - MultiRobust = derive2 { name="MultiRobust"; version="1.0.0"; sha256="0znj9fnj2bv27qyz49p0rqrvcgqjar8i9hvgm1qx4hjri48rcarf"; depends=[]; }; + MultiRobust = derive2 { name="MultiRobust"; version="1.0.3"; sha256="0gy23l4hj1ik9gkbbr50z7v63kz4b00amycc2v2xxk361ds9jayw"; depends=[]; }; MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; }; MultiSkew = derive2 { name="MultiSkew"; version="1.1.1"; sha256="1s0k3z1vgdz1cxad007p246ghwx282w06inhrjjscbwliz1vg5ib"; depends=[MaxSkew]; }; MultiVarMI = derive2 { name="MultiVarMI"; version="1.0"; sha256="1mlaprg3cfmfwrq7wh64fmyv1wpdnil7wpcrcg3921qydk65py6z"; depends=[BinOrdNonNor corpcor CorrToolBox Matrix moments norm PoisNonNor]; }; - MultiVarSel = derive2 { name="MultiVarSel"; version="1.1.2"; sha256="07qdi43bg03xyr99361c0565m1i5kzqjbvlc2npnyjyc2ygr386d"; depends=[glmnet Matrix tidyverse]; }; + MultiVarSel = derive2 { name="MultiVarSel"; version="1.1.3"; sha256="18wcw80m5knv6hbzczjsx3lf7sn9n84z12zz844agp6234im163p"; depends=[glmnet Matrix]; }; MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; }; MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.2.0"; sha256="047a1pql3jf500gwlap6ws5z7mx0sqmdq6jbql24nl5iypi9jqpf"; depends=[foreach MASS]; }; MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.18"; sha256="1d7cqa44yayyhwkl5wkp68b7vxakfnlwkprs811z8c2fmfm8vk5r"; depends=[lpSolveAPI]; }; @@ -2443,7 +2471,7 @@ in with self; { Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; }; NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; }; NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; }; - NAM = derive2 { name="NAM"; version="1.7"; sha256="18rww9c8dhpany11gcmzin84iayg8165f2x2cfr80vx4y720a6mp"; depends=[randomForest Rcpp]; }; + NAM = derive2 { name="NAM"; version="1.7.1"; sha256="07fx9gd8z3p7irzhhfcmqzc9mfzxpid8z5sxz6flw1vpyiaxqpl3"; depends=[randomForest 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]; }; @@ -2455,6 +2483,7 @@ in with self; { NCSampling = derive2 { name="NCSampling"; version="1.0"; sha256="0bv93xffnzvbip86b3pg7apxzh3410mxff77q119m0z7f6vm3fam"; depends=[lattice randomForest yaImpute]; }; NCmisc = derive2 { name="NCmisc"; version="1.1.6"; sha256="0ycc7b7z26a922hdjq8p4hjljjh09il24h3023k248pcsnbmka1a"; depends=[proftools]; }; NCutYX = derive2 { name="NCutYX"; version="0.1.0"; sha256="0r2ghnvrbya3p1d8rb5bsnz5v852vvc6rq65yafn2xzr7886wrg2"; depends=[fields glmnet MASS mvtnorm Rcpp RcppEigen]; }; + NDP = derive2 { name="NDP"; version="0.1.0"; sha256="0wmld7g4w3d7d8lyj4132h3jpr8ng8kpy4ssqjp8r0lqwif2i86b"; depends=[rmarkdown shiny]; }; NEArender = derive2 { name="NEArender"; version="1.5"; sha256="006128psqxbyw3z4wqflc4xsir3d641r4flwkxmv836lp7fc2d9a"; depends=[hexbin MASS RColorBrewer ROCR]; }; 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]; }; @@ -2478,7 +2507,7 @@ in with self; { NMF = derive2 { name="NMF"; version="0.21.0"; sha256="1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v"; depends=[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="1.4-3"; sha256="1anq2q8a7gyghrnlrkk7k4njpxfnr2944ksyqx8nk8bqhp1k8fcr"; depends=[]; }; + NMOF = derive2 { name="NMOF"; version="1.6-0"; sha256="0m97xi1bpq1gw18fn512blh0li6xv2yfipf2c3aj7bwaq91wv12l"; depends=[]; }; NNLM = derive2 { name="NNLM"; version="0.4.2"; sha256="18hk476mnd89pzrxb65hg20j6cyk2l4l95ksf7vh73fwpxr1dz4q"; depends=[Rcpp RcppArmadillo RcppProgress]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.0"; sha256="02k766klw2fssiii5f4291qvs144ab9i5b6pmqvhyr87zdb87nf9"; depends=[survival]; }; NNS = derive2 { name="NNS"; version="0.3.8.8"; sha256="0pjcgb7g6wzaii0wys164b4hj26z8qkpkd8c26vq793v5rnrx5sp"; depends=[data_table rgl stringr]; }; @@ -2627,7 +2656,7 @@ in with self; { OptSig = derive2 { name="OptSig"; version="1.0"; sha256="1jmnxwci4rzlwgnq4zxhkii9j7ch1bymx44hk3qv7ws24k7g87nn"; depends=[pwr]; }; OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.4"; sha256="0f1szin0isji60gvb0zi240gri6fc4y1s71n96dn5wacdx5b8mhb"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; }; OptimaRegion = derive2 { name="OptimaRegion"; version="0.2"; sha256="0xhl7jp2429007jzx305ggfwyx0vh2vxw7l2a7f3c0prklhyqpqc"; depends=[boot DepthProc fields nloptr rsm spam]; }; - OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; }; + OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; }; OptimalDesign = derive2 { name="OptimalDesign"; version="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; }; OptimalTiming = derive2 { name="OptimalTiming"; version="0.1.0"; sha256="1mchb7wdk1v56la30ivi40aq6zma64lrdb94d64d0s7x67m8315w"; depends=[mstate survival]; }; OptionPricing = derive2 { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; }; @@ -2638,13 +2667,13 @@ in with self; { OrdinalLogisticBiplot = derive2 { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; }; OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.5-3"; sha256="1dx9d8rb1dfqyhyc26zhfnxiv3rz2ikvs2mwqnsrq3lsjs9dvyc8"; depends=[]; }; OriGen = derive2 { name="OriGen"; version="1.4.3"; sha256="0a7mql87dqxrfx7phgy32hbanfwnjx8x52mj83xf2mgmqhrcikr6"; depends=[ggplot2 maps]; }; - OrthoPanels = derive2 { name="OrthoPanels"; version="1.1-0"; sha256="1g78abh9i3x0g34vjqz2ic9330rbgn8k0hgdcrznxgsfnlgnpx9x"; depends=[MASS]; }; + OrthoPanels = derive2 { name="OrthoPanels"; version="1.1-2"; sha256="1adypdjhhfh3xn4lbrz3d67876gil1qk53fjqcvrqxsw46y3mvil"; depends=[MASS]; }; OscillatorGenerator = derive2 { name="OscillatorGenerator"; version="0.1.0"; sha256="0zqw8l955msxkdviw5vd493749zwc22qby9mfmyqnqqmq0pyjw4w"; depends=[]; }; OsteoBioR = derive2 { name="OsteoBioR"; version="0.1.1"; sha256="010l1xhsns1mmc6x6w1kpvzlxms5b92yg379ym2shldyy9dkaj3r"; depends=[BH ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; }; OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; }; OutlierDetection = derive2 { name="OutlierDetection"; version="0.1.0"; sha256="0jai5iaggiiml55k5dviqnrz6w7c1x7f0fsk4ly58zajd4qc8np4"; depends=[DDoutlier depth depthTools ggplot2 ldbod]; }; - OutliersO3 = derive2 { name="OutliersO3"; version="0.6.1"; sha256="1ji12ypv07manbiad3znhv22zqgr7q94b3xibmhhbn3diz6789z0"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; + OutliersO3 = derive2 { name="OutliersO3"; version="0.6.2"; sha256="197r5mxvg968hisgqsd0p1sxjsakmn27gpsh3qx3cnvs1pikj3dr"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; }; @@ -2669,10 +2698,10 @@ in with self; { 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=[]; }; - PBSadmb = derive2 { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; }; - PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.2"; sha256="12pl95mcak88524s8zvk9dzib2g40fwaz6iz7igx9wg6vib9d1sj"; depends=[]; }; - PBSmapping = derive2 { name="PBSmapping"; version="2.70.5"; sha256="15h28lb0zriaf4020l3a069plrklbvbg5x231r5fqflshj6v8a9f"; depends=[]; }; - PBSmodelling = derive2 { name="PBSmodelling"; version="2.68.6"; sha256="1d5shqvzfyi0fy03wcib2db497nsdw211ahfcvl1kaady1immz2w"; depends=[XML]; }; + PBSadmb = derive2 { name="PBSadmb"; version="1.1.4"; sha256="11dxy6rdhwairymigwqxd51hxz82011sx0gzzphcs6i4gr0c54c3"; depends=[PBSmodelling]; }; + PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.4"; sha256="0ks3r4rw6dblmpbwwp57dh8f391qpjsbkpwcxcsvhqddcxacwzq6"; depends=[]; }; + PBSmapping = derive2 { name="PBSmapping"; version="2.72.1"; sha256="0xri8in9631w7qd2m38614al90lr6hak6jh28hcsa8ihdp5azciy"; depends=[]; }; + PBSmodelling = derive2 { name="PBSmodelling"; version="2.68.8"; sha256="07qaqb6sd1idmryxlz0gxb4d3apzql9vp4b16nazba08ksx0y7wf"; depends=[XML]; }; PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; }; PCA4you = derive2 { name="PCA4you"; version="1.2.4"; sha256="117wb0h4jqjymm1p90m6vgj713iavrmj035c2gz5nynligvfnm83"; depends=[mixOmics]; }; PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; }; @@ -2683,7 +2712,7 @@ in with self; { PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; }; PCICt = derive2 { name="PCICt"; version="0.5-4.1"; sha256="17ipmv6ps7c9dv4k9kxjjynnlgr63baz9z9ndwfg0lckc3vw81ya"; depends=[]; }; PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; }; - PCMBase = derive2 { name="PCMBase"; version="1.2.7"; sha256="1siahn1l22lb0lihvkpbmvii17p6sfhg9i74bsg4yk58r4vrh87f"; depends=[ape data_table expm ggplot2 mvtnorm]; }; + PCMBase = derive2 { name="PCMBase"; version="1.2.9"; sha256="1hqqkx630pbi5lp2nhby5jf4gz8q6hihp28h9wlzwakv6dwr2b4w"; depends=[ape data_table expm ggplot2 mvtnorm]; }; PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; }; PCPS = derive2 { name="PCPS"; version="1.0.6"; sha256="0mihkivlpycqbzc3z8clsmiqg3c6hqnapk29h794lf99had03hp8"; depends=[ape phylobase picante RcppArmadillo SYNCSA vegan]; }; PCRedux = derive2 { name="PCRedux"; version="0.2.6-4"; sha256="0nya5fx06mic7knfkzddny9lxqwk039kz0d3mf32rixwlbhrdlr5"; depends=[bcp caret changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR randomForest robustbase testthat visdat zoo]; }; @@ -2697,7 +2726,7 @@ in with self; { 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]; }; - PELVIS = derive2 { name="PELVIS"; version="1.0.5"; sha256="02v5ni33jlz3v25v3d5za9jwv8r80n5swvayfjrq9p8443cxv99h"; depends=[DT MASS shiny]; }; + PELVIS = derive2 { name="PELVIS"; version="1.1.0"; sha256="0n7fk590m5s86gcm13nzrri0d3jc8jxnlp025h7c09ywpvpnqsb9"; depends=[DT MASS shiny]; }; PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; PET = derive2 { name="PET"; version="0.5.1"; sha256="1gdq7ai8hgl9h53b72j7sfk09l7yr2b84pdy9bl1z3x8zxbsp8br"; depends=[adimpro]; }; PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; }; @@ -2729,7 +2758,7 @@ in with self; { PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; }; PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.1"; sha256="076nzcnky3c3rp88b9vkqxsvws8jy81yb2aw8sa1ddz6b9hx0f4i"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; PMmisc = derive2 { name="PMmisc"; version="0.1.2"; sha256="03bavk7ylmrrcc49zy9fb2q08w6138b3srxa4x038syr115k3l6k"; depends=[ggplot2 robust]; }; - PMwR = derive2 { name="PMwR"; version="0.10-1"; sha256="0z32cfa46mhmwnvlqpw6md9dyyy2hn5mwlrf2v4lx1b1gxqskjpd"; depends=[crayon datetimeutils fastmatch NMOF orgutils textutils zoo]; }; + PMwR = derive2 { name="PMwR"; version="0.11-0"; sha256="06ywmkjia7w9dbj1m0ihj3nv0f9gcsnlvd5xvnspy8zb2l0gdk3y"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.3"; sha256="1mckjb6q7ffvzsifjwc411p9r1vykvczk6v7lcsmpzliifgc0ys4"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; }; POCRE = derive2 { name="POCRE"; version="0.5.0"; sha256="0aph1lmb0xkzm4l4ah2wrx13d138igf4k4w9wb9lca4vv6m7xzqf"; depends=[EbayesThresh ggplot2 pracma]; }; POD = derive2 { name="POD"; version="0.99.0"; sha256="0dyvb95gbr97440839facyjdy7g8r3lq9h9gc9haqzixjflx4hvs"; depends=[]; }; @@ -2738,7 +2767,7 @@ in with self; { 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-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; }; - POUMM = derive2 { name="POUMM"; version="2.1.2"; sha256="0pspx3xsixn98diw8sklzgr3lfvxmxn9fnn6m1lcf5byw1i9xhan"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; }; + POUMM = derive2 { name="POUMM"; version="2.1.5"; sha256="1d578c2ybp1sm6ljagdgr7zv3yx7jq2wmc6dal6l7wyhchj1nj87"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; }; PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; }; PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; }; PPCI = derive2 { name="PPCI"; version="0.1.4"; sha256="18q9jjmmmmghwyzpj42k7xa55anvbg1jnqs2y6c5jzlb2cw3ga4h"; depends=[rARPACK]; }; @@ -2760,6 +2789,7 @@ in with self; { PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; }; + PRSim = derive2 { name="PRSim"; version="1.0"; sha256="14rap5s38xmx8hgqr71q7r4g5kz098qwwv8m0b3pgfxa6ghnsgjx"; depends=[homtest]; }; PReMiuM = derive2 { name="PReMiuM"; version="3.2.1"; sha256="0cn08w7kw0j0z8nqv380m7xs35f4mlhzx0jyzyqk811v9jzk0jii"; 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]; }; PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; @@ -2773,14 +2803,14 @@ in with self; { PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; }; 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="0.92.4"; sha256="1gq99g6kvmlzbr1530a03in1i91rhwswz2qxa8pv9bv53sfkxx59"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; }; + PTXQC = derive2 { name="PTXQC"; version="0.92.5"; sha256="0zazsjh0ll8vgvcp6kd4s7g2b4xgmpg822xl6pwy3r03800l50ds"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; }; PUPAIM = derive2 { name="PUPAIM"; version="0.1.0"; sha256="0lkfp1jlcf0m0h7hqvbcr0sq0kbdwpvqvz52rs8j5n7ywiky4q3i"; depends=[FSA Metrics minpack_lm]; }; PUlasso = derive2 { name="PUlasso"; version="3.2.2"; sha256="1kjgdps79zkfscdhr94bgirk384bb81i21pnxj1p3fmv98wra8ma"; 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]; }; 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.1.3"; sha256="0wybb5ygcvz5w2sl26rwm7hg6681lzcyr5v1nl7lb72z565f1wqw"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sp stringr tibble tidyr xts]; }; + PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.2"; sha256="0l0ry134cglrp949pm3rrz8ar5dp550mbi6rxvaci0w3ywsk6g17"; depends=[cluster dplyr dygraphs geosphere ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sp stringr tibble tidyr xts]; }; PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; }; Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; }; PairViz = derive2 { name="PairViz"; version="1.3.2"; sha256="01nzf7as848i3vpwgdm450x3f5lapfh2vgd59sy6qr80c19nfjl9"; depends=[graph gtools TSP]; }; @@ -2794,7 +2824,7 @@ in with self; { PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; }; PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; }; Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; - ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.0.1"; sha256="0m6pz9cv1ifj6xc6a216ky5vs9g4dwdwn3gbqrlqkg42n1ndkwnc"; depends=[data_table dbscan foreach GauPro]; }; + ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.1.1"; sha256="12s02gvb2ilra8xca3yqb6pzy0pizvnq08kp05gj0xkdas4rb5z9"; depends=[data_table dbscan foreach GauPro lhs]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.0"; sha256="007linzn60bjs8nh1j1jzb292naxajjpkjwmhjc992h8himxfky4"; depends=[jsonlite snow XML]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; @@ -2824,7 +2854,7 @@ in with self; { Peptides = derive2 { name="Peptides"; version="2.4"; sha256="1i5p0z4zhis4p1czwz3cryr64lys4dp2fddnmmasgspl8fyz8p05"; 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.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; }; + Perc = derive2 { name="Perc"; version="0.1.3"; sha256="1wkhxwq15x2niabgnchr93h132ynswsjb81ignlk1rsqppm4hkr5"; depends=[]; }; PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; }; PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.5.2"; sha256="01bgm57z079g6r505w3bj293zkbd49fwa8sg55z87vizwavipml6"; depends=[quadprog xts zoo]; }; PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; }; @@ -2846,8 +2876,7 @@ in with self; { 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]; }; - PkgsFromFiles = derive2 { name="PkgsFromFiles"; version="0.5"; sha256="1fbvnlw6hxg6zndyrssiw5yyp6hz3ln985by3vwp34sfwdcwjakl"; depends=[curl dplyr readr stringdist stringr XML]; }; - PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-3"; sha256="1w2ihclnh3x83ip4hh95bchv5j832cqy6n140q5q1dbfz6fy1bxv"; depends=[igraph MASS Matrix partykit psychotools psychotree qvcalc rARPACK sandwich]; }; + PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-6"; sha256="0f6n2q8c4kmcq6hy6jk65v3y390rn84nd8dfc9r0g6qqwizwi16b"; depends=[igraph Matrix partykit psychotools psychotree qvcalc rARPACK sandwich]; }; 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]; }; Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; }; @@ -2855,6 +2884,7 @@ in with self; { PlayerRatings = derive2 { name="PlayerRatings"; version="1.0-3"; sha256="16wff9kqcp462qxvhifyx942jp1i6vpsl2y0llph7ahfs8f0prjn"; depends=[]; }; 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=[]; }; PogromcyDanych = derive2 { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; }; PoiClaClu = derive2 { name="PoiClaClu"; version="1.0.2.1"; sha256="1q89b0nypz2iivmgwg1nb1l7p285wy00s40j3qp8zc78ra1rjhyx"; depends=[]; }; @@ -2868,8 +2898,8 @@ in with self; { 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.1.1"; sha256="100hxrzgyxxnwm2y2f0y740x9qk7dhxnrvya6hyg3kgg0mmr3nq3"; depends=[colorspace scatterplot3d]; }; - PolynomF = derive2 { name="PolynomF"; version="1.0-2"; sha256="0zczryvjykr7yifb5isvys2mzgi0yj92j3p3xixn2qzzq9cr0h9a"; depends=[]; }; + Polychrome = derive2 { name="Polychrome"; version="1.2.0"; sha256="0aflqhhz8vmh30jd1yx7zsvnxjzkvsy2wkwhgm89vgdvqp5bq76y"; depends=[colorspace scatterplot3d]; }; + PolynomF = derive2 { name="PolynomF"; version="1.1-0"; sha256="03q11zz4p8673f27x3md8q2pz568c33gn1yd5a2rqj2xf320wli8"; depends=[Rcpp]; }; Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; }; PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; }; PopED = derive2 { name="PopED"; version="0.4.0"; sha256="1cj6nj5w4ckvnldpc7g4mxdps619zlhzsdibd9ih8i2lxh1xbrfz"; depends=[boot codetools dplyr ggplot2 magrittr MASS mvtnorm purrr stringr tibble tidyr]; }; @@ -2902,8 +2932,9 @@ in with self; { 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.2.6"; sha256="0ii001d3z6kmgx70hv4d1gblxz64msn1xcbicshja9cy91qpi1b4"; depends=[celestial cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; + ProFit = derive2 { name="ProFit"; version="1.2.7"; sha256="0mbxlrfm7sdamrwyv587mrp86r82pk73fp8iq63dpwwv3nmdq00r"; depends=[celestial 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]; }; + ProPublicaR = derive2 { name="ProPublicaR"; version="0.9.2"; sha256="17fghv7w4wm4q9nd6l4pl5ibk5i4zgdhlp5pvbzvymhvby0q06sw"; depends=[config dplyr httr lubridate stringr]; }; ProTrackR = derive2 { name="ProTrackR"; version="0.3.6"; sha256="1lhk3lrspiqcw2ckss52gdjk1f6ph8m7dlb05qxcx8mycq0xd3z9"; depends=[audio lattice signal tuneR XML]; }; ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; }; ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; }; @@ -2926,11 +2957,13 @@ in with self; { PtProcess = derive2 { name="PtProcess"; version="3.3-13"; sha256="0vk1n7hk6v592fi5ld70db6m92zgpjx97axs5h8p53c29984qhwz"; depends=[]; }; PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; }; PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.6"; sha256="1wfp1fpr4an7psrwidx38brvhvghmvfsgjy4gdx81p1bdsdn2kw2"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; + PublicationBias = derive2 { name="PublicationBias"; version="1.0.0"; sha256="1bl7msds7q8d08njgslv6ly631cmrp5yabqcayrpc852p2335q4l"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; }; Publish = derive2 { name="Publish"; version="2018.04.17"; sha256="0dbcql2mi2qsxzcgcqa58yqynfq1800fa06ikyay2dm6gdyf0apq"; depends=[data_table lava multcomp prodlim survival]; }; PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; PwrGSD = derive2 { name="PwrGSD"; version="2.3"; sha256="1iisib4bnb3fp0nwxnal13fgd0fs1vckchr4cj716k72jh6k7slm"; depends=[survival]; }; PxWebApiData = derive2 { name="PxWebApiData"; version="0.2.0"; sha256="0mpasacnlrwb37n221j04fzms63b63nj9z8d4h21nhkhmclrsxgg"; depends=[httr jsonlite rjstat]; }; PythonInR = derive2 { name="PythonInR"; version="0.1-6"; sha256="0m5ppiklg4rqc3czkkb6xvkiw3bv3g6c9qcvs70i7l9gxh34xghv"; depends=[pack R6]; }; + QAIG = derive2 { name="QAIG"; version="0.1.5"; sha256="1cchf5x7wzc3mc6xzvq14kmd9yxr9kq237s8af4xqaz1pv0b093j"; depends=[Formula stringr]; }; QCA = derive2 { name="QCA"; version="3.4"; sha256="1q6ih3k9dzdmmdbjx761awgqjnf9bal4zcc5h614ibak9zfabc0y"; depends=[fastdigest 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]; }; @@ -2946,7 +2979,7 @@ in with self; { QHOT = derive2 { name="QHOT"; version="0.1.0"; sha256="02z0n2jawd6m7bvyvpcy0j13p1c0zm036g62n56xva18qnq5c9lb"; depends=[]; }; QLearning = derive2 { name="QLearning"; version="0.1.1"; sha256="1bx77yxsnzh0ny3ghala5fw54lxzrxqk9s32qk3dzvfbyp4paggn"; depends=[]; }; QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; }; - QPot = derive2 { name="QPot"; version="1.1"; sha256="1ivkk5wdd1lp6v4hwmpr9g230kd7zgmj0vnv5fw0svwpb8zzz14x"; depends=[MASS]; }; + QPot = derive2 { name="QPot"; version="1.5"; sha256="0q80v3nssrd95z976k9w3j2yip2m2fvlzggpajwj3874vfr0jjva"; depends=[MASS]; }; 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]; }; QRM = derive2 { name="QRM"; version="0.4-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; }; @@ -2955,7 +2988,7 @@ in with self; { QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.1"; sha256="14zdq8a352jvgzq1wp0jj2wx3hs3cr5dpryyvlhv2c0syldlw7xl"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp stringr]; }; QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="1.0"; sha256="05v93p3s9kncyzhiqgmd79h6b61xrr2k9vpgv9hjj0pkhsyanqc1"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp shiny stringr]; }; - QTLRel = derive2 { name="QTLRel"; version="1.0"; sha256="0hlnh04w45imf0f7rm9pg1whlps5zxh00qvvn81hip16bv48cw79"; depends=[gdata lattice]; }; + QTLRel = derive2 { name="QTLRel"; version="1.1"; sha256="04v6cxqvnpziz46qgnkyn9hpg5pr61js83iy8fw9lp36bw51yknc"; depends=[gdata lattice]; }; QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; }; QZ = derive2 { name="QZ"; version="0.1-6"; sha256="1vgqwv3rbnmz2sgbmbivgnxcwy5dzgk6ivqskdnqkil4f10zflmi"; depends=[Matrix]; }; @@ -2970,7 +3003,7 @@ in with self; { QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; }; QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; 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="2.4"; sha256="1wv8jlpzai5w6mpf5ha463aqdba4i2yyrf4s0wr7ppjgg6ri092m"; depends=[]; }; + QuantumOps = derive2 { name="QuantumOps"; version="2.5"; sha256="0255889a71i4946xp01nb467xki6qydfgrvcdkr4fscxw2k9mgrl"; depends=[]; }; Quartet = derive2 { name="Quartet"; version="1.0.2"; sha256="17xj05ysi46w3zh1s10gml7cll4w6zdsn9x1ak8rjf7hwszidskg"; depends=[ape memoise Rcpp Rdpack Ternary TreeSearch]; }; QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; }; R_cache = derive2 { name="R.cache"; version="0.13.0"; sha256="1hf5cb7xvnca5zlh9245b5g62sgsaxwdhiv7x59yld37cydakm6k"; depends=[digest R_methodsS3 R_oo R_utils]; }; @@ -3020,11 +3053,11 @@ in with self; { RAdwords = derive2 { name="RAdwords"; version="0.1.18"; sha256="1c3m2j2cf1s51p783rdng5ns913bv7rbjc1vpmrmsxg2kf5f6qyq"; depends=[RCurl rjson]; }; 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.1"; sha256="04jaa8z4di8l1apm3gdcxp5i9005qcrw70ngwy5b38a7l3cshqdn"; depends=[unix]; }; + RAppArmor = derive2 { name="RAppArmor"; version="3.2"; sha256="0apw4l7z0jwa7bs7scfysv2amk2rxi7knw9x9j7vqlrgj0i059gm"; depends=[unix]; }; RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; - RBesT = derive2 { name="RBesT"; version="1.3-7"; sha256="0ndm97x453bzchi9skrwp2a40kmxd927l5pyy0kshyhl4jckvqj2"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; + RBesT = derive2 { name="RBesT"; version="1.3-8"; sha256="1r2g50izlq2d8c4sa8x6lhw4yyas8a3pmrz4hrirdfmsknarcj27"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; RBitmoji = derive2 { name="RBitmoji"; version="0.0.2"; sha256="1v9qj3vmqsvnccsy735nbflmd81183h2flm0f1ckd4kl08r2fr3f"; depends=[getPass httr jsonlite png RCurl]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; RCAL = derive2 { name="RCAL"; version="1.0"; sha256="1hpn69891h9cildwr6wsssa3fnnzyw0xw9vfgf4qdg0m9x6il6qb"; depends=[trust]; }; @@ -3037,7 +3070,7 @@ in with self; { RCarb = derive2 { name="RCarb"; version="0.1.2"; sha256="0yyg2b7hr0qnqwy6lia7vcznl06qavdplbnn0byvv8938v64ifvi"; 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.0"; sha256="0jj4jj9qnj7pils99hzw9yx5bwi182q4afdsqh7w7d9kzhp6xl3z"; depends=[]; }; + RCircos = derive2 { name="RCircos"; version="1.2.1"; sha256="1zdq3ga2pd0p2gzlm0vr8w3a4rq4hgka3r56kkcym0za0nmqk51v"; depends=[]; }; RClickhouse = derive2 { name="RClickhouse"; version="0.4.0"; sha256="0lb0sgs2f78y2z5ip2wqml88vykrwkdhn3i36y9hyrm34ackis6h"; depends=[DBI dbplyr dplyr Rcpp yaml]; }; RClimMAWGEN = derive2 { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; }; RClone = derive2 { name="RClone"; version="1.0.2"; sha256="1kv02acj0mk5102wvmdnxnkb7qig3jb9amcs4k2r26fpa4hyfa7f"; depends=[]; }; @@ -3047,7 +3080,7 @@ in with self; { RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; }; RCurl = derive2 { name="RCurl"; version="1.95-4.12"; sha256="1x2z708y89fjphhzs76lycs5rmh5i411wallmhyq4h6zmzppjdrr"; depends=[bitops]; }; - RCzechia = derive2 { name="RCzechia"; version="1.3.3"; sha256="003lp4m41h7kgi3mzzyss5xgryyfz4g3lvb9w4wbc5gr3kyl233a"; depends=[curl httr lwgeom magrittr sf]; }; + RCzechia = derive2 { name="RCzechia"; version="1.4.0"; sha256="199igyynmgzfx4czffa6y8mv8radzhpxjd1z7spg3xaia8jz30ky"; depends=[curl httr jsonlite lwgeom magrittr sf]; }; RDFTensor = derive2 { name="RDFTensor"; version="1.1"; sha256="1xbar13snwyls6rva91bs0632zplfc2qcqlwf7h07r8798m3234s"; depends=[Matrix pracma]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; RDML = derive2 { name="RDML"; version="0.9-9"; sha256="0amlr7mxp7175a7rd3jw7lhyvp3lnr01y81l27sl148sfb85zar6"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; @@ -3073,7 +3106,7 @@ in with self; { RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; }; REST = derive2 { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; }; REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; }; - REddyProc = derive2 { name="REddyProc"; version="1.1.5"; sha256="1f0r8pdyghqbgrncar83pj935crf80yqms48sj9yf1jal5px068b"; depends=[dplyr mlegp purrr Rcpp rlang tibble]; }; + REddyProc = derive2 { name="REddyProc"; version="1.2"; sha256="1jwmxr9xl45n7r3h6h634lw81j07bn26nhjhwww5nnwwyyylcn4b"; 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.1.0"; sha256="1xqdxyrg32ymgidmsayv0kgwdsxm8b34hvkn5mghdvhw7rambkm3"; depends=[AER corpcor data_table Formula lme4 Matrix mvtnorm optimx]; }; RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; @@ -3108,7 +3141,7 @@ in with self; { RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; }; RHMS = derive2 { name="RHMS"; version="1.5"; sha256="01fdj56hlx221yanbbsqka4k328h7lf3z42rxg2yc3lm5wcbq3d5"; 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.3"; sha256="09rcf9da04195myh4mwva3hqcd483k0wwcn84jgbkj8a5z1zxqc6"; depends=[lomb nonlinearTseries tkrplot waveslim]; }; + RHRV = derive2 { name="RHRV"; version="4.2.4"; sha256="0jf2vms2yr2d52x8g5fz6v2pd2gzgc5z96fnbf63s55fni72rbxm"; depends=[lomb nonlinearTseries tkrplot waveslim]; }; 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]; }; @@ -3174,9 +3207,9 @@ in with self; { RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; }; RNetCDF = derive2 { name="RNetCDF"; version="1.9-1"; sha256="0idfskxb1k8x0zzl6b0kgskdxn7zr49gw9xcj870ah9zp93iwnkx"; depends=[]; }; RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; - RNewsflow = derive2 { name="RNewsflow"; version="1.0.1"; sha256="1vxzcsiapnq8101iq4w73m9k8cq2khgcsxak71x72n295r7qpsd6"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; }; + RNewsflow = derive2 { name="RNewsflow"; version="1.1.0"; sha256="15dq5xmci20il4xgbsjcgx1x9l443x6cizvzfzr1w66ab7aa4jxz"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales slam stringi tm wordcloud]; }; RNifti = derive2 { name="RNifti"; version="0.10.0"; sha256="07sfzps4yg5zdhbxh6i4rbjvbjvvf2d8i9jcf64ywbmi557sw1zv"; depends=[Rcpp]; }; - RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.5"; sha256="0dj18ialdvknxjndzgq7n3zhvy58s7ccpkx6acx8flxvaraaczwk"; depends=[ore Rcpp RcppEigen RNifti]; }; + RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.6"; sha256="0a1f2nzlw1w9hd8kdiqal1kz8jabc5wvc5l9w5z1pjfgsry4jy75"; depends=[ore Rcpp RcppEigen RNifti]; }; ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; }; ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; }; ROCR = derive2 { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; }; @@ -3218,7 +3251,7 @@ in with self; { ROptEst = derive2 { name="ROptEst"; version="1.1.0"; sha256="147418w2njjqb9f9iga4ap7vmxi80y1np6ksgx8g546daswmdclp"; depends=[distr distrEx distrMod MASS RandVar RobAStBase startupmsg]; }; ROptEstOld = derive2 { name="ROptEstOld"; version="1.1.0"; sha256="0wmwijzh614angm272glyikn8g64arj11an58knrgnvjc3lz8rx6"; depends=[distr distrEx evd RandVar]; }; ROptRegTS = derive2 { name="ROptRegTS"; version="1.1.0"; sha256="1kjmyn182283llb02kf0ky1fyvw5l4p21q9s64y3hi5pahrqmr1v"; depends=[distr distrEx RandVar ROptEstOld]; }; - ROptSpace = derive2 { name="ROptSpace"; version="0.2.0"; sha256="119b3q43rkqhyprs0vx9wwsddq3awbj2mizzwqhpjjzz4gp5v866"; depends=[Rdpack]; }; + ROptSpace = derive2 { name="ROptSpace"; version="0.2.1"; sha256="1sc7f2q9856c351nqb6dgq1d34jpahvfxb5l43npa04lm1hh7hqw"; depends=[Rdpack]; }; ROptimizely = derive2 { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; }; ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; }; RPANDA = derive2 { name="RPANDA"; version="1.5"; sha256="0p91096304g6rz639rwwvbppypf5aqj7765xjm3mqpi0gnp48s62"; depends=[ape cluster corpcor deSolve fpc geiger glassoFast igraph mvMORPH mvtnorm phytools picante pspline pvclust Rmpfr TESS]; }; @@ -3242,10 +3275,10 @@ in with self; { RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; }; RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; depends=[iterators itertools]; }; RQGIS = derive2 { name="RQGIS"; version="1.0.4"; sha256="0x4jilj5nbikgkcg09913v3dgnfw0aqwwx66xajsfk5lqi6w5vjz"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; }; - RQuantLib = derive2 { name="RQuantLib"; version="0.4.7"; sha256="0km42yxkwrfapf0vrwjdyxvnbpfz9dyxbfpqcjy4cw0icgchzj6p"; depends=[Rcpp zoo]; }; + RQuantLib = derive2 { name="RQuantLib"; version="0.4.8"; sha256="17avjk4gwspgn3xb100bqhglsdngm7jmldwrap9adr96rf6kq4hd"; depends=[Rcpp zoo]; }; RRF = derive2 { name="RRF"; version="1.9"; sha256="1j8s07h0bn8imi0g1lkdwismisd6m4v454nldjp5jl11lffyiiaq"; depends=[]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; - RRPP = derive2 { name="RRPP"; version="0.3.0"; sha256="0f9p6z8lx63d3d34x6lbpiqq26mipa2rbffkk21z7r3qgb7adzil"; depends=[]; }; + RRPP = derive2 { name="RRPP"; version="0.4.1"; sha256="16gqhq7spijd7piswqp0za7kg6k6hya2bw357zhzgms0j843pkfp"; depends=[]; }; 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]; }; @@ -3280,7 +3313,7 @@ in with self; { RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.15"; sha256="13mrqf458m43g435g4pbg49pid63f4ap1r8jzl84mvj1b36hy4q6"; depends=[base64enc digest httr jsonlite plyr stringr]; }; RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.3"; sha256="02zswadv65a5p5q9rr12f819mh7jjqk8xj1kc1c0wqvr8dgz7fx9"; depends=[RCurl]; }; RSocrata = derive2 { name="RSocrata"; version="1.7.5-3"; sha256="009psb53z0ack0fhxxdchywba3wgdi33fmm8r14fiv1bnb0abh6j"; depends=[httr jsonlite mime plyr]; }; - RSpectra = derive2 { name="RSpectra"; version="0.13-1"; sha256="1sw80chwyyjzf5px278l6xmp94yhwrlj5xh8d3wlw3dnvdkycca7"; depends=[Matrix Rcpp RcppEigen]; }; + RSpectra = derive2 { name="RSpectra"; version="0.14-0"; sha256="12w5vnz39gyciza0fl7fw4f9i9kjw763h3mvk1sxd97c5dsn26jg"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; }; RStoolbox = derive2 { name="RStoolbox"; version="0.2.4"; sha256="1lj3jlmlg1cffkpi0x5mjl0ypppjxcsl5zamxvld9ng8m2pgkbm7"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; }; @@ -3298,10 +3331,10 @@ in with self; { RTest = derive2 { name="RTest"; version="1.2.3"; sha256="1npk1n770b17rnh69srsng3y64skwkyzdsizficz79dhiq3axrbk"; depends=[base64 glue jsonlite magick magrittr rlang stringr testthat XML]; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTransProb = derive2 { name="RTransProb"; version="0.3.3"; sha256="1fl8ag7aizj7k7j5ypx632qa98jp3wp8z3mp5z490n1277ajzrkb"; depends=[caret chron e1071 expm MASS Matrix matrixStats neuralnet nnet pracma Rcpp RcppArmadillo zoo]; }; - RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.7"; sha256="16mrhbjg0s09vqxwllsm1q7wzx0kma7gfzyh0szhcf62z5y0a2x1"; depends=[future future_apply Rcpp]; }; + RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.8"; sha256="03si7hsr4a0pq29r7pb2qp1h17qhk9id5lvx8x2kc6xpqacjsqx1"; 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-72"; sha256="0xcdasdyzvj7ikwr0i2wf3a4319w4c5q8wwarj0wrcl3cxvxnyjl"; depends=[ade4 boot car cramer FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-73"; sha256="1zjvvqdcczpnxkm6n3zxv8ysgn5x44k7w2b12yx01h2x71bwg1hg"; depends=[ade4 boot car cramer FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; }; RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; }; RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.7"; sha256="08mhn6732sb284y4garx0nvhad4r42pk39p3r82fad4c1c3rxkhg"; depends=[]; }; @@ -3310,11 +3343,11 @@ in with self; { RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; }; RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.2"; sha256="1928hyfmy21s586nafd5qajbypqslc96zfmxbi42rcmvzim16v3k"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; - RWeightedKmeans = derive2 { name="RWeightedKmeans"; version="1.1.0"; sha256="07qnwcg4b4dls6jgk1jz23s4y11ml86hs9ghmd3hdh5rcmri879s"; depends=[clusterCrit fpc]; }; RWeka = derive2 { name="RWeka"; version="0.4-40"; sha256="19xhrbr0105yax1534z1h08p1nxdmsg2dfch8kpqj37n9zmnx6zg"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.3-1"; sha256="16syvpc9qfn19sjdp3jikmzccj198ybr8dar7fajfaqsfms2kgfw"; depends=[rJava]; }; RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; }; RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; }; + RWsearch = derive2 { name="RWsearch"; version="4.5"; sha256="141gsrwhw0nr0mp4z9m5cky7b1pxq8bdv832v5irs7mlipdksd33"; depends=[brew latexpdf sig sos]; }; RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; RXshrink = derive2 { name="RXshrink"; version="1.1"; sha256="0m8fjcpiv4dp3p9819i3qwfrly5153jpn9v3d2yr674334s1drm5"; depends=[lars]; }; @@ -3322,10 +3355,11 @@ in with self; { 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.1.6"; sha256="1sb1lmm5vnzkbzqxbmipkm2zb01zg2x15jgyrsplardyy8kpqxn7"; depends=[Rcpp RcppEigen]; }; - RZooRoH = derive2 { name="RZooRoH"; version="0.2.2"; sha256="1y525363hd307nrllh1k7dnaiyfz3rslxjayqhxmlawknq0pbg6p"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; + 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]; }; RaceID = derive2 { name="RaceID"; version="0.1.3"; sha256="1kmhjqhm6v4blwnll67b79ywrpsiygipz30nylxfi0030p37bld2"; depends=[cluster coop FateID fpc ica igraph irlba locfit MASS Matrix pheatmap quadprog randomForest RColorBrewer Rtsne vegan]; }; - RadOnc = derive2 { name="RadOnc"; version="1.1.4"; sha256="1ri6ybzhfdgbrbfcy12mmvv2ipg61az7vwp1dbjyzs8mgsc1cxb5"; depends=[geometry oro_dicom ptinpoly rgl]; }; + 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]; }; RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; }; Radviz = derive2 { name="Radviz"; version="0.7.0"; sha256="0x1b3s3i3f775m7ragvzpdswljry8adbkjb6aq35aqasnkvvnysq"; depends=[gridBase hexbin KernSmooth MASS]; }; @@ -3335,7 +3369,7 @@ in with self; { Rambo = derive2 { name="Rambo"; version="1.1.1"; sha256="036rvjj6gcnf2gg5xl55n5p8j1pzifb9wmlpwnymz1csxgkl477i"; depends=[sna]; }; RandMeta = derive2 { name="RandMeta"; version="0.1.0"; sha256="0bh3rkdfmwqym47q8f90pw3mmx7q8jyp4rz16ggqrmk1b5bdyqjb"; depends=[]; }; RandPro = derive2 { name="RandPro"; version="0.2.0"; sha256="1bhbg6lvgr9h6rq3g3ljm2422ngjb18maj80l7f659ql88c8h6mj"; depends=[caret e1071]; }; - RandVar = derive2 { name="RandVar"; version="1.1.0"; sha256="1kb7b12laf2vvc2m3xfh8wdxb0vcapns52qfbkpn8hg6ba75s1px"; depends=[distr distrEx startupmsg]; }; + RandVar = derive2 { name="RandVar"; version="1.2.0"; sha256="1ppn14596wmr2lf86rm261736rknvayhzfzgyysmfzd5s23flpki"; depends=[distr distrEx startupmsg]; }; RandomFields = derive2 { name="RandomFields"; version="3.3.6"; sha256="04q20nfgskbjm12ibq4xzhywv9h8hm17ziq72b7d0zxxwnsbzdsi"; depends=[RandomFieldsUtils sp]; }; 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]; }; @@ -3352,8 +3386,9 @@ in with self; { 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.1.2"; sha256="1sgzzsf67z9i8pybc7xsnl1zpyq8rlpsgc2vwkz9lpc5745c44n6"; depends=[curl RCurl xts]; }; Rblpapi = derive2 { name="Rblpapi"; version="0.3.9"; sha256="0v99nbvb3y1y33lfn29lj111khz0b4xp4y7f1r6p3hsfyn9h1ivg"; depends=[BH Rcpp]; }; - Rborist = derive2 { name="Rborist"; version="0.1-8"; sha256="0zr8vfbv11ascng7n2zv5xbqv7h0r0bycwn8bqlq8q10y2lyxg70"; depends=[Rcpp RcppArmadillo]; }; + Rborist = derive2 { name="Rborist"; version="0.1-17"; sha256="0vsld7qr9zl9a6fj1vwdh6avdh23vkibyng6j8q0kd3za0dibcl0"; depends=[data_table Rcpp]; }; Rcan = derive2 { name="Rcan"; version="1.3.64"; sha256="1mngfkjksk7jw7gs16c7b736qmw72vkk7k9vlgqhfixwj0ckbvwb"; depends=[data_table ggplot2 scales]; }; Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; @@ -3363,7 +3398,7 @@ in with self; { RchivalTag = derive2 { name="RchivalTag"; version="0.0.7"; sha256="0i25rj3f54km2gdr8izgvqdbdbcq4nikywn5narm7sg79fv43pd4"; depends=[mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; }; Rchoice = derive2 { name="Rchoice"; version="0.3-1.1"; sha256="0nmbb6wfgz164fncljnsr11j2w1hi235hysxn1p2mgc6l301rqhm"; depends=[Formula maxLik msm plm plotrix]; }; Rclean = derive2 { name="Rclean"; version="1.0.0"; sha256="065jq957xsk9p1nnzf8ilp9swjfxhydgc7xg57lfcg9hz99ckwfr"; depends=[formatR igraph jsonlite]; }; - Rcmdr = derive2 { name="Rcmdr"; version="2.5-1"; sha256="0jw4bvv6wjznra6n9ad3hqvgfi5m9i8axyhms1kgqrcd5n4zcfcf"; depends=[abind car effects RcmdrMisc relimp tcltk2]; }; + Rcmdr = derive2 { name="Rcmdr"; version="2.5-2"; sha256="1b2c42llb65xbwmp26xyws7zciwyybp0kn78v5hwimxw7p59v7nw"; depends=[abind car effects RcmdrMisc relimp tcltk2]; }; RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.5-1"; sha256="10cnvk541cx8lzapra2104dn1kh780phzz29dwvfwrx4k9vfbh7i"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; }; RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; }; RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; }; @@ -3408,12 +3443,12 @@ in with self; { RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.10"; sha256="02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; 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.0"; sha256="1hlbw4k79q9ich4w27b01gsvwrsnrflii8zjlcmgfzm1vpq8ndxp"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="1.0.1"; sha256="015rmxns8mhmnd9wnz9bmma4iwx2sf4bcwkkp9hcgvdmblzf0vg7"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.5"; sha256="0188sabgfmgh83yr3hmqpg5cmhllfkxzbxxchqr2r2fmj6x0ib1a"; depends=[Rcpp]; }; - RcppAlgos = derive2 { name="RcppAlgos"; version="2.2.0"; sha256="0sq482qzg3xa52ny2xfvj4vrrfnk0qng4fqmw5jfaqr806r7sbrp"; depends=[gmp Rcpp]; }; + RcppAlgos = derive2 { name="RcppAlgos"; version="2.3.1"; sha256="1gj9xak9pvipj51wydf6d8mw28y23z9hi6xmali4w6mcdlvmljyh"; depends=[gmp Rcpp RcppThread]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.11"; sha256="1ik50ancfgcvh03n4jsqwjk8lf056rbgd70q4l4didmvh5kcyjd1"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.200.7.1"; sha256="1gy3ywzw1cx344a8xihnmflgxphy2fhci7ng85msqd1iv9gzxyk4"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.300.2.0"; sha256="02zha49v6s8g39dcmk5dz0pygx0jibgmcwsyzybp9wmlqxnmdvip"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.5"; sha256="03r7qfhxmn20925yjvqs5cbm255yk4kbrvw16dl2r98argblcmmk"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; @@ -3423,10 +3458,10 @@ in with self; { RcppDE = derive2 { name="RcppDE"; version="0.1.6"; sha256="1i9jj595nqpb16y22z2b8fcf0gq1fg0pbiisbd837p1cyw4nff69"; depends=[Rcpp RcppArmadillo]; }; RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; }; - RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.1"; sha256="1j5sd63fc04pya08spxj2plp2whidy1x7r29zarf5xlcxdn1ji28"; depends=[Rcpp RcppArmadillo wrapr]; }; + RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.2"; sha256="0bp2ml70wclvqm39vylawwwd8jz245cxzkv97j6wlvni16g8yprn"; depends=[Rcpp RcppArmadillo wrapr]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.5.0"; sha256="01bz41c29591ybzqn4z88ss036ai3anh9figryvmfpqcfwbszip5"; 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.1.13.0.1"; sha256="1zcvdpwbdzhkrzhfzg68ppp0g9q4cm266sq8k6i7j4abz0n895wi"; depends=[Rcpp RcppArmadillo]; }; + RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.1.14.1.1"; sha256="0dyqiyypschfjl80p20ch0ixsbvjkygyn6a559b0nkvj6d3mm2gj"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.8"; sha256="15iw2vx6ygb03siq743418whhqvfrxk2i4nqn7p9yg1m3jwafxna"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.6"; sha256="16pdapq31729db53agnb48jkvdm97167n3bigy5zazc3q3isis1m"; depends=[Rcpp]; }; @@ -3474,12 +3509,13 @@ in with self; { ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.4-1"; sha256="13x8yryl5vp3rn6n2hd14ng6cgr3bxkps4y1vanimbwv4faa8116"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; - RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-10.2"; sha256="0bj8x1w1yfm7xfcgvazs8hgkhkyryibqknjx5x2pvnmvwd5ywdiv"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; + Recon = derive2 { name="Recon"; version="0.1.0.0"; sha256="153963p75vnaikp55khr1qnhvhhpzs82hc8fyrpcglpbmymq27v7"; depends=[rootSolve]; }; + RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-11"; sha256="1jljy6wav0q45p56zjkld2l7kw4hi0ahxnfim23rk7y2b17170fg"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; 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.0"; sha256="09l17mj9m4v1hhc71smqbk566axycwb0f5np2z11y4waqf09dwkc"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; }; + RefManageR = derive2 { name="RefManageR"; version="1.2.12"; sha256="1hfxa1qacfryk36mpaqdhdgws5jwxiyy489ikd3wa18bp1wz8dkp"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; }; RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; RegSDC = derive2 { name="RegSDC"; version="0.3.0"; sha256="17w6qqh2vyh34xrpngqknk0g04sc6q7b77l7m0g8aiy904dsvfcr"; depends=[MASS Matrix SSBtools]; }; RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; }; @@ -3487,6 +3523,7 @@ in with self; { ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.2"; sha256="1khk3yi0ixs4lzvng9pjmyyiy86bh5bx7wdyr915p1nbhq6yl2cl"; depends=[data_table ggplot2 hash]; }; RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; }; + Relexon = derive2 { name="Relexon"; version="0.1.0"; sha256="12c6qqydd3n0yc0yaqzz7hrp295s8dby5imhhpq9ip1cihi3bfqh"; depends=[readr]; }; Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; ReliabilityTheory = derive2 { name="ReliabilityTheory"; version="0.1.5"; sha256="14k979b9baqnz1gbhbjnp76nvdg5z1sc6p29h3v9qgvwv4aanp4v"; depends=[actuar combinat FRACTION HI igraph mcmc PhaseType sfsmisc]; }; RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.3"; sha256="0qxngmkfb7sqjcyydk1z0rc857sfikf10iamxbv2d207spaha5l0"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; }; @@ -3495,7 +3532,8 @@ in with self; { Renvlp = derive2 { name="Renvlp"; version="2.6.5"; sha256="0yw9c5115q4vism33avgak3b63pb77x9mvk2m8gfzdkphd2v3ndv"; depends=[Rsolnp]; }; ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; - Replicate = derive2 { name="Replicate"; version="1.0.1"; sha256="110pvissyv3dx1wpwpngcg18mpmpml49gcmdykip55s1d3ljf791"; depends=[metafor]; }; + Replicate = derive2 { name="Replicate"; version="1.1.0"; sha256="1iqzg7aspd2h0mc4w059nfz7hcxgbbl15389isrr63zfm0kcsbf6"; depends=[metafor]; }; + Replication = derive2 { name="Replication"; version="0.1.0"; sha256="0qykpc0lr18wis0xgn16y4a99n7plwl07dlc6knmqdp27193fry5"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; Repliscope = derive2 { name="Repliscope"; version="1.0.0"; sha256="0cpr0vl16gv3bgl46pnr6hw3dx1gqv35dim4jlxphvydchdcfjaf"; depends=[colourpicker ggplot2 shiny]; }; RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; }; @@ -3504,6 +3542,7 @@ in with self; { Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; Rfast = derive2 { name="Rfast"; version="1.9.3"; sha256="0smh726cz8d9xsp6cwi50l0z47kblaq9x8nzaq3kkcfgd7l7f2sn"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfast2 = derive2 { name="Rfast2"; version="0.0.1"; sha256="0hddcd854zisl9lrfrg5sr86igyp0j8m142ljxa42y5xgjj58m67"; depends=[Rcpp RcppArmadillo Rfast]; }; Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; }; Rfmtool = derive2 { name="Rfmtool"; version="3.0.0"; sha256="0hjy66b7d9xp4d8fzhs5zizvwlrdrmlmba2wf9fjraz5ysg0vnxv"; depends=[]; }; Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; }; @@ -3528,12 +3567,12 @@ in with self; { RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.2"; sha256="10kgr05npq9gyhglvpzk49hsr44rgscnygkv3b0gz7f6jxqkfj9z"; depends=[MASS nloptr quadprog]; }; Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; }; RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.1"; sha256="06cd1m4liv2bsh2sxplq2zl45g9zq8gsgvh14d0zr0pqm8z4dsyw"; depends=[]; }; - RiverLoad = derive2 { name="RiverLoad"; version="1.0"; sha256="1zwc551agy5ayc5d34f87qzz1spdpvp3pbgjnysl7h8ignbghrww"; depends=[]; }; + RiverLoad = derive2 { name="RiverLoad"; version="1.0.1"; sha256="1cgczg4b7nlvfq46gjlv36j9v45prfga1jf2wr60nd56crc31pzz"; depends=[]; }; Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; }; 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.2.4"; sha256="003qr7j38wlr1lwd4cpqxrkd3s7bdiy2da59b9024abs4y43g14n"; depends=[httr jsonlite Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.2.5"; sha256="1jzp86vfsnhv3las76i79m2pvrlscmb0wk6i1bcyw9pziljm5gd1"; 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-2"; sha256="196ddagzfm3armn5lvkj6cq6wsmyzj3h53k938jmdc5h0f009va5"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; }; @@ -3541,49 +3580,50 @@ in with self; { Rlinsolve = derive2 { name="Rlinsolve"; version="0.3.0"; sha256="1kvlpfrw4w2dykpdym9sg6h2ghavnm7lwxn6bzqldwg53wlinvxk"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo Rdpack]; }; Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; }; Rmagic = derive2 { name="Rmagic"; version="1.4.0"; sha256="0xf2zc9p0y9z2a26w79p3b7hggk78zyiszbyq269s0v6i3h29gy0"; depends=[ggplot2 Matrix reticulate]; }; - Rmalschains = derive2 { name="Rmalschains"; version="0.2-4"; sha256="1rzslwwp6ikp3zky2zlqylsd8nmhv13iz2h87kwxfkh3611x28yk"; depends=[Rcpp]; }; + Rmalschains = derive2 { name="Rmalschains"; version="0.2-5"; sha256="17wqs2v53j4m7ghps6pq8z8i73c9ji4079s4m2jb49izjjr8q711"; depends=[Rcpp]; }; RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.17.0"; sha256="09lrrxnkkfnbidnmag1czx2xzssdl09348nkc6pqgq6xz36a3mqc"; depends=[dplyr ggplot2 lazyeval lubridate plyr raster rlang tibble tidyr zoo]; }; RmecabKo = derive2 { name="RmecabKo"; version="0.1.6.2"; sha256="1i08wlfd14wmvwrsvjyhgzxkwzfp4jiwbzymw8m25pvyjxgi7jmy"; depends=[Rcpp stringr]; }; Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; }; - Rmixmod = derive2 { name="Rmixmod"; version="2.1.2.1"; sha256="0xx48bk9mjlmmh0zbfrl54x27g4hyjwhkbyfcxs809q3rkxmzg62"; depends=[Rcpp RcppEigen]; }; + Rmixmod = derive2 { name="Rmixmod"; version="2.1.2.2"; sha256="1kfhaj47igcjs3h22slk8jywq85kbm5rnj4c1jhrp03hyzy2vg0v"; depends=[Rcpp RcppEigen]; }; RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; }; - Rmosek = derive2 { name="Rmosek"; version="1.3.2"; sha256="0xhpindh4czlgiq6ba68g2z93c3ynw4m97zfgrjzxkx130dyjfdb"; depends=[]; }; + Rmosek = derive2 { name="Rmosek"; version="1.3.3"; sha256="0j3jbaaq0ksfrixl961xcm2p8qqym5yi9nhv9rqrsr8aryrd57zg"; depends=[]; }; Rmpfr = derive2 { name="Rmpfr"; version="0.7-2"; sha256="1zq3as34r27v2yc729731997wdhxb6cs5ilmak4nmsljabnac7gc"; depends=[gmp]; }; Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; }; RndTexExams = derive2 { name="RndTexExams"; version="1.5"; sha256="17azzxcawqqvfdbw1i34n03bj5yla8npyi7xh3pnx22xb7sbwq3x"; depends=[data_table stringi stringr]; }; Rnets = derive2 { name="Rnets"; version="1.0.2"; sha256="1mym5zd7717mq6dlnv9b3qry7cfa5ylp3h596dbnnq5b1rhbbfis"; depends=[data_table glasso igraph rlang stringr]; }; Rnightlights = derive2 { name="Rnightlights"; version="0.2.3"; sha256="014bw1xln699y0zjaf5xifc2f3yl9zgb0acv7v1qw0q478ka9aak"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; }; - Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.1"; sha256="1lwkswg2jr5qwxzcx8g91m63caij85p7yx3kk8w75i8v0j8iac10"; depends=[base64enc doParallel foreach igraph impute MASS MassSpecWavelet Matrix ptw Rcpp signal speaq XML]; }; + Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.4"; sha256="0n2nqxn3js3avnln9y5718r73rplr0mcyak70gwhzw4mph2z6i26"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; }; Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; }; - RobAStBase = derive2 { name="RobAStBase"; version="1.1.0"; sha256="1szxlqgm913fsgi4i7ccnv2rcj81bssl62ahh0g0818dx7zzblxb"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; - RobAStRDA = derive2 { name="RobAStRDA"; version="1.1.0"; sha256="0hna14757g372ysyyb47529j1q0796k6nzf3lw4ba7ryjcydzw2v"; depends=[]; }; + RobAStBase = derive2 { name="RobAStBase"; version="1.2.0"; sha256="1jgq35pv96ipz3vg6m6b0j0il5k74i8k14a4qr1773rjvwqny8mw"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; + RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; }; RobExtremes = derive2 { name="RobExtremes"; version="1.1.0"; sha256="10b8jbsdnw0zyvx8yjx775mcy64bfqqafy2sw4lfcji1sz3xqjxl"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; }; RobLox = derive2 { name="RobLox"; version="1.1.0"; sha256="14k8xkxrw1ji1sbw49mxh6n0rpgqzn68srh5ch6k1i4nc5c6zmr5"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; }; RobLoxBioC = derive2 { name="RobLoxBioC"; version="1.1.0"; sha256="17yp0jwibf839nwyfaxiz46ckgljssl9gzhhz89a7d12fyfhbb3p"; depends=[affy AnnotationDbi beadarray Biobase BiocGenerics distr distrMod lattice RColorBrewer RobLox]; }; RobPer = derive2 { name="RobPer"; version="1.2.2"; sha256="0631qfpz61606r50vzn7b3h7arfwxcs8j13q1hg779qx60kwrliy"; depends=[BB quantreg rgenoud robustbase]; }; RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; }; RobRex = derive2 { name="RobRex"; version="1.1.0"; sha256="0nszr0dnk8v7raa8sk9zcs4a5xwjv7qzhzsryach777nr9vcdafh"; depends=[distr RandVar RobAStBase ROptRegTS]; }; - RobinHood = derive2 { name="RobinHood"; version="1.0.1"; sha256="15ps0sl36sn8xf1s9rinn6idrhzrv63mrpqbs7x5gr8k1cbfanbk"; depends=[curl jsonlite lubridate magrittr profvis]; }; + RobinHood = derive2 { name="RobinHood"; version="1.0.5"; sha256="0fwii2mjf84n6c3f1h94k5ymdq5rwrnp1xjjfhkamh21h08vidx6"; depends=[curl jsonlite lubridate magrittr profvis]; }; Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; }; RobustAFT = derive2 { name="RobustAFT"; version="1.4-3"; sha256="0x7sn2y9s6nwzlj8476irv893crwag6v4k7w3w589k33kkz5n2hp"; depends=[robustbase survival]; }; RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; }; RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.6"; sha256="0lrdsxg1b8pb1blf0pmla18jykjlzflrmgi7g8kccrgv725clifd"; depends=[Rcpp RcppEigen]; }; 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.4"; sha256="0vqhzy6gajkqh0pdckyc6cpxm97jb6bmw2vpcd0fi622fh63r0nl"; depends=[RCurl]; }; + Rodam = derive2 { name="Rodam"; version="0.1.6"; sha256="1204zj556xciw29bn2dzndv7dfmmvdhyj5r5slgfzhsxyx0ca4i2"; depends=[RCurl]; }; RonFHIR = derive2 { name="RonFHIR"; version="0.3.1"; sha256="06sgjcm45cl1nqdglpqnfdzpiglipg5yq8rr7n3f2qnf4251q3j3"; depends=[httr jsonlite R6 stringr]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.1"; sha256="11wybhw180r4zaqwfs301zwzfzprwwl4hiyhjj78l3mnxgdnmwz7"; depends=[doParallel foreach iterators]; }; - Ropj = derive2 { name="Ropj"; version="0.2-1"; sha256="0y9r0ffdxxygpx8ch08j54iy6c0svxs2a2vfn2zcknzwpwqsbrmb"; depends=[Rcpp]; }; + Ropj = derive2 { name="Ropj"; version="0.2-2"; sha256="1jdn4m5xfnm7z7pjchqsy1zhh6kgbi8fw2jl8hw1pckjfyzhlwhw"; depends=[Rcpp]; }; Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; }; RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; }; RoughSets = derive2 { name="RoughSets"; version="1.3-0"; sha256="08yz19ngipqpzfam6ivwsfnbg8ps2wwyi6djprmd7kfj0n43ab62"; depends=[Rcpp]; }; + RoundAndRound = derive2 { name="RoundAndRound"; version="0.0.1"; sha256="1q3xb6y9ip8csivd0qijifxsm3h7zkwz8lxfi4ffdcgrvbl03v8q"; depends=[geometry rgl]; }; Rpdb = derive2 { name="Rpdb"; version="2.3"; sha256="0zy5f7bli6ppc9giwf8845mzjcv54r2sqb8hxwgbn9k6rjlszgi8"; depends=[rgl]; }; RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; }; - Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.4.1"; sha256="16y64b3c3rmhmz3i8vznmxjah7wrk0sp4593cjfzdnwxirhf96ga"; depends=[digest futile_logger git2r R6 rgl stringr testthat XML]; }; + Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.4.2"; sha256="0q50f0pp72rwmflxwnridjrcl649kz5h2fm8jfz2pn473mghhya8"; depends=[digest dplyr futile_logger geometry git2r R6 rgl stringr testthat XML]; }; Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; }; Rprofet = derive2 { name="Rprofet"; version="2.2.0"; sha256="1s0jkq83vfc9jsggnwm31r366b10n6sri2vzpwxybzpjq3d3w5qr"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; }; Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; }; @@ -3612,7 +3652,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.24"; sha256="1528jzpg0m4gya63xjf7ya4x1c96anm6bpzjgsa1vq1a4dz9m4y9"; depends=[]; }; + Runuran = derive2 { name="Runuran"; version="0.27"; sha256="0nvrxv3a0wl3rk5885qm20wxcnfy2lrxv5d99wjd02j3636gq353"; depends=[]; }; RunuranGUI = derive2 { name="RunuranGUI"; version="0.3"; sha256="1h2bcc443z8vp4hjf4vss4ds5n6zc6x70kmw13b2431f56jq12fa"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 Runuran rvgtest]; }; Rvcg = derive2 { name="Rvcg"; version="0.18"; sha256="0a9022ps8cddmblgyzzvfyb77n206dvbv0b7fpnfplis4s68zjkf"; depends=[Rcpp RcppArmadillo RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; }; @@ -3620,27 +3660,28 @@ in with self; { Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; }; Rwhois = derive2 { name="Rwhois"; version="1.0.3"; sha256="06mx98wi6r265ykkk81hk17yjkym6ar7c2cwp962ijfk3lxwc9l4"; depends=[stringr]; }; Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; }; - RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[lattice MASS MCMCpack mvtnorm]; }; + RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; }; RxODE = derive2 { name="RxODE"; version="0.8.0-9"; sha256="0km96arcyzzwv88fhvqaccmrsmll790k9rjqvnrqwsmmar86kn2z"; depends=[brew cli crayon digest dparser inline magrittr Matrix memoise mvnfast n1qn1 PreciseSums R_utils Rcpp RcppArmadillo rex]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; + Rxnat = derive2 { name="Rxnat"; version="1.0.4"; sha256="1qlmx9mjv0sky1qk4mjkd2ddx6nxil2hpnd01gwfyb7rfx2p8bwi"; depends=[httr RCurl]; }; Ryacas = derive2 { name="Ryacas"; version="0.4.1"; sha256="1gd8zmrj98r4qsnlmn3qd2pldjk5dhj3f0ybn1dijwy192g1w3vd"; 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]; }; SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; }; SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; }; - SADISA = derive2 { name="SADISA"; version="1.0"; sha256="0v68k6pwcr2hfsffkcrvpgfwciwir2jsg3q1kvr0ka5iiizpliz3"; depends=[DDD pracma subplex]; }; + SADISA = derive2 { name="SADISA"; version="1.1"; sha256="00qixqbbkpc8g8nmggvrknsc03v9w04nb4dlcq91fs7g76rpzs92"; depends=[DDD pracma]; }; SAFD = derive2 { name="SAFD"; version="2.0"; sha256="1ing0zkhl7f9pdcddivp3ii2siaxrrh0al7cdh1r92r4b93kfr70"; depends=[]; }; SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; }; SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; }; - SAM = derive2 { name="SAM"; version="1.1.0"; sha256="00wl6g8d0xb0w4fs4ngb5kjlwk2s2rmrv5i2qs8by73ssvan8vy5"; depends=[Rcpp RcppEigen]; }; + SAM = derive2 { name="SAM"; version="1.1.1"; sha256="0h8zq9c211zxza09bklx35s8ibmf2al7gbyj0wy8jscmxgrq1x6k"; depends=[Rcpp RcppEigen]; }; SAMCpack = derive2 { name="SAMCpack"; version="0.1.1"; sha256="1nnrfc74hd39vnb94lxwfjksmjaz62x0alc2ga46gqyygrrg57g5"; depends=[Rcpp RcppArmadillo RcppXPtrUtils Rdpack]; }; SAMM = derive2 { name="SAMM"; version="1.1.1"; sha256="175jk3s9w68ccw1h019380lp9cajfsy3zigcnplp87pcn3qg7x2i"; depends=[Rcpp RcppArmadillo]; }; 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.7"; sha256="0rms9kq87dypdfs248m4393lgpfx37qah0n1s109pfnjh3k64pm3"; depends=[]; }; SAR = derive2 { name="SAR"; version="1.0.0"; sha256="136kb7disriqg7ar9qilcdy3pin2h2harp2mjs7qalcpgkhg4xmy"; depends=[AzureRMR AzureStor dplyr httr jsonlite Matrix R6 Rcpp RcppArmadillo RcppParallel]; }; - SARP_compo = derive2 { name="SARP.compo"; version="0.0.8"; sha256="04j93a61a7qg6vxv0l1p2574d2r9211mxswp5a677vavmgsrfhri"; depends=[car igraph]; }; - SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.8"; sha256="1hz5a2zjv8hrasjck981sqahq0l88b6ard1iwsfqznalva8zywbb"; depends=[]; }; + SARP_compo = derive2 { name="SARP.compo"; version="0.1.0"; sha256="0y1dmpdancnir609csf6i8565sn5hch3lgl3gq69i04nlfvf49f9"; depends=[car igraph]; }; + SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.9"; sha256="1cc459m2gppx3ld6yg1z0wql2831dkwqmig5j7k5rhx6c9nf4sfj"; depends=[]; }; SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; SASmarkdown = derive2 { name="SASmarkdown"; version="0.4.3"; sha256="0jc21ylflvv4snik13731acxh9zw79s7hpswk58p2wzvavq8k9zn"; depends=[knitr]; }; @@ -3653,6 +3694,7 @@ in with self; { SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; }; SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; }; 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.0"; sha256="116miiw72vz1p4xvbryl8xlnf7zakhwkqam18fzvqbj8q26wiqgw"; depends=[Rcpp]; }; SCCS = derive2 { name="SCCS"; version="1.0"; sha256="0v1ycyx45jlv4y82q0kpcmmfcaaspmkk9nd89k6cfh24n6zf9j6w"; depends=[corpcor dummies fda gnm R_methodsS3 survival]; }; @@ -3673,7 +3715,6 @@ in with self; { SDALGCP = derive2 { name="SDALGCP"; version="0.2.0"; sha256="04yqa0dlr4p6fpc4dsiqwb02j056fz9j8qwf7939b5hpg8k9qwjg"; depends=[geoR maptools mapview Matrix pdist plyr PrevMap progress raster sp spacetime spatstat splancs]; }; 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.1.0"; sha256="1pknkda7iaq5247557b93kc3cf2ih7b3wpqpkqyfgfay3ci9kg16"; depends=[]; }; SDLfilter = derive2 { name="SDLfilter"; version="1.2.1"; sha256="1chvg3vh5mwsczbv2ayq9pj1my1i4m2dmr7az1hh00yvlvilfp0y"; depends=[data_table geosphere ggmap ggplot2 ggsn gridExtra maps raster sp trip]; }; SDMPlay = derive2 { name="SDMPlay"; version="1.2"; sha256="0kafj5z1fi5d824h0n23qzn8a6n8fqm3bfc0pdfypzbaj2arjz3k"; depends=[dismo gbm raster SDMTools]; }; SDMTools = derive2 { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; }; @@ -3694,13 +3735,13 @@ in with self; { SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; SFS = derive2 { name="SFS"; version="0.1.2"; sha256="119dh1pyvjna4k0m7nk601kyvm57jijqsr5aphzvgywhkmk9yzh9"; depends=[Rcpp RcppArmadillo]; }; SFtools = derive2 { name="SFtools"; version="0.1.0"; sha256="08k2ywkpk1pzp0qcwm7qx9gnv9hglspl9hrsrrfblagdpkw6rm2x"; depends=[doParallel ff wordspace]; }; - SGCS = derive2 { name="SGCS"; version="2.6"; sha256="09czgfc0mg64qcigp36kjaf52zlmrpz3m2d1dp42d9hhlciliqf5"; depends=[spatstat]; }; + SGCS = derive2 { name="SGCS"; version="2.7"; sha256="12kyfkd2phdmiyflgay2ndl6z5f9gz425mxi48wqs9ar3gh6akdw"; depends=[spatstat]; }; SGL = derive2 { name="SGL"; version="1.2"; sha256="13lpziwkxw2qj4496lvh76d59nfnmrd371jbgz78dhy8dpzyd7c3"; depends=[]; }; SGP = derive2 { name="SGP"; version="1.9-0.0"; sha256="1nfb9sh10d4wkhzrxyq829b6dhf47pbjp0hzsixamiyjjzhrjz5x"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames RSQLite sn toOrdinal]; }; SGPdata = derive2 { name="SGPdata"; version="21.0-0.0"; sha256="0yi5744nd5m255rrysp1a05darg5ac7vrjk3wyfp45cvp45gcjcb"; depends=[crayon data_table]; }; - SHELF = derive2 { name="SHELF"; version="1.4.0"; sha256="1lc8f19dvnpv1mg32q3vrg96pwcsapkb30fqis6q58v434v42x89"; depends=[ggExtra ggplot2 gridExtra MASS rmarkdown scales shiny tidyr]; }; + SHELF = derive2 { name="SHELF"; version="1.5.0"; sha256="02ymg982xvsg3ws92qgpngifdbh3aaw3d9yj7jwjx405wxlsvbn2"; depends=[ggExtra ggplot2 gridExtra MASS rmarkdown scales shiny shinyMatrix tidyr]; }; SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; - SHT = derive2 { name="SHT"; version="0.1.0"; sha256="0y5rzvyx69qkxrlpqzrirvjlqb63033fd6vb6dq7rzlb5gjsnky5"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; }; + SHT = derive2 { name="SHT"; version="0.1.1"; sha256="0mwk9vygkpc4jbjlkw0ksxdg3afckylgqmwigjcrvfgdc5is171x"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; }; SI = derive2 { name="SI"; version="0.2.0"; sha256="0i6kpaw5yk39skm77nf56ai25clkparz3l8qx0223jrmdqbf97b7"; depends=[]; }; SIBER = derive2 { name="SIBER"; version="2.1.4"; sha256="1wn69giv6prg9dy10zn2fb63s6a0wqv5maccaf69267anh0s4qpc"; depends=[coda dplyr ellipse ggplot2 hdrcde magrittr mnormt purrr rjags spatstat spatstat_utils tidyr viridis]; }; SIBERG = derive2 { name="SIBERG"; version="2.0.2"; sha256="0wfx1dpjd09gb736sm2xhrkba26nwnzn5x575h39n2g33jwqqy2r"; depends=[mclust]; }; @@ -3764,6 +3805,7 @@ in with self; { SPAtest = derive2 { name="SPAtest"; version="3.0.0"; sha256="0pq8mbj05x4l3lvdgayxigviirhx6ghf4w5bkpvg9hggkb79ib9y"; depends=[]; }; SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; }; SPCAvRP = derive2 { name="SPCAvRP"; version="0.3"; sha256="1j4469ny70xsyaf9qa403yg0n63c1as6mkw7a6ql4h7aa53bz5sz"; depends=[MASS]; }; + SPCDAnalyze = derive2 { name="SPCDAnalyze"; version="0.1.0"; sha256="0zaxlc4dw678s0v22ghv7mc4vqsgkcnmbxh7065w6qj9vm7pg5kz"; depends=[lme4 nlme plyr]; }; SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; }; SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.8"; sha256="09kdky1v5vx1xjdlb27228hijfb2g70nxsddj950gdp9sllxkncz"; depends=[]; }; SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; }; @@ -3776,11 +3818,12 @@ in with self; { 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=[]; }; - SPSL = derive2 { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; }; + SPSL = derive2 { name="SPSL"; version="0.1-9"; sha256="0kf6mmbvavid3dw2l4fkclk669wi13wkyykhwn5272d6qnhlhhca"; depends=[]; }; SPUTNIK = derive2 { name="SPUTNIK"; version="1.1.1"; sha256="1spzl3dhxf0715xibl9ny2v4xgikd8chwdzb3ari1sj82jx1544p"; depends=[e1071 ggplot2 imager infotheo reshape SDMTools spatstat viridis]; }; SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; }; SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; }; SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; }; + SPreg = derive2 { name="SPreg"; version="1.0"; sha256="1702i86qcbnqyi7r5wc2ciyk3l46329kmnrz91jzqq85z8cwgak1"; depends=[sn ucminf]; }; 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]; }; @@ -3790,8 +3833,7 @@ in with self; { SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; SSBtools = derive2 { name="SSBtools"; version="0.4.0"; sha256="0rmvqhhw5zv8za3h8m59sqz0857hryn6c1bpsl4bdnyjzjfqa675"; depends=[Matrix stringr]; }; SSDM = derive2 { name="SSDM"; version="0.2.4"; sha256="1zn0iaav58pjzd6ckm28w16pblkjxacj2s1daj0sk0423dhjkf76"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; }; - SSDforR = derive2 { name="SSDforR"; version="1.5.2"; sha256="10lbz7fny9igyxi4bz4rkfls8sx0s806qx59f6dwx4a1la8c6ly0"; depends=[MAd MASS metafor psych TSA TTR]; }; - SSL = derive2 { name="SSL"; version="0.1"; sha256="0fy6svf8xfni72bpsg8a5wr8ly46srhfixk8866lrcsp8pb6mqcd"; depends=[caret e1071 klaR NetPreProc proxy Rcpp xgboost]; }; + SSDforR = derive2 { name="SSDforR"; version="1.5.4"; sha256="0mk1gr2089bfnsqjx8q2fm3i2w4nqijqgiklp2li254ma9khaxpy"; depends=[MAd MASS metafor psych TSA TTR]; }; SSLASSO = derive2 { name="SSLASSO"; version="1.2-1"; sha256="0x9nbq9lsnq9g47y50z2ymfbj09l2d1lbii2cfjm76nzk3k5lb39"; depends=[]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; SSN = derive2 { name="SSN"; version="1.1.13"; sha256="0hk138p1jnlda7d2wxlrf2ipkgliqlip1i5xp67aym979g0b3aaj"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; @@ -3803,6 +3845,7 @@ in with self; { STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; }; STARTS = derive2 { name="STARTS"; version="1.1-6"; sha256="0c1pcknigqbzplcmykr0214kylrl3rjjsnxv4by06icbbj5dscll"; depends=[CDM LAM Rcpp RcppArmadillo sirt]; }; STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; }; + STAT = derive2 { name="STAT"; version="0.1.0"; sha256="0x0qpnlcb52k3x8jwiljsamx81hdcjagfpapv63z054bvig0jvgv"; depends=[corrgram dplyr Hmisc psych psycho rmarkdown rpivotTable shiny]; }; STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; }; STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; }; STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; }; @@ -3811,8 +3854,9 @@ in with self; { STPGA = derive2 { name="STPGA"; version="5.2.1"; sha256="0mwjv9r7x925ljmbwk2fl0xvf2n2hnf5n5z5p5rxr57ywvirqw1b"; depends=[AlgDesign emoa scales scatterplot3d]; }; 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"; sha256="0nb2y6c5ywby97jc8wfyihzqgn54aqjbk95aj44yv09j1fjgj4mm"; depends=[ape ggplot2 ggtree gmp gtools igraph phangorn RcppAlgos]; }; SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; - SUMMER = derive2 { name="SUMMER"; version="0.2.2"; sha256="01azh8lm706l9sl0wqxghs29j1d183zi3m5v5fh4a2f8y8na43iq"; depends=[ggplot2 maptools Matrix reshape2 spdep survey survival]; }; + SUMMER = derive2 { name="SUMMER"; version="0.2.3"; sha256="1g1rsl0wr7gy7apkw6zjy39lch2pcd29h46vjkdg0jsmb8l3hk0d"; depends=[ggplot2 maptools Matrix reshape2 spdep survey survival]; }; 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]; }; SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; }; @@ -3866,7 +3910,7 @@ in with self; { SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; SensoMineR = derive2 { name="SensoMineR"; version="1.23"; sha256="0a1s2wrb86a0y2faxj5ax8fa6vfcclgg7bcff4j7jb40ilxnxhn4"; depends=[AlgDesign cluster FactoMineR ggplot2 gtools KernSmooth reshape2]; }; SensusR = derive2 { name="SensusR"; version="2.3.1"; sha256="1x1a8vnpn6h7905wa4lvf7vibkl2dsa4yyg2sg4bbi719lcki2q0"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; }; - SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-2"; sha256="18vycj9vpb32610sn321sbwdnjldyjm9idjw9spggdzj7gsiwwk3"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; }; + SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-3"; sha256="0k6sf25hqisjjc97n17vdihpblab0ywv77lfxdzwpsbcv2x6gsx9"; depends=[ggplot2 glmnet moments ngramrr qdapDictionaries spikeslab stringdist tm]; }; SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; }; SeqFeatR = derive2 { name="SeqFeatR"; version="0.3"; sha256="1pj8pr2jfr7rvbnjgryg733201ixbbddmy3ljls44jbbizcrg271"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; }; SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; }; @@ -3908,6 +3952,7 @@ in with self; { SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; }; SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; }; SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.3.0"; sha256="1ppms2cirdhm8lsfl74mfc1f9zwc7lin6r5xs649czqlj63yzk4i"; depends=[dplyr kinship2]; }; + SimRVSequences = derive2 { name="SimRVSequences"; version="0.1.2"; sha256="12pkn7w48p5r44lmdmiql3lffjr308myf5yi0mhzdlq51k7jm4cz"; depends=[dplyr intervals kinship2 magrittr Matrix reshape2 rlang SimRVPedigree]; }; SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; SimRepeat = derive2 { name="SimRepeat"; version="0.1.0"; sha256="1vq82wlnas0jkl8hlj7dnnbn4y1a56lmszs4w7wya7acri92gkqm"; depends=[BB ggplot2 MASS Matrix nleqslv SimCorrMix SimMultiCorrData triangle VGAM]; }; SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; @@ -3918,7 +3963,7 @@ in with self; { Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; }; SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.2"; sha256="1g7i31naczqf1hxmk1h5y9gq36rdfhf4al9xvwjgi9bj9zhfg3qp"; depends=[]; }; - SimplifyStats = derive2 { name="SimplifyStats"; version="1.0.1"; sha256="14ii4mq0bjj5xndj8vr760hcc9h9jn0nvzn58424wa5iz7j2vjmb"; depends=[assertthat broom dplyr moments tibble]; }; + SimplifyStats = derive2 { name="SimplifyStats"; version="2.0.2"; sha256="0jv6yh6nh26wy18b4k3bi6pxhajmm2jw4hxxrjkpznn14c173qz5"; depends=[assertthat broom dplyr moments tibble]; }; Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; }; SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; @@ -3966,10 +4011,11 @@ 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.3"; sha256="050sga2xm9zjrx7qg9qbcv1zrjcl2drka1whsabsdjvmg06jw7ba"; 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="0.2.4"; sha256="1pjqsnn29fl0hmdvb74vlc3lby19p42lwzc9gcjyrc25h3vmcq56"; depends=[codetools crayon data_table DEoptim DiagrammeR dplyr fastdigest fpCompare googledrive httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi]; }; - SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.1"; sha256="1wv8g7q5bs2cah2snvgs9c5ahds9242ds35h8lk5aynfwnmi1k9c"; depends=[bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; }; + SpaDES_core = derive2 { name="SpaDES.core"; version="0.2.5"; sha256="0p6xfxx8wd01figni4vdqh12in2z42xihjwmns8q873kivh5bakf"; depends=[codetools crayon data_table DEoptim DiagrammeR dplyr fastdigest fpCompare googledrive httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi]; }; + SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.2"; sha256="0sda1r7vzfzhpk08dvix4lgz1i40dhqqrb7m917nvjd7i8q6jq7b"; depends=[bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; }; SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; }; SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; }; + SparkR = derive2 { name="SparkR"; version="2.4.1"; sha256="0zggqx6yd53l2zr96srnx071hab9ddz5zjxyj5xppszfnky890hv"; depends=[]; }; SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; }; SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; }; SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; }; @@ -3995,13 +4041,13 @@ in with self; { SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; }; SpatialVx = derive2 { name="SpatialVx"; version="0.6-4"; sha256="1l40di3312af0c08x22qc0p79wisbjn12pazb6f2qmjzradfw1dv"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; }; SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.9.1"; sha256="1i9w1gb4klwfwas934lw0a01pyp87y7ydrlk05xgd52i4j1y9wcn"; depends=[MASS Matrix]; }; - Spbsampling = derive2 { name="Spbsampling"; version="1.1.0"; sha256="0l770x1mlxf9laxh4f9ar9fpszn92b7lc01dmdinlr4bb7lwlz20"; depends=[Rcpp RcppArmadillo Rdpack]; }; + Spbsampling = derive2 { name="Spbsampling"; version="1.2.0"; sha256="0xl1431847a0wlawaxyb81xzp91q91s6ckkfs4bq4qxfwwcawvxd"; 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]; }; SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; }; SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; }; SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; }; - Spectrum = derive2 { name="Spectrum"; version="0.3"; sha256="0yyhslz68500m4dcsawlpxcidp5fq1yp54caynab0d031pz9l2l5"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; }; + Spectrum = derive2 { name="Spectrum"; version="0.4"; sha256="0dq1c8fvjzl0y9j1a7rx2jjapxdl4r9cvkz7ah0ax4irhgdj9fq1"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; }; SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; }; SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; SplitSoftening = derive2 { name="SplitSoftening"; version="1.0-0"; sha256="1nng2rbldpxflnn7kqdp4r334lcjyznwbc50sfrd4rxyhcmmy36n"; depends=[]; }; @@ -4022,7 +4068,7 @@ in with self; { StatCharrms = derive2 { name="StatCharrms"; version="0.90.92"; sha256="1vjb214zcy48rc95wnwqh0xkflxyp4vp1rxirmc3ndi23mg6p1yi"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; }; StatDA = derive2 { name="StatDA"; version="1.7"; sha256="1hsy4aivd5ga2zj65hr2c5cn9qgjnhs123qqyg6q959vsjxzp0i0"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; }; - StatMatch = derive2 { name="StatMatch"; version="1.2.5"; sha256="1162yqqrxkbpchdxdibpk5ccv55krvh9j150jgr047zzghr9ansa"; depends=[clue lpSolve proxy RANN survey]; }; + StatMatch = derive2 { name="StatMatch"; version="1.3.0"; sha256="1ms8qmxgpfa9sk7kl6hpcal14xxn7i84h662va2n045w7p0qmcjw"; depends=[clue lpSolve proxy RANN survey]; }; StatMeasures = derive2 { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; }; 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]; }; @@ -4041,7 +4087,7 @@ in with self; { Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; - StratigrapheR = derive2 { name="StratigrapheR"; version="0.0.1"; sha256="1f0kbwymgj05dkak2cizz3jii94y883mxccvdgsayr2kjhrsvw1v"; depends=[diagram dplyr GGally ggplot2 hexbin shiny stringr]; }; + StratigrapheR = derive2 { name="StratigrapheR"; version="0.0.3"; sha256="0wivpdbl73hb7zvm74b8ii7xwvzdk7j4h0hx0kz1zwz3xn00qdz7"; depends=[diagram dplyr GGally ggplot2 shiny stringr]; }; 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]; }; @@ -4058,15 +4104,15 @@ in with self; { Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; }; SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.6"; sha256="0ikimx955h2bqcgp2w7kibcfxszgcavb1hg588varkhnfclchgdh"; depends=[]; }; - SuperGauss = derive2 { name="SuperGauss"; version="1.0"; sha256="1yqskaz4zsx87mcb9p7081h2lilaiwa3213yxlkyihyans7gnmp8"; depends=[fftw Rcpp RcppEigen]; }; + SuperGauss = derive2 { name="SuperGauss"; version="1.0.1"; sha256="0pkk8aaghkrh87g6ahikngp6hahaxwhr8i9vz30vv2bzxpgba54b"; depends=[fftw Rcpp RcppEigen]; }; SuperLearner = derive2 { name="SuperLearner"; version="2.0-24"; sha256="0hzgqhkj638dcrd4rwi1m37i0rjap2llz6zvf32jbcc5r2i5ixmd"; depends=[cvAUC nnls]; }; SuperRanker = derive2 { name="SuperRanker"; version="1.1.1"; sha256="1yiklw9zk7yw0xz5g3lmyl5lv325fnysimdwbxa37nyj6qdfv0ls"; depends=[prodlim Rcpp]; }; SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.0"; sha256="1jfv0ql58kcczyy44pb51z8w7pj4kk406dnxh2lanc5c9kwj2fk2"; depends=[ClusterR OpenImageR R6 Rcpp RcppArmadillo]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; }; SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="0.1.0"; sha256="0cw2nsqc9dx36svb49pqkmrxwk5hhbih206mwwkzfyavswxd2lpv"; depends=[gstat gtools raster rgdal rgeos sp]; }; Surrogate = derive2 { name="Surrogate"; version="1.2"; sha256="1wv8j2ps9wymr4jqgvs0nz91zh2yzs1hv04kkv0yqjq8pz65w5kd"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; }; - SurrogateTest = derive2 { name="SurrogateTest"; version="1.0"; sha256="0dw8ic2rskwhj9f013q0j5my7qfsqihfis93frrlz4qag68jddqn"; depends=[survival]; }; - SurvBoost = derive2 { name="SurvBoost"; version="0.1.0"; sha256="0azxv9q8x8kxj18jjwyls41vppl2w2ivav9wqqldazw6cn3bxd7n"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 survival]; }; + SurrogateTest = derive2 { name="SurrogateTest"; version="1.1"; sha256="0m6m44vsfdgv47sswi2s8snmypa7s2ppad73fqnvymq8fm2b3yl2"; depends=[survival]; }; + SurvBoost = derive2 { name="SurvBoost"; version="0.1.1"; sha256="1yk65s5n0qxgbg2sm91bqgq7w98hqsdg3hwdxxxwaga0wb7wd7n1"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; }; SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; }; SurvGSD = derive2 { name="SurvGSD"; version="1.0.0"; sha256="0aa5zaf9akkqkxs8iqwnm93sfwakhhhs3qfafbk0vrwmb5yvzzm1"; depends=[flexsurv ldbounds mnormt]; }; @@ -4085,7 +4131,7 @@ in with self; { 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]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; - TAM = derive2 { name="TAM"; version="3.0-21"; sha256="0f89ns99z284ihr33fhiqqjhrvmk29spbjspgc14gb1h1ql5k906"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; }; + TAM = derive2 { name="TAM"; version="3.1-45"; sha256="0zxh6z5pvpi0c4kvhgs2s1xvxx3z0pgg1xfh2vcwmvwsqbvampmr"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; }; TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; }; TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; }; TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; }; @@ -4095,7 +4141,7 @@ in with self; { TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; }; TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; }; - TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.3"; sha256="0n27qk44yvb5vah4lpgl3ymh7i6cpnd09rd8dnz40ils6f9maf9a"; depends=[httr jsonlite]; }; + TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.4"; sha256="1qwjvcv55l81mvjv5sgszpqman8nf6r2r87y5yj2ra9r3z7sgl96"; depends=[httr jsonlite]; }; TDA = derive2 { name="TDA"; version="1.6.5"; sha256="1048b3wh03pvgdplgzqbj9lcc7r4j67zvmizkxmp0gpm216b57nq"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; }; TDAstats = derive2 { name="TDAstats"; version="0.4.0"; sha256="091fx0qla7jr5h7a84rp5mdsrafzdk87gk5xdflf62dk7qghb9kr"; depends=[ggplot2 Rcpp]; }; @@ -4117,7 +4163,7 @@ in with self; { TFisher = derive2 { name="TFisher"; version="0.2.0"; sha256="0vz74ww1lf1prfwz74hfsi3a8nzq8ss7aqjr85c1d87vss2796xx"; depends=[Matrix mvtnorm sn]; }; TGS = derive2 { name="TGS"; version="1.0.0"; sha256="0x3a8c02zibqh57sr79gk792m6dsxgzmqpk73lflvg1l2s3r6zf8"; depends=[bnstruct doParallel foreach ggm minet rjson]; }; TH_data = derive2 { name="TH.data"; version="1.0-10"; sha256="0mgz7aj2d9abbmdr65zgmg1ddp3fdbs3mfj83r5xadh5ldkir2k1"; depends=[MASS survival]; }; - TIMP = derive2 { name="TIMP"; version="1.13.1"; sha256="1qnc2qmq204wzvsxdjh6q7n9g7vx20lqb8jsw6zi9v5bx1saw152"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; }; + 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.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; }; TInPosition = derive2 { name="TInPosition"; version="0.13.6.1"; sha256="1c0h9zg71whmsjn5rnzv5kdrabl9kqrq627caznvrpa74c7pjks9"; depends=[ExPosition InPosition prettyGraphs TExPosition]; }; TKF = derive2 { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; }; @@ -4146,7 +4192,7 @@ in with self; { 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]; }; TSEntropies = derive2 { name="TSEntropies"; version="0.9"; sha256="1bwb3kyhzc6sxhvpagf4vjmh8ghx44lpc9ms4jwrsrzdhcvnfc7l"; depends=[]; }; - TSEtools = derive2 { name="TSEtools"; version="0.1.2"; sha256="0nag6gjcrv90qljiz8jp266v3p5mq905jq8wss9nvcyxph6fgs1d"; depends=[quantmod xts]; }; + TSEtools = derive2 { name="TSEtools"; version="0.1.3"; sha256="1n5dklsqsz6w31rhszrq0rrxc9mingz4haxmnjzanacvvmzsj36j"; depends=[quantmod xts]; }; TSF = derive2 { name="TSF"; version="0.1.1"; sha256="0v3pq64yknp3n6lw6c87slv1avsv7rlb82gm670q4jzv5d174phv"; depends=[forecast fracdiff]; }; TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; }; TSHRC = derive2 { name="TSHRC"; version="0.1-5"; sha256="05vv2zdkzlg04dicwa0lyww92fiafr7bnvsbm6990xkip1lf3cih"; depends=[]; }; @@ -4166,7 +4212,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.4"; sha256="0n76sg50f21sjcpkgswrfs4g2w707jkdcwmnc8xj5ipwa57hdlp5"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; }; + TSdist = derive2 { name="TSdist"; version="3.5"; sha256="1drql61vh0qwmcxxp07rfsz1bd7zqn1zqx5mh0zczshv91blm0bi"; 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]; }; @@ -4192,7 +4238,7 @@ in with self; { TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; }; Tariff = derive2 { name="Tariff"; version="1.0.5"; sha256="1mdbc6yyaddkyj617kx93d2737gijh063v8w8jqw4lwmbwyc4a4w"; depends=[]; }; TauP_R = derive2 { name="TauP.R"; version="1.5"; sha256="02vk9rj8yx4n2pihgk93bs2f9wkpkyfqm2kp7ixj4wpa29a0iq6v"; depends=[]; }; - TauStar = derive2 { name="TauStar"; version="1.1.3"; sha256="06iq3kjbhyx2i8qlhvamnlch4j32psgw8q0wnvs4js513r6c0cqn"; depends=[Rcpp RcppArmadillo]; }; + TauStar = derive2 { name="TauStar"; version="1.1.4"; sha256="06bb6570mqzfbjw2qp4bjl4a1bdpwsvcr0vw2y4l1x444m670ds1"; depends=[Rcpp RcppArmadillo]; }; TaxicabCA = derive2 { name="TaxicabCA"; version="0.1.0"; sha256="0mkw7d2pksj98kyg2951achmvsr0x7f4snq0kk1s5158b5yi5npn"; depends=[]; }; Taxonstand = derive2 { name="Taxonstand"; version="2.1"; sha256="0dvhiqggbv1by284fg38rcvvrxr9q3zp5gh51p1dh0129h73qj7i"; depends=[pbapply]; }; TcGSA = derive2 { name="TcGSA"; version="0.12.2"; sha256="1vcbkmpdfrb5ksgd11h1g9nbsd97cgiyp55p06yxkzn96sk2i6v2"; depends=[cluster cowplot ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; }; @@ -4203,6 +4249,7 @@ in with self; { TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; }; TeachingSampling = derive2 { name="TeachingSampling"; version="3.4.2"; sha256="1r06if6ljlr9i3y5ri7akris97dsjy3n3n6sgz2dvy9szm4zsadp"; depends=[]; }; Tejapi = derive2 { name="Tejapi"; version="1.0.1"; sha256="1v80yjbik6shqad2nvi374dpzs9bjv9ah26agy0khmwnbz6029rk"; depends=[httr jsonlite]; }; + TempCont = derive2 { name="TempCont"; version="0.1.0"; sha256="1pl0czrpw74zfm5vycyl0h8hc3n5whf4g6a2759a22384gk5fq7k"; depends=[nlme]; }; TempleMetrics = derive2 { name="TempleMetrics"; version="1.2.0"; sha256="0g8a799grsjqyq55pnlgixyq2qxhvl5k01jcjwc08q54w2dg0xf0"; depends=[BMisc pbapply]; }; Temporal = derive2 { name="Temporal"; version="0.1.1"; sha256="0x001apiph67cyh2ckx2k9mi6jb86agnmfvn94i27q9lpy4cn1sh"; depends=[expint numDeriv plyr Rcpp RcppEigen]; }; Ternary = derive2 { name="Ternary"; version="1.0.2"; sha256="19mbll6kjhkv46glaakhnhfsmbvxslxnmf9kaw8p5plhg2ngybiy"; depends=[]; }; @@ -4238,13 +4285,13 @@ in with self; { TippingPoint = derive2 { name="TippingPoint"; version="1.1.0"; sha256="1f5bfag892yk47r1pw2rlvqz9qnkaz8radprpxh0q0knviw3f9fp"; depends=[bayesSurv ggplot2 RColorBrewer reshape2]; }; Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; }; TmCalculator = derive2 { name="TmCalculator"; version="1.0.0"; sha256="067xcpik00r6cdb4q1z09dgdqacyxqg21xn9nzvqfnp6s3nw6a9s"; depends=[]; }; - Tmisc = derive2 { name="Tmisc"; version="0.1.19"; sha256="148kgy1pgn03f9h72i0zg62lamdnjl1hbwkzgrnr8p0zw5i0v1xm"; depends=[dplyr rstudioapi tibble]; }; + Tmisc = derive2 { name="Tmisc"; version="0.1.20"; sha256="0f57wc35d2x2149y1bjswy54247wrwpvc8p77q07k1y5i71hm65k"; depends=[dplyr rstudioapi tibble]; }; Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; }; TooManyCellsR = derive2 { name="TooManyCellsR"; version="0.1.0.0"; sha256="1r3wh9hhk6yx4swgjfdsh3094yl36ld7qn1285vsixd1rdqxng44"; depends=[cowplot ggplot2 imager jsonlite Matrix]; }; ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.2"; sha256="0x05phwm6gqw1pmars1ypg86sggflffw9g2d0lc5gfsy93nrg0rv"; depends=[calibrate HardyWeinberg MASS]; }; TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; }; TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; }; - TraMineR = derive2 { name="TraMineR"; version="2.0-10"; sha256="1zzszc6hnqwlqdmbpg6yphpqd5dflx384hd0dpwdgcy50r04xjgg"; depends=[boot cluster Hmisc RColorBrewer]; }; + TraMineR = derive2 { name="TraMineR"; version="2.0-11.1"; sha256="18z5874a302nkz9l30r6a04qb6n2sxyf0xhqbmjpp7d4vb28zn2i"; depends=[boot cluster Hmisc RColorBrewer]; }; TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.4"; sha256="0dx4j1pvd5i3r0yfd9acjm89k47lzyyjbkgpds66q539g24v3q50"; depends=[cluster RColorBrewer survival TraMineR]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; }; Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; }; @@ -4254,10 +4301,11 @@ in with self; { TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; }; TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; }; TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; }; - TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.1"; sha256="06mmz6aazrwcxfnwhhk1zg3083s319qrwx6rrn8ma8ay156y67v4"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; }; + TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.3"; sha256="0b4pzz3rh8fgc2wn6gi0m6yfrpxv9nm91y15mg66lh0gbh5m7fxl"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; }; TreeDep = derive2 { name="TreeDep"; version="0.1.3"; sha256="0ja2hp9sxzybac6dqdsns5q1rj12swl240znsnsffg9mkvzhq6rl"; depends=[ggplot2 lubridate]; }; + TreeLS = derive2 { name="TreeLS"; version="1.0"; sha256="0iqayrwwzd308karhs2pjy2sdp4xg6ncsnah7f68liia1znnld5y"; depends=[BH data_table lidR magrittr raster Rcpp RcppEigen rgl]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; - TreeSearch = derive2 { name="TreeSearch"; version="0.2.2"; sha256="1q9cd0kp78d8gx33mcgbwks085i3rsb2lilsrxyn120ikkzs7gck"; depends=[ape colorspace gmp memoise phangorn R_cache Rcpp Rdpack]; }; + TreeSearch = derive2 { name="TreeSearch"; version="0.3.0"; sha256="1gvmxaplqkjihbyxgwyqwp51bqxqw91586bjddlyrbxjgnh8pryk"; depends=[ape clue colorspace memoise phangorn R_cache Rcpp Rdpack]; }; TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; }; TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; }; TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.2"; sha256="1kdjrzv2s5vpyg1lx6qkxj3dyi84qwhrvz17mx731f9pp70cz29j"; depends=[pROC rms]; }; @@ -4282,7 +4330,7 @@ in with self; { UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; }; 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=[]; }; - UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.0.1"; sha256="1m04nzazwqnzrrlayfsb16s1hf2v5id1asxh1cyh71ij2s9kgmhc"; depends=[dplyr DT httr magrittr readr shiny shinydashboard]; }; + UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.0"; sha256="04zxgxhgsdxw2yfbsmvx24i68jc9rj6a5yrq5y8g2dsygzf1jc0m"; depends=[dplyr DT httr jsonlite magrittr readr shiny shinydashboard]; }; UKgrid = derive2 { name="UKgrid"; version="0.1.0"; sha256="1xfg2v82264wlvv6x0xppz7g7jka1y0d615g9rwcb236y64h2xrk"; depends=[data_table dplyr lubridate magrittr rlang xts zoo]; }; 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]; }; @@ -4299,6 +4347,7 @@ in with self; { 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.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; }; + Umoments = derive2 { name="Umoments"; version="0.1.0"; sha256="0vgfvfb7ggi353scg4a2kbwagazn7qfyvi3mjn7c9cprcx0w0136"; depends=[]; }; Umpire = derive2 { name="Umpire"; version="1.3.5"; sha256="1l0mpx66vgn282hc1c75bgxh471fbmyh3y0ldxb0h4pj55db93xq"; depends=[]; }; UncDecomp = derive2 { name="UncDecomp"; version="0.0.4"; sha256="1v29y64jm3axllwy0cgmyki6ii3ph2zyvcgbzv1pdrgxgj14qhck"; depends=[]; }; UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; }; @@ -4311,7 +4360,7 @@ in with self; { UpSetR = derive2 { name="UpSetR"; version="1.3.3"; sha256="08vj7l92b8fpqyqwxshll2mhk3yhgyr74axvr2lf29z78bapymhz"; 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="2.0"; sha256="145nfhvhyvbgsc78xgsps65ayvzmvqls9l4npalj857ah84201j1"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="2.1"; sha256="063vxgjm1xp14c6602db8dvx18v0gm09f1xrq808jpl2bcbv9m83"; depends=[curl jsonlite Rcpp]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; VARSEDIG = derive2 { name="VARSEDIG"; version="1.9"; sha256="18j73wm22bjvf2y0c09bfmdyx4x2gd0jhfcqhbk1sgsk24zjr63z"; depends=[]; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; }; @@ -4319,7 +4368,6 @@ in with self; { VBLPCM = derive2 { name="VBLPCM"; version="2.4.5"; sha256="1q5n87zzakdv0mflgsy6a5lc25ryjm7h90i3nr0dvccd0l8d4wpm"; depends=[ergm mclust network sna]; }; VBTree = derive2 { name="VBTree"; version="0.1.0"; sha256="0g0lyvclnfmd3zc8yhcibhli0hyxrba6wb3hx039fsg80q7y02h4"; depends=[tensorA]; }; VCA = derive2 { name="VCA"; version="1.3.4"; sha256="1qyf20i6bgjg3lxivhx4kgr66m63wkzw8r26aqhz0cs1j0w741dk"; depends=[lme4 Matrix numDeriv]; }; - VDA = derive2 { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; }; 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=[]; }; @@ -4379,11 +4427,11 @@ in with self; { WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; }; WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; }; WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; }; - WMWssp = derive2 { name="WMWssp"; version="0.3.6"; sha256="18jmj0w7lkbfyckxvms8janbqk47apnw9fxpdh6y8hcv09kmq5df"; depends=[rankFD]; }; + WMWssp = derive2 { name="WMWssp"; version="0.3.7"; sha256="1bjah78il3g1lr4wz1a7d41frlqsyy1pn4cdc9k3yq1gm5sxx6kk"; depends=[]; }; WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; }; WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; WRS2 = derive2 { name="WRS2"; version="0.10-0"; sha256="17iriwkng75iy93mp99ihzmvgpgbrg0sgwxs2yx1d3ss7h0k1x3j"; depends=[MASS mc2d plyr reshape]; }; - WRSS = derive2 { name="WRSS"; version="2.2"; sha256="02zzqp09zgaxvgsbap4v3rh70lsyaa30m0mjsg9inach3kpa6az5"; depends=[GGally ggplot2 Hmisc network nloptr]; }; + WRSS = derive2 { name="WRSS"; version="2.3"; sha256="182753820fjwl544sv7rhkjsdy268r8fgspyq88brqlpfj7k6rdw"; depends=[GGally ggplot2 Hmisc network nloptr]; }; WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.1"; sha256="0q2rdzbz3cbgr19sh9j3fqdn0lvwrq93qq2rjmnhx6ia9avkywa8"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; WVPlots = derive2 { name="WVPlots"; version="1.0.9"; sha256="0gh2d3660hsjpyj3s4834dl8z8dhz1z84s1f3k7nv6fp53d9rvi5"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; @@ -4392,15 +4440,17 @@ in with self; { Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; }; Wats = derive2 { name="Wats"; version="0.10.3"; sha256="1wh4wxzmdj154mh61ng4bg827hpx1kw85x34c1d7xdpbq3wag4g1"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; }; WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; }; + WaveletANN = derive2 { name="WaveletANN"; version="0.1.0"; sha256="08qnx0lk2laiyx1q1wxj15j0yic65r7mbhr6lqbdllq30v4dcj88"; depends=[forecast fracdiff wavelets]; }; WaveletArima = derive2 { name="WaveletArima"; version="0.1.1"; sha256="19hz2q280m41qh3m9lx3i9p6p5fl6pw8r9b06xk6sn04hxbim8xx"; depends=[forecast fracdiff wavelets]; }; WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; }; WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; - WebGestaltR = derive2 { name="WebGestaltR"; version="0.3.0"; sha256="0k15blnmb14kj9wr8h4x4sywphjgg88k5j9c9gdcrcf0xhvl0r4a"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph Rcpp readr rjson rlang whisker]; }; + WeMix = derive2 { name="WeMix"; version="3.0.0"; sha256="0j02aynpyfw6j05ggqndb5gybcdkzkv95ba9gjp57975xh3r3d01"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; }; + WebGestaltR = derive2 { name="WebGestaltR"; version="0.3.1"; sha256="1qq80a15in1nhfy4ap74gj0fallyv08qxf6s5g2xcy8sq6n67vz2"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph Rcpp readr rjson rlang whisker]; }; WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; }; WeibullR = derive2 { name="WeibullR"; version="1.0.10"; sha256="1h2w1rgap9yjns7cby0559jwzzwhzjq1h6lwsawrfnni7c36iliq"; depends=[Rcpp RcppArmadillo]; }; WeightIt = derive2 { name="WeightIt"; version="0.5.1"; sha256="16gj7ynk4l67z7fjc345211hgqwxbdb6z1bpy27z5s4i7x4fyf8y"; depends=[cobalt]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; - WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; }; + WeightedCluster = derive2 { name="WeightedCluster"; version="1.4"; sha256="05rmqhgfzh9fs4c1lhmrbk8s46ihaywy7n9qnivf7zcxxzxds0lj"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; WeightedROC = derive2 { name="WeightedROC"; version="2018.10.1"; sha256="1hdksd47pkky83g6hn6123f243yw3bzrlaibdgr2kd5kxn9rma3y"; depends=[]; }; WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; }; @@ -4418,9 +4468,9 @@ in with self; { 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]; }; WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="4.1.0"; sha256="1hgc3y0naglxkjphlkpw14xwwhlk8yyivchkncn3qnb9sgcljn25"; depends=[]; }; - WufooR = derive2 { name="WufooR"; version="0.8"; sha256="0nwf66y1jb7dw4yhkdl9g4brh59ky4q4x6j9zbqdn70pcj9hq9jx"; depends=[dplyr httr jsonlite]; }; + WufooR = derive2 { name="WufooR"; version="0.9"; sha256="13flcb7hwnhsnlak4m3mvwmbq2fd42027lgp8fhg25sra6dwcd7h"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; }; - XGR = derive2 { name="XGR"; version="1.1.4"; sha256="0npyfq587wg2qz2n0f8gmnq396h3xil20navbgfy7dbkvfncv3f0"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; }; + XGR = derive2 { name="XGR"; version="1.1.5"; sha256="1cn17m8q16516gyjnbkkdsxhyjcsxi83h3nm7pwzyh2qjp5qhmkl"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges MASS Matrix RCircos S4Vectors supraHex tidyr]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; }; XLConnect = derive2 { name="XLConnect"; version="0.2-15"; sha256="1cvq677m09gwpwhj3fy15mbfn0s0b1y35w95pjnijiwpcpdxiq96"; depends=[rJava XLConnectJars]; }; @@ -4436,7 +4486,7 @@ in with self; { XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; }; Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; }; Xplortext = derive2 { name="Xplortext"; version="1.1.1"; sha256="18a8qqpakwgv60gm89cmil18q35mlir3xl4yl5j5fswcj5qpdkdx"; depends=[FactoMineR ggplot2 gridExtra slam stringr tm]; }; - YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.0"; sha256="1ah58dqz277sc99932wln9jqhm63dqg9f7xakaiwh7fhgbq3mpax"; depends=[MASS Rcpp]; }; + YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.2"; sha256="1sc8ayr7jfa3z5a5fwnq4zcrv3csr0zi9r667ihh4305zd7w5r8i"; depends=[MASS Rcpp]; }; YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; }; YRmisc = derive2 { name="YRmisc"; version="0.1.3"; sha256="13835qlvcv8m0r9iagbln0lzrd03qa8xr4gwg7b3ailjk5lz44hx"; depends=[ggplot2 gridExtra robust]; }; YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; }; @@ -4514,7 +4564,7 @@ in with self; { adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; }; adaptalint = derive2 { name="adaptalint"; version="0.2.3"; sha256="0n047zibp3jsw8d3c971xnqgl8nsqxzcayic0xkz917pwlfrdnd7"; depends=[dplyr lintr purrr]; }; adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.2"; sha256="0bb6hw77dfa66b12xyazlp992gwjb1plylixlmq4cv4yjhnl9n5z"; depends=[ape ggplot2 phyloseq shiny]; }; - adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; }; + adaptivetau = derive2 { name="adaptivetau"; version="2.2-3"; sha256="1jficl4yidix35q8yqs3pcv813wq3pg4hpw4ah4dprvg95bl7wwx"; depends=[]; }; adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; }; addhaz = derive2 { name="addhaz"; version="0.5"; sha256="1709jq9rp5lhqk0qpk8zkdwzhcv1bcach8mm7yiz7hzcc1mgxb12"; depends=[boot MASS Matrix]; }; addhazard = derive2 { name="addhazard"; version="1.1.0"; sha256="0hk7br52wjmq605xgslv8lspr35aqpdgkiz2yljz31khy3y3vi8c"; depends=[ahaz rootSolve survival]; }; @@ -4533,6 +4583,7 @@ in with self; { adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.12"; sha256="13mhj36nfs36988g53yrmhyd8yq2zzxl8ppzql63964n04fybbpb"; depends=[filehash sp]; }; adephylo = derive2 { name="adephylo"; version="1.1-11"; sha256="06pnrycc7562h17gxbli935289a48na3p4vpb2w96i5cbrjg4jqm"; depends=[ade4 adegenet ape phylobase]; }; adepro = derive2 { name="adepro"; version="2.0.0"; sha256="0q9h7wmkgdnbhg2ygw32jl0bm2vrl32ig2nci9pphgwpsfzb34jq"; depends=[audio Cairo MASS shape shiny shinyBS]; }; + adeptdata = derive2 { name="adeptdata"; version="1.0.1"; sha256="07146kv1llj5kci7s7v2jrqd7bl6h3rczx43nha5fhr57ldpcm40"; depends=[]; }; adespatial = derive2 { name="adespatial"; version="0.3-4"; sha256="1pzhh4nfr2paykjng776axi3jj90axqq4zhji3y1rig9lfh8i2hq"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; }; adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; }; @@ -4543,7 +4594,9 @@ in with self; { 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]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; - adnuts = derive2 { name="adnuts"; version="1.0.0"; sha256="0jy9wq269r7s70bwld6ngxc6vmaj9vplq4wn97x4f3c6lqy42swc"; depends=[ellipse rstan]; }; + 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.1.1"; sha256="146xcrvplj3y720inhblyq8sfp6y14i1ha32vp243ynh7935nnar"; depends=[nloptr]; }; adpss = derive2 { name="adpss"; version="0.1.1"; sha256="0p2gyfc4rxmms8zdsq4hjsh1njfl2s736arq8aq1am2wh1w9k5ch"; depends=[Rcpp]; }; ads = derive2 { name="ads"; version="1.5-3"; sha256="1k1japzcf0mafxkv9dlzaqz9n4c749lsx0lja4wj327ninpdcfy4"; depends=[ade4 spatstat]; }; advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; @@ -4561,7 +4614,7 @@ in with self; { aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; }; agop = derive2 { name="agop"; version="0.2-2"; sha256="0pi9ja75gif10z716yzymasw49lq2yl4zk7aziqb6khfb9difqjp"; depends=[]; }; agriTutorial = derive2 { name="agriTutorial"; version="0.1.4"; sha256="1abi6cdgh9k6x9vapca3gcf3hn1z9dsmw24as9i5i2c57q06b6qx"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; }; - agricolae = derive2 { name="agricolae"; version="1.3-0"; sha256="0699apfn7xidr5fz6mb4vvrb4mq73c839d99894s1cyg7hrk1bdw"; depends=[AlgDesign cluster klaR MASS nlme spdep]; }; + agricolae = derive2 { name="agricolae"; version="1.3-1"; sha256="18zkczb34nq0rpqprrgki62knivkxc95r9nmnmi2ckgpa39kz27f"; depends=[AlgDesign cluster klaR MASS nlme spdep]; }; agridat = derive2 { name="agridat"; version="1.16"; sha256="1kgmjrj207md86qivadkmv3s2gh3hi9zv63bsj8b9vlcd9f58pfk"; 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=[]; }; @@ -4573,19 +4626,20 @@ in with self; { aiRthermo = derive2 { name="aiRthermo"; version="1.2.1"; sha256="058082qdfi1pbdgf26vbfahri1kbc8b2l816q4dq89j5aj5is0a2"; depends=[]; }; aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; }; aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; }; - airGR = derive2 { name="airGR"; version="1.0.15.2"; sha256="1lnqmf2rcj7hynlxnhb52jizx2c8b5bw04apgldg0bnr1jscn7pi"; depends=[]; }; - airGRteaching = derive2 { name="airGRteaching"; version="0.2.3.2"; sha256="1i3pkpf6h958m0jw90q6767svy7waikwqxiq6spqg02lmfw88swp"; depends=[airGR dygraphs htmlwidgets markdown plotrix shiny shinyjs xts]; }; - aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.1"; sha256="1yd6m5pjnmkz3p9jjk9dv8cx67p7l88gw6ccfpa8a82bmwda01d2"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; }; + airGR = derive2 { name="airGR"; version="1.2.13.16"; sha256="0nh9csacwvbbc1wky13vfwm0r7z6fxb2fspwlj8p0fn0ik1dl5y1"; depends=[]; }; + airGRteaching = derive2 { name="airGRteaching"; version="0.2.6.14"; sha256="0ajbhr3xnxqjzyvxz84ynr2yld2na8wpfk4c5smk94hcqhg3gaac"; 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.2"; sha256="06jk4dhr4qj6fpmlvslnbqj67qy78spcb7yhqa4qn2im4kpmb73q"; depends=[dplyr]; }; airr = derive2 { name="airr"; version="1.2.0"; sha256="1vswbjmyhygmyqymkfxad9nwsbcgaggian1fyrx63w0y9c4dfv1h"; depends=[readr stringi yaml]; }; ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; + akmedoids = derive2 { name="akmedoids"; version="0.1.0"; sha256="19idbcxdwj9fajy261gbdk392nijw8qd41flybakj4w0adsbj13c"; depends=[ggplot2 Hmisc kml longitudinalData reshape2]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; alakazam = derive2 { name="alakazam"; version="0.2.11"; sha256="0p6rg09cxphp6mcbllwrvps4l9y2qssxhgxy6ryr4958gc1may16"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi tidyr]; }; albopictus = derive2 { name="albopictus"; version="0.5"; sha256="0kw1agm9jqi9wl5zbx8bryngy751g3sih36rgbrx0m2170cy42d9"; depends=[]; }; ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; }; - alfred = derive2 { name="alfred"; version="0.1.6"; sha256="07x012lj33m0pmxdwk39ywrlvlfkp7mb203dwv8v88cxplhbaiq3"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; + alfred = derive2 { name="alfred"; version="0.1.7"; sha256="1467rg5q2dqbqy8vj2061glb1gksq96rnjlifgyiv5rarwzy9b4y"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; }; algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; }; algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; }; alignfigR = derive2 { name="alignfigR"; version="0.1.1"; sha256="0jsj0h7zpzj6ynfydl8qbggm03xx8db769rli7rcx9909xdxabk6"; depends=[ggplot2]; }; @@ -4601,7 +4655,7 @@ in with self; { alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; }; alphastable = derive2 { name="alphastable"; version="0.1.0"; sha256="1c24d879jqakf20rwj0xmv41f1g3d1dq04mlcc8zshigi2diyy5c"; depends=[mvtnorm nlme nnls stabledist]; }; - alphavantager = derive2 { name="alphavantager"; version="0.1.0"; sha256="02vv0mks73rih4xwabsnk8rkl3cipd27k5lak9lp1rl0agp8g68v"; depends=[devtools dplyr glue httr jsonlite lubridate purrr readr stringr tibble tidyr]; }; + alphavantager = derive2 { name="alphavantager"; version="0.1.1"; sha256="0rbvbws0g50z76pvkydadf97gq5yg1l03xlfqyy3yblqh59cj5s6"; 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]; }; alterryx = derive2 { name="alterryx"; version="0.4.0"; sha256="0c2id24hjlzmdc8xxr5i8314nkrn9x6vvjzkwbasw7g85rsvh6ff"; depends=[base64enc digest httr jsonlite]; }; @@ -4610,12 +4664,12 @@ in with self; { ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; ambient = derive2 { name="ambient"; version="0.1.0"; sha256="142q30rhi0wz0gp1v0swm83gbli8j6plpzzpqjwnjc693wd3a1ih"; depends=[Rcpp]; }; ameco = derive2 { name="ameco"; version="0.2.9"; sha256="0vzwsy7gp17ghl1hgcsbfs9rarzl8dl36x6lplnzrisqv3dqmk25"; depends=[]; }; - amelie = derive2 { name="amelie"; version="0.2.0"; sha256="01v93dswr9nk0kvq50jri4568w17pwkcn64xbpzn2p4c7w6gqkhh"; depends=[]; }; + amelie = derive2 { name="amelie"; version="0.2.1"; sha256="0f4rfijskrw9nmyzbrbz6yfa9d0a5cxjw8n9c36hc6jvh377i7k7"; depends=[]; }; amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; 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=[]; }; - amt = derive2 { name="amt"; version="0.0.5.0"; sha256="0p7k9g9wkd6kmf5pid8kgni1ilb6vrn7gb38l8g47zpwx5wg4zhf"; depends=[broom circular dplyr fitdistrplus FNN geosphere KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr velox]; }; + amt = derive2 { name="amt"; version="0.0.6"; sha256="1n8qrjvca48f84gkjbd18ivxf24lff7fkamjngx1qlpjah7fq31w"; depends=[broom checkmate circular ctmm dplyr fitdistrplus FNN geosphere glue KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sf sp survival tibble tidyr velox]; }; anMC = derive2 { name="anMC"; version="0.2.1"; sha256="02mzmaxjjbjqarfwdv6465p5hvnnpsqfkb1wkm68bx64cimgldki"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; analogsea = derive2 { name="analogsea"; version="0.6.0"; sha256="1fcvf3yci3szm155pnk89q36dgc55wdlffvll642zn26zc5d1y5n"; depends=[aws_s3 httr jsonlite magrittr yaml]; }; @@ -4631,7 +4685,7 @@ in with self; { anesrake = derive2 { name="anesrake"; version="0.80"; sha256="1p2g51w80jiadlf4asbnsw46asarzlzr5c1yfhdb31ymqxd7p76q"; depends=[Hmisc weights]; }; anfis = derive2 { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; }; angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; }; - aniDom = derive2 { name="aniDom"; version="0.1.3"; sha256="1xjbj9d6kv5nprsh1z58gbi338f7sj7dimgvy92j6n1xbrlh83p5"; depends=[rptR]; }; + aniDom = derive2 { name="aniDom"; version="0.1.4"; sha256="1h19q3f16g6kacawd2i9i5lg64q436dsbzk9isf3p2mr7p24xbas"; depends=[rptR]; }; anim_plots = derive2 { name="anim.plots"; version="0.2"; sha256="1plpi90qzk4ng0sm77fvqyv1063w67axvdc29q5nvz4h6v4j7ks3"; depends=[animation]; }; animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; animation = derive2 { name="animation"; version="2.6"; sha256="02jv4h9hpp8niw9656r5n36kqr71jbyynxnywkkkdi0aj8w3cach"; depends=[magick]; }; @@ -4646,6 +4700,7 @@ in with self; { antaresProcessing = derive2 { name="antaresProcessing"; version="0.17.0"; sha256="0mq2b1dkkgli8d53mpcllilh72gf8189f5mf0dxjcv4qinnhrrvm"; depends=[antaresRead data_table stringi]; }; antaresRead = derive2 { name="antaresRead"; version="2.2.3"; sha256="0ylj2q39w82xkbq5qfz8srqmmcrkrpgf3k15apswf2hzax2pvik0"; depends=[bit64 data_table lubridate plyr shiny stringr]; }; antaresViz = derive2 { name="antaresViz"; version="0.15.0"; sha256="16gf5spgx56rgf2d25zv5dihhbbgvfxryswfqa4gjlpjc2827zar"; 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.1"; sha256="1vm9gqxr81dllr6ib7r5w65rrfsawvif2fw6im2m6c7vljminlbg"; depends=[survey]; }; antitrust = derive2 { name="antitrust"; version="0.99.10"; sha256="1xgkbsnsn39s37my7sj917kvq67gxwai7k7lym2i18m60cnz0ilb"; 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]; }; @@ -4662,15 +4717,16 @@ in with self; { apcf = derive2 { name="apcf"; version="0.1.2"; sha256="155a22inb2brpf5vj7iw2pqqbiaxdlddv4wzaq8i0jfpdy4zd1h0"; depends=[Rcpp]; }; apcluster = derive2 { name="apcluster"; version="1.4.7"; sha256="188hdfmwjjx3aic599nwmkzjqm9j9jighi5bly6qd43c1vj6ih2s"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; - ape = derive2 { name="ape"; version="5.2"; sha256="05b4yka5cirdgxd4d7iiaqvr428pk3j6n9q6dvg5j38kdj2h5sr7"; depends=[lattice nlme Rcpp]; }; + ape = derive2 { name="ape"; version="5.3"; sha256="08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"; depends=[lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; }; apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; - aphid = derive2 { name="aphid"; version="1.3.1"; sha256="0vhp1qnfc28qfav98j6wmnqfjv7q47p43lx9qrlvfnn89vg56ynh"; depends=[kmer openssl Rcpp]; }; + aphid = derive2 { name="aphid"; version="1.3.2"; sha256="0kysp22ya60j9b7rvrgczydr3472k3cwla1hlwbkydahqy7fkhqv"; depends=[kmer openssl Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; aplpack = derive2 { name="aplpack"; version="1.3.2"; sha256="14vwzzshsgkw6gxwnnf6h9fixnwp3g8pd3rv6qjr0y8gis1lmjbg"; 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.0.1"; sha256="0fzg2h0i2fibphc6anbv4l5la5wdf61hjawaxv6q36lqc0aibzsf"; depends=[coda maxLik numDeriv randtoolbox RSGHB sandwich]; }; + apollo = derive2 { name="apollo"; version="0.0.6"; sha256="09l2fqcfcq7ylw3l686gvjmwv4hjxav0rvd0y74fdlns1ig0b77y"; depends=[coda maxLik mnormt numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; }; + apparent = derive2 { name="apparent"; version="1.1"; sha256="03n3pq620xg1vykzsmvxp6wr9hs561pl5ds50g7zmxk9z0ijcb32"; depends=[outliers]; }; appell = derive2 { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; }; apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; @@ -4699,6 +4755,7 @@ in with self; { arena2r = derive2 { name="arena2r"; version="1.0.0"; sha256="14zjpglp389pldi436935fz6mgi4jdgfii1m035nsvihrms9gqkh"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinyBS shinydashboard shinyjs tidyr]; }; arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; arfima = derive2 { name="arfima"; version="1.7-0"; sha256="0kj8qv6m2fcdw8x735n8fk9cynm0jxi5v9hif0f879sxk6qkxb9y"; depends=[ltsa]; }; + argo = derive2 { name="argo"; version="2.0.0"; sha256="0gy43p7wdja3q99db56b8dr3yx8ca0zjv4gc33xv61fypdimgqrd"; 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.1.0"; sha256="002q766mhwasq44yr39k8rhdxgbz4l1zxg26i3r2gbc260if4jbd"; depends=[argonR htmltools shiny]; }; argonR = derive2 { name="argonR"; version="0.1.0"; sha256="053cwvaacddixr84y05qaffykvk6bymhisdgafs24zcirdqzpl0a"; depends=[htmltools]; }; @@ -4709,6 +4766,8 @@ in with self; { aricode = derive2 { name="aricode"; version="0.1.1"; sha256="0c9k6bp0zdm4l28ga19x8v30x3zw0fbcf7wicnn15xc516glfb2j"; depends=[Matrix Rcpp]; }; arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; }; arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda 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]; }; + armspp = derive2 { name="armspp"; version="0.0.1"; sha256="08mbw6p2qhmi4mbplk2nmz7sfng1yzc7k3vfjbij8lfm7cvsvvq9"; depends=[progress Rcpp]; }; arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; }; aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.1"; sha256="1x2lwdabvh7cjdy57jrnbdb7s9vxs18zyvfzwavi2pgldqz6v2aw"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; }; aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; }; @@ -4719,7 +4778,7 @@ in with self; { arrangements = derive2 { name="arrangements"; version="1.1.5"; sha256="05frcgk9jxjbbkrj2mmv5vwj8zfbg3pvkysi1fjd9sbbimlzvjn7"; depends=[gmp R6]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; - arsenal = derive2 { name="arsenal"; version="2.0.0"; sha256="0wqzw9wkhgskdc267h87sglanq8n51r26fdhqpb479qyadb081yv"; depends=[testthat]; }; + arsenal = derive2 { name="arsenal"; version="3.0.0"; sha256="1ad3gcjj1vf04znk73qjqpqgpxnmf3w8s0i3jwhx9v86ry0ljzki"; depends=[testthat]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; arules = derive2 { name="arules"; version="1.6-3"; sha256="0dimrq1pz449z0mz9m87nhm5bpc0v789bcc3lghhh97wwi5zah9y"; depends=[Matrix]; }; arulesCBA = derive2 { name="arulesCBA"; version="1.1.4"; sha256="1d0ln8mislns7ix1rch63ry4856b2cnpx99rmw9d967dmvyrm8vs"; depends=[arules discretization Matrix testthat]; }; @@ -4761,7 +4820,7 @@ in with self; { assertive_strings = derive2 { name="assertive.strings"; version="0.0-3"; sha256="0n6jrk88670g4ym0r8ii40a08a90z1xadj8wcryk8h0nl04dchfm"; depends=[assertive_base assertive_types stringi]; }; assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; }; assertr = derive2 { name="assertr"; version="2.6"; sha256="0g4ii6vhp0155a29ljhs64a09x0nzy5ybvwwchhk4mkcgsvnvfkj"; depends=[dplyr MASS rlang]; }; - assertthat = derive2 { name="assertthat"; version="0.2.0"; sha256="1wp5znk3xy338x6hknppk702jn596yr735d9i7c3wabm3sdzfgnp"; depends=[]; }; + assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; }; assignPOP = derive2 { name="assignPOP"; version="1.1.4"; sha256="1w13ls4d7gvp17dz0jafwnw9kqn3kl670vs0wf50rladg2fmh7af"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; @@ -4779,8 +4838,7 @@ in with self; { asymmetry = derive2 { name="asymmetry"; version="2.0"; sha256="02l9sg4f7i0mxzh4p7r930fswy4b04dv0icm7f2h1rldsnswh2sk"; depends=[gplots smacof]; }; asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; - atable = derive2 { name="atable"; version="0.1.0"; sha256="0q3vy42a09sayb69f5fihfrkrsp3cz4380hb9f35ggkyi9v2d7nk"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; - atlantistools = derive2 { name="atlantistools"; version="0.4.3"; sha256="06rb0c4ralx55mdlqwpjzim0inxif4cdi9732v4h1ll8jhlm5v7d"; depends=[circlize dplyr ggplot2 gridExtra lazyeval magrittr proj4 purrr RColorBrewer RNetCDF rvest scales stringr tibble tidyr xml2]; }; + atable = derive2 { name="atable"; version="0.1.1"; sha256="17khlmmh8dna731aiyhdncy2ji8lg8zbkyqacbpvalkbvmzas18f"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; 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]; }; @@ -4791,7 +4849,7 @@ in with self; { auRoc = derive2 { name="auRoc"; version="0.2-0"; sha256="1q5cpa1y96bs5x0vifi0h6ca4yasg3z57yhq29vicd433h3phy3x"; depends=[coda MBESS ProbYX rjags]; }; aucm = derive2 { name="aucm"; version="2018.1-24"; sha256="0x10dawlwxqywjl7mxc2gpp2r4wnd7pb6n80xlrb9yywm7zbb6x2"; depends=[kyotil]; }; auctestr = derive2 { name="auctestr"; version="1.0.0"; sha256="15b1x0c9yhl91gir7jmivp8vxzc8q7wvb0mgam9454avc6l29x4y"; depends=[dplyr tidyr]; }; - audio = derive2 { name="audio"; version="0.1-5.1"; sha256="1imh2l43n1cvwzzby598qn59rsm5262snril6b98hyih7mw7fyad"; depends=[]; }; + audio = derive2 { name="audio"; version="0.1-6"; sha256="1f3k7n8x716kqx439jd0g0dc5iwc33jzzas4ikjrlgidp89i89iz"; depends=[]; }; audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; }; audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; }; auditor = derive2 { name="auditor"; version="0.3.1"; sha256="1ndd5a5264b91qaw0qj9rwjvhn9lgw7y5dirjqlzkib6q9mcyanq"; depends=[car factoextra fdrtool GGally ggplot2 ggrepel gridExtra hnp plotROC ROCR tseries]; }; @@ -4802,13 +4860,13 @@ in with self; { auth0 = derive2 { name="auth0"; version="0.1.1"; sha256="1snmd6b16paglfpaf0bawja25rj3n7k8cv3hd7112vspc7lb62h0"; depends=[htmltools httr shiny 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.0.0"; sha256="10vmgcpj2n5w9g4bjq2g3bz3n3x9b6h35w4qfr13v2sdzp3gz5da"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS Rcpp RcppEigen RcppParallel RSpectra spam]; }; + autoFRK = derive2 { name="autoFRK"; version="1.1.0"; sha256="0yl6cj9nzib0xp75i0nd642yd0r0l51vwy3ivizqigjv4sq1pd2f"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; }; autocogs = derive2 { name="autocogs"; version="0.1.2"; sha256="11sjj6945099w499r6sgxx2vrz0aqx4bjjh6vklyfkjm6xvh4ckj"; 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.0"; sha256="102f7wkrglsvdrsmyy79v0w7za5b79sn59czxzhriwrp4mrpdl47"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; }; 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]; }; - automl = derive2 { name="automl"; version="1.2.7"; sha256="01qvskwsv5if78hsaw13b14ys1pjni0l42ihgg8149d0806294ga"; depends=[]; }; + automl = derive2 { name="automl"; version="1.2.8"; sha256="1lc1cq4hrwcvx6vjvagq6a0ksdv18mnsy83sjc7bbrb8jab034s9"; depends=[]; }; automultinomial = derive2 { name="automultinomial"; version="2.0.0"; sha256="04rjg3xjlhnkchzvdxqm762z5abm81s5b9czgzmli30zh07bf3fd"; depends=[igraph Matrix numDeriv]; }; autoplotly = derive2 { name="autoplotly"; version="0.1.2"; sha256="0ajzzj9w9f0v9n37liml63hq5xwkqq53lw85p0a2h99n4lg2hdg8"; depends=[ggfortify ggplot2 plotly]; }; autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; }; @@ -4841,7 +4899,7 @@ in with self; { b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; }; bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; }; bReeze = derive2 { name="bReeze"; version="0.4-3"; sha256="17nc6qvw9l6sq8knd1mk193md2y3z1jlcjymqzl389yxj8s0i2il"; depends=[lubridate]; }; - bWGR = derive2 { name="bWGR"; version="1.6"; sha256="1f1bcssy0vbhvd62wpww6g6rfw24x5g2vkipx52r9vh9qasrh5h9"; depends=[Rcpp]; }; + bWGR = derive2 { name="bWGR"; version="1.6.1"; sha256="1i1hcx74mn12gwib6yqimxk9q042d7nfv21zrc660j63vvx3vivx"; depends=[Rcpp]; }; baRcodeR = derive2 { name="baRcodeR"; version="0.1.2"; sha256="02v66jjwr4h4qmn11xszsh4bl0y4nvw4nf6c0yi3x9s9a6dhk93b"; depends=[DT miniUI qrcode shiny]; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; @@ -4872,7 +4930,7 @@ in with self; { banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; }; 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]; }; - barsurf = derive2 { name="barsurf"; version="0.1.0"; sha256="0lz87lzs4fs9rbc0p8a92li5cj1cd8va5rgp9s0n96rwmzmdkz63"; depends=[]; }; + barsurf = derive2 { name="barsurf"; version="0.2.0"; sha256="0c8rb11z2z1y8fh9s379ji5k229l3kcz70a5a0jmlspgzz4kx85b"; depends=[colorspace]; }; bartMachine = derive2 { name="bartMachine"; version="1.2.4.2"; sha256="100zcpbndbps01qnybrgmsfnh37j93661l4v7zcin0i56cvgg998"; depends=[bartMachineJARs car 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]; }; @@ -4886,7 +4944,7 @@ in with self; { basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.1.2"; sha256="121aiac2n6fxsmgspnj14y0m1xm2aryswq1v9a0bi97dfl251mna"; depends=[]; }; basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; }; basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; }; - basictabler = derive2 { name="basictabler"; version="0.2.0"; sha256="1jsp4v665cwwiz5ip3b26lfx7nal4ibfgj3vs2irijbna2bgb310"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; + basictabler = derive2 { name="basictabler"; version="0.3.0"; sha256="1dzjdgc8ffnr219m5zb410ln1rbnzz96g1aqb70pkg9gp0ykgk29"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; }; batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; }; @@ -4896,7 +4954,7 @@ in with self; { batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; bayesAB = derive2 { name="bayesAB"; version="1.1.1"; sha256="0kxrhxg43hzkcziyqpwy29iqs7i0qi3pn3jz0z1s8paf8drbgdf4"; depends=[ggplot2 Rcpp]; }; bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; }; - bayesCT = derive2 { name="bayesCT"; version="0.99.0"; sha256="0dw0dgsbyd1cy4wa4kg2im7yk5lwgk41n3ifaxghby209278sj7n"; depends=[bayesDP devtools dplyr knitr magrittr msm purrr tidyr]; }; + bayesCT = derive2 { name="bayesCT"; version="0.99.1"; sha256="1ylv7l4rs4sb7lld6m2w02xg9g26fm8z9jdrszbjc18z1f4bm78j"; depends=[bayesDP dplyr magrittr purrr]; }; bayesDP = derive2 { name="bayesDP"; version="1.3.2"; sha256="1xv133v01mbfsy0w5acc9819m92dcxfdjg4a8p7kdfkycz4ilwnl"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; @@ -4926,8 +4984,8 @@ in with self; { bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; }; bayou = derive2 { name="bayou"; version="2.1.1"; sha256="17gvb2dmviwibnlqn6p3p9pcc3705xh9r8lrm90p0yg7nhm0cn02"; depends=[ape assertthat coda denstrip fitdistrplus foreach geiger MASS Matrix mnormt phytools Rcpp RcppArmadillo]; }; 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.0.7"; sha256="1l59w79n2l04n0i12ka1cvnnqsx9412b2fgsgp4pz5hsi5nswlp8"; depends=[dataRetrieval digest gdata lubridate memoise mgcv plyr survival XML zCompositions]; }; - bazar = derive2 { name="bazar"; version="1.0.10"; sha256="1in3096bxw7v80wxkjp6i9akyv18ihzc0kldl952i9s772dcgbfs"; depends=[kimisc]; }; + baytrends = derive2 { name="baytrends"; version="1.1.0"; sha256="0yml560cbamp7pf433va28vsfi5rcrjm61rbk8384bbjlslpsdkj"; depends=[dataRetrieval digest gdata lubridate memoise mgcv plyr survival XML zCompositions]; }; + 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]; }; bbmle = derive2 { name="bbmle"; version="1.0.20"; sha256="1xzij7swrrzl5ly8l3lw6awh486zcm00251dwqws1y23fbgyh3vc"; depends=[lattice MASS numDeriv]; }; @@ -4951,10 +5009,9 @@ in with self; { bda = derive2 { name="bda"; version="10.1.9"; sha256="06ycxqjpnsywakjkjxf1czhxsbdzbpwa11m69gad5538z066d24x"; 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]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; - bdlp = derive2 { name="bdlp"; version="0.9-1"; sha256="1ydb5hsaj1bfdz7hcdkc74qlk608kf0xrbpw247klkxrhsh9ba2p"; depends=[DBI GenOrd MASS MultiOrd rgl RSQLite stringdist]; }; bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; }; bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; }; - bdpv = derive2 { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; }; + bdpv = derive2 { name="bdpv"; version="1.3"; sha256="0wcnmamqrbqwskgv2yhnxq2kb179n63c825y9hsl20rfca0ijh6m"; depends=[]; }; bdribs = derive2 { name="bdribs"; version="1.0.4"; sha256="19qakmdw3l8vfxkr4p1ydkyfs4cmq37lqzw7l5zx5rdn6zlhqwh4"; depends=[rjags]; }; bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; }; bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-3"; sha256="17ddvz4gnih7rx0lr1gzk280xyh6x796cf2x794dvplpiiq83skh"; depends=[]; }; @@ -4969,7 +5026,7 @@ in with self; { 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]; }; beautier = derive2 { name="beautier"; version="2.2.1"; sha256="1cp4shz8yp4hypdhg1jw1070ls7j4358lxxw4g7vz865wkdx6am6"; depends=[ape geiger seqinr stringr testit]; }; - bedr = derive2 { name="bedr"; version="1.0.6"; sha256="0q790695h8bls0qw284n1zn7lxzym1dnnj095fsbjga2p116z4yv"; depends=[data_table R_utils testthat VennDiagram yaml]; }; + 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]; }; @@ -4986,7 +5043,7 @@ in with self; { bender = derive2 { name="bender"; version="0.1.1"; sha256="07npksrj094h884lli0fjvwjc1lhcwzlsk9wx82761mka5xajv4v"; depends=[httr jsonlite R6]; }; benford_analysis = derive2 { name="benford.analysis"; version="0.1.5"; sha256="0y0c7l2r9s7lg9bw4ndcqwisa5l6a2cpydn1vmz88h3yva0l68cg"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; - benthos = derive2 { name="benthos"; version="1.3-5"; sha256="1mzhqqy4dblwv70v1ky5gzrr3jyky9k4wibbp589jjjrga2vhq2a"; depends=[dplyr lazyeval readr]; }; + benthos = derive2 { name="benthos"; version="1.3-6"; sha256="1vywnc6k37gpaq7g59v3qa6619svcmnd8ri5zm5l0ila2s3ccb2c"; depends=[dplyr lazyeval readr]; }; ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; berryFunctions = derive2 { name="berryFunctions"; version="1.17.0"; sha256="13wslhr3xm9davx3s69as41r53m3x0gm3mrnwrbsqcbmf9n0zbv3"; depends=[abind]; }; bestNormalize = derive2 { name="bestNormalize"; version="1.3.0"; sha256="0wipxc4dqhpmxqb8nkfp2pgxp7854r1rgrmppvlja7v5hwz4mgw7"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; }; @@ -5014,14 +5071,13 @@ in with self; { bhm = derive2 { name="bhm"; version="1.13"; sha256="1iq1hjc7xn2kmmxgzv6mzcvvf48kqp5b8lavmzrqykak3v4z02nz"; depends=[coda survival]; }; bhrcr = derive2 { name="bhrcr"; version="1.0.3"; sha256="1w52f4ghl328vdcr8hwvmdrnxnj45fy4r21yqzg5q1fpd4mpjw2i"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; - bib2df = derive2 { name="bib2df"; version="1.0.1"; sha256="1rprcnqvs4nicd26h34kpgzlpl22430dikxs2q1sjf861qachi10"; depends=[dplyr httr humaniformat stringr]; }; - bibliometrix = derive2 { name="bibliometrix"; version="2.1.1"; sha256="0pc9a3gg2c1gsx8bggva9s117wz4jwyql7w3i0p87pkl3h3m7z8i"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="2.1.2"; sha256="0a7rzh9h6z2szxgv413kcx0r7bfvpbls6bsjzipq2rc33y5nn8nf"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; }; bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; }; biclust = derive2 { name="biclust"; version="2.0.1"; sha256="1y5n6wfa1lx88ck3x09rcg0dh3pw89225h85hmq2la1s1fpa48i0"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; bife = derive2 { name="bife"; version="0.5"; sha256="0lzij8sazfdr687bi5lfp5ndvwlx18vyzr3svc0zv9mnv8s8vfvd"; depends=[Formula Rcpp RcppArmadillo]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.2"; sha256="1cbcxwhb25ismiyr95pfgc7nq14p4srd9y8y3g3xz0ywjs0qnjy5"; depends=[gmp]; }; - bigKRLS = derive2 { name="bigKRLS"; version="3.0.2"; sha256="03sxvqrnfcsvsds0mbpmb302mjhdrn11cl26dr216fw64v6hb424"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; + bigKRLS = derive2 { name="bigKRLS"; version="3.0.5"; sha256="0w8716fcqfc6fgsy256h8fsxqzn44wk1n2djy4nzm95mk15fsvh9"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; bigMap = derive2 { name="bigMap"; version="2.1.0"; sha256="0bpnzz3acqn006jk8db5yyvbhl3sq807926igjcxj813i3r0x98r"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; }; bigQueryR = derive2 { name="bigQueryR"; version="0.4.0"; sha256="1b89yfa0gwd3frdh1z6ygxv2dfncb6g4lp67nh7hkm6r9xamfrxr"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; }; bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; }; @@ -5029,9 +5085,10 @@ in with self; { biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; }; bigchess = derive2 { name="bigchess"; version="1.2.0"; sha256="0c5g4hd5wm51w4grdhl6jhd3lm4m3x4jndhwnlvnnfmpsl0y3902"; depends=[ff ffbase]; }; bigdatadist = derive2 { name="bigdatadist"; version="1.1"; sha256="16gkybwcp9sxqb0iic2fhmc4gndr44ayg14wrfcjvjaj4g5r6xs2"; depends=[FNN MASS pdist rrcov]; }; + bigdist = derive2 { name="bigdist"; version="0.1.4"; sha256="1qfnmhyfadmnnagbhdl4jjrb53i1srszf19idp8fy6bczbjq85yi"; depends=[assertthat bigstatsr furrr proxy]; }; biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; biglasso = derive2 { name="biglasso"; version="1.3-6"; sha256="044l2l34l4pl7ijwgq569cn8x5clj795qpfwb1b9qfwvggvgzgni"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; - bigleaf = derive2 { name="bigleaf"; version="0.6.5"; sha256="0l2a4xi9jyx9sd79fvva9rqqxb4mld99k0gycn07fb81m8lkf690"; depends=[robustbase]; }; + bigleaf = derive2 { name="bigleaf"; version="0.7.0"; sha256="06ah43wykim7a7db4z7z76g6a4mnzv3iy9s4p9a5f72nsc12qz6g"; depends=[robustbase solartime]; }; biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; biglmm = derive2 { name="biglmm"; version="0.9-1"; sha256="1f4w59jvq7lq0bh5fs41czw0yc8h56iijbj0hlcq47zyqx6gll9a"; depends=[DBI]; }; bigmatch = derive2 { name="bigmatch"; version="0.6.1"; sha256="1s9i42h82cdp4qqdpw11dmymvrz0f9vj14ibyrlqjkg18lpz0m5y"; depends=[liqueueR mvnfast plyr rcbalance]; }; @@ -5042,7 +5099,7 @@ in with self; { bigrquery = derive2 { name="bigrquery"; version="1.1.0"; sha256="0h2nzyn1w0padpl61l467j7vlkc2wair7sh6p26p94z4zfsnv0i1"; depends=[assertthat bit64 curl DBI glue httr jsonlite prettyunits progress rapidjsonr Rcpp tibble]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; bigstatsr = derive2 { name="bigstatsr"; version="0.9.1"; sha256="0v0rxp45lbv5bmvyfkm1v4l2rr7g1rfymi547y10b2zysllbfbr0"; depends=[bigreadr cowplot doParallel foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; - bigstep = derive2 { name="bigstep"; version="1.0.0"; sha256="1bkh7a4qzvh567qglkyidlfam5qj33aih9k8ndxj2ng6dcq38lbd"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; + bigstep = derive2 { name="bigstep"; version="1.0.1"; sha256="1x93g7nsndxdan42zpn1f155cnahbmw5l2zchq4j49g62db1n06x"; 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]; }; @@ -5067,7 +5124,7 @@ in with self; { 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]; }; - binneR = derive2 { name="binneR"; version="2.0.10"; sha256="0pxbff2q7r5cw24n3cvbqp0vw58014g85qzmanhqrwy61fzg7dr6"; depends=[cli crayon dplyr ggplot2 ggthemes lubridate magrittr mzR plyr purrr stringr tibble tidyr]; }; + binneR = derive2 { name="binneR"; version="2.0.11"; sha256="0byr3v3nd9z98lmnzqwv5pnrsmh5i373yxjr3w5jd51iqx77zh31"; depends=[cli crayon dplyr ggplot2 ggthemes lubridate magrittr mzR plyr purrr stringr tibble tidyr]; }; binnednp = derive2 { name="binnednp"; version="0.2.0"; sha256="1dklymwsz0l0xklmvq34mf11chd2hm91r5qa031zjf1hsm3gplh8"; depends=[fitdistrplus 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]; }; @@ -5077,6 +5134,7 @@ in with self; { binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; }; binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; }; binsmooth = derive2 { name="binsmooth"; version="0.1.0"; sha256="1zlw4zmkckg7rwf4hx8wyr2yl644xkdkazayysy99saysr9pk2c9"; 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=[]; }; bio3d = derive2 { name="bio3d"; version="2.3-4"; sha256="1zmswa9xs81lbrlkkgi8dvv9xpf0ynqjqwy1k36szvfb8ar9mczr"; depends=[Rcpp]; }; @@ -5103,7 +5161,7 @@ in with self; { 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]; }; bipartite = derive2 { name="bipartite"; version="2.11"; sha256="1ahn696g881dc9mnf67pglf0kskfk2zqkj2afvinqxmwal827f72"; depends=[fields igraph MASS permute sna vegan]; }; - bipartiteD3 = derive2 { name="bipartiteD3"; version="0.1.0"; sha256="0jjf1xvgncgj9jwvfxrzcjxp8n3a26nw3c0r3yzf6nrw43gkwr7s"; depends=[bipartite dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; }; + 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.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; }; birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; }; @@ -5141,16 +5199,15 @@ in with self; { blob = derive2 { name="blob"; version="1.1.1"; sha256="0lsg91hk508dd95ivig2lwg62qafwnarjw68110kx63cfk4zkjxc"; depends=[prettyunits]; }; blockForest = derive2 { name="blockForest"; version="0.1.7"; sha256="16x107ipk2nqhzj6aiwkpvl24h5g4vzmk6i1mp1drnjmabkaxnp3"; depends=[Matrix Rcpp RcppEigen survival]; }; blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; }; - blockcluster = derive2 { name="blockcluster"; version="4.3.2"; sha256="15xp4navipxcr2pqxnxc47b0ifdazcsdkn5kmay883vzqj8c1nrb"; depends=[Rcpp rtkore]; }; - blockingChallenge = derive2 { name="blockingChallenge"; version="1.0"; sha256="0zj649gj4djdl0wly3gh99ayk1i1rk5dawcrrlzxxh56xqf4l19i"; depends=[]; }; + 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="0.3.4"; sha256="11v9903y9dwlzaqp8sx0fsibcg82phvappddy37r8lnxd4vchsd2"; depends=[doParallel doRNG foreach Matrix]; }; blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; }; blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; blocksdesign = derive2 { name="blocksdesign"; version="3.4"; sha256="0vxbdi7g5azqdnrvagq0sacrx0fvgccqibgdir4pcbr91ia8i6s0"; depends=[crossdes lme4 plyr]; }; blockseg = derive2 { name="blockseg"; version="0.5.0"; sha256="1zc6mvkdwjz7n0yj46c610gz2d3rwsjchbzdcg7k56j06vc9w4lp"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 shiny]; }; - blogdown = derive2 { name="blogdown"; version="0.10"; sha256="1wm51qbk7s6zq5qzcwgjiwwij4m5mhp8769rxyg2s5z3xaxkvhdd"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; - blorr = derive2 { name="blorr"; version="0.2.0"; sha256="1jnhkqja0wn5f9mx6mzmx65zb2ablbq1902vfxv810q8igxaikvl"; depends=[car caret checkmate cli clisymbols crayon dplyr e1071 ggplot2 glue gridExtra magrittr purrr Rcpp rlang scales shiny tibble]; }; + blogdown = derive2 { name="blogdown"; version="0.11"; sha256="0byw63nxsqlbc8vs5yx88qww84s7zfir2drfp674755swgp6nn10"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; + blorr = derive2 { name="blorr"; version="0.2.1"; sha256="1lvh5jr1jidrkwidpy6plzd58p8q3rxa23wl4xsf8milw180w69p"; depends=[car caret checkmate cli clisymbols crayon dplyr e1071 ggplot2 glue gridExtra magrittr purrr Rcpp rlang scales shiny tibble]; }; blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; }; blscrapeR = derive2 { name="blscrapeR"; version="3.1.6"; sha256="0p1lwl3zlah0x9jwvd7qmh8q3ynqz48wj6xvzyj7c9rl0iq2ws5x"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; @@ -5162,21 +5219,21 @@ in with self; { bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; bmotif = derive2 { name="bmotif"; version="1.0.0"; sha256="1zjwlsimihszg8gg7mvvi8xmzvlsdph9x6524gb28jmd24xb4gwj"; depends=[tensor]; }; bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; }; - bmrm = derive2 { name="bmrm"; version="3.7"; sha256="1lv4bcjri95nh4yqcp9hd3ad90lcp2drh1dwfn99i3344yw196x2"; depends=[LowRankQP lpSolve matrixStats]; }; - bnclassify = derive2 { name="bnclassify"; version="0.4.1"; sha256="1mz0waxgppq0mw83ylpy028shmcbxlgli7q22i6rdwpacll2jqsy"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; + bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; }; + bnclassify = derive2 { name="bnclassify"; version="0.4.2"; sha256="1x7rf54zrls1gwxybmn51c071kd62d2gxczlnihcfxj3hw1b27bh"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; bnlearn = derive2 { name="bnlearn"; version="4.4.1"; sha256="1nb4m945650538d7w383j4f1d2h3ndy608mfr3amxjrpp7d9ys3k"; depends=[]; }; 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]; }; bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; }; bnpsd = derive2 { name="bnpsd"; version="1.0.4"; sha256="0fpkqx63a4g44v0mgklxzg1bhmikyqilngh45qkz89sn77mwrvdz"; depends=[]; }; - bnspatial = derive2 { name="bnspatial"; version="1.0.4"; sha256="0ij8nxbqz9703dykbgibwv0ajvh80azphd8j7c12p5f1gya60q6s"; depends=[doParallel foreach gRain gRbase raster rgdal]; }; + bnspatial = derive2 { name="bnspatial"; version="1.0.5"; sha256="01bqh8h9kbpnr9a3hr5p6ydzda5y2is2971ba7991mnk3f0g4pc1"; depends=[doParallel foreach gRain gRbase raster rgdal]; }; bnstruct = derive2 { name="bnstruct"; version="1.0.4"; sha256="0xlq5y2pa7d36pj316idh84hkbgn0c8jjp0d2x1p92zfvd8xpxnw"; depends=[bitops igraph Matrix]; }; - bnviewer = derive2 { name="bnviewer"; version="0.1.1"; sha256="0p4a0agfj8cymyk8lz5raa59k0x97ph3fl3fs0c41plm2am9pxnm"; depends=[bnlearn igraph visNetwork]; }; + bnviewer = derive2 { name="bnviewer"; version="0.1.2"; sha256="1jib4r7i7jwyb3hixbpv2ks6vybw6f1za3d4mspm6s1d9qx3wi6q"; depends=[bnlearn igraph 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="0.8.6"; sha256="0ph1a6gnw10yccvv8cn3rq32nch3wa6w6a7k2h46qin0fsps55y6"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; - bomrang = derive2 { name="bomrang"; version="0.4.0"; sha256="16rc60pzphbxmijff5rk3vp8ara9vy1bk48m55drpqqdc3sbc0g3"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; }; + bomrang = derive2 { name="bomrang"; version="0.5.0"; sha256="16p6pd5is5gw31q5iw1s8ky4iw8zz12g72i18mdgdn444fh8nlig"; 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.9"; sha256="0vg1s1w0l9pm95asqb21yf39mfk1nc9rdhmlys9xwr7p7i7rsz32"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; }; bookdownplus = derive2 { name="bookdownplus"; version="1.5.6"; sha256="1g6s8kbpm5k976xyxamnmk6c8bhlwhxwp54fsad8qgwgin0lfahn"; depends=[bookdown knitr magick xaringan]; }; boostmtree = derive2 { name="boostmtree"; version="1.3.0"; sha256="0q1lgjvbc15m2gygnmh63m0wy2c6x25iwrh9cbn0baq598hnr7j9"; depends=[nlme randomForestSRC]; }; @@ -5230,7 +5287,7 @@ in with self; { breathtestcore = derive2 { name="breathtestcore"; version="0.4.6"; sha256="1d175pwph88nqd3i5nvs4csga9jnlzqxnsimlm63mnbnbxyzbf2q"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; }; breathteststan = derive2 { name="breathteststan"; version="0.4.7"; sha256="0lvyp3524cha6ckfx2c25829ys1g97xhjc3mi5cmdbfg8zfgcy58"; 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.1"; sha256="17r3az6za98v2r06aak77kypdaqssc9wxcc6m6vb20y7xm8dp1mp"; depends=[profileModel]; }; + brglm = derive2 { name="brglm"; version="0.6.2"; sha256="0c9ngscc6zlfm90fqyggnj04qfkhp5qgf5q3wnfpxwyc8cm47by2"; depends=[profileModel]; }; brglm2 = derive2 { name="brglm2"; version="0.5.1"; sha256="1vjgy9vxcx1n8syb04ck5sa4wnc4klrpyl8pk4ywkxzjflayh8ca"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; }; 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]; }; @@ -5238,17 +5295,18 @@ in with self; { 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.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; }; brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; }; - brms = derive2 { name="brms"; version="2.7.0"; sha256="1a7rmkwvns5lb6jj94q1jr07mj9pdc27q28hh7039wzm7yd9nddp"; depends=[abind backports bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; + brms = derive2 { name="brms"; version="2.8.0"; sha256="064kaj3778yhahfdwgi8xiawvd634w3f9q2lwymgbq4m4kr7nliy"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; brnn = derive2 { name="brnn"; version="0.7"; sha256="1bfqr21szlpn1izjwlzih9j7f34x31zrapckk184rvynbsbgg7g6"; depends=[Formula]; }; broman = derive2 { name="broman"; version="0.68-2"; sha256="0h6lrxrcjggrkv1dnbqsancjj69072nacaaazibl1v99rawanghi"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; broom = derive2 { name="broom"; version="0.5.1"; sha256="0bmf38yvwalqf5j5yrr48nsk5k3n75s0gwcw621hp5lgrgvnp7ns"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; }; broom_mixed = derive2 { name="broom.mixed"; version="0.2.4"; sha256="176817l4d31xbi7yfsjlw287va2wjllxizhi5z3p7x5mi7fkyv2c"; depends=[broom coda dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; }; + broomExtra = derive2 { name="broomExtra"; version="0.0.2"; sha256="1jfcmmxm5k5hli6r080i2kx0gkyq48w3fdjxpg4avrjpcq0s0jjy"; depends=[broom broom_mixed dplyr magrittr rlang]; }; 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.4.0"; sha256="0jzwk7mn5wan0qg12zfk99s445r7gwsdb9xvih929q1xvmk19k48"; depends=[ape crul curl phylocomr phytools taxize]; }; brt = derive2 { name="brt"; version="1.3.0"; sha256="13fn2mv66fys7w0xchh69sb6jggg5c2imk1psi3mlr1902m6ss5m"; depends=[ggplot2]; }; - brunnermunzel = derive2 { name="brunnermunzel"; version="1.2.0"; sha256="07b63gdd5i470ik3180q2y1xcsbd24bry9l97gz9nd7hwnrizksq"; depends=[]; }; - bs4Dash = derive2 { name="bs4Dash"; version="0.2.0"; sha256="0s893mkhkr0zvarbyzl9k5033rjxwr42k74sx2qwjgwh0indypfb"; depends=[htmltools shiny]; }; + brunnermunzel = derive2 { name="brunnermunzel"; version="1.3.2"; sha256="10dry3vzbczbi4kpzlp5f7fjvwhsf909m80ki4b8947qqxh052y9"; depends=[]; }; + bs4Dash = derive2 { name="bs4Dash"; version="0.3.0"; sha256="10chkkryn7i6kx6jl6vg6dhahwjij661r8qxn2h5cailpn4sq5ga"; 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]; }; bsamGP = derive2 { name="bsamGP"; version="1.2.1"; sha256="0b4a6ll11cykqq05ys1b0y9gdhbw6y60hjclz678vy5w8jia7a1m"; depends=[ggplot2 gridExtra MASS]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; @@ -5264,7 +5322,9 @@ in with self; { btb = derive2 { name="btb"; version="0.1.30"; sha256="1f94zzpg3q6ldd436cv1wqpfbpw5f706073wk38a4dkg57dwrbgi"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; }; btergm = derive2 { name="btergm"; version="1.9.3"; sha256="0nailhw4n9rqqv1i2l41qz4gx0mr7viycdmd4kc00gm3nk4721gp"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm texreg xergm_common]; }; bucky = derive2 { name="bucky"; version="1.0.5"; sha256="0xn92dnhrs8810f8kvn2dnig0icd1k4dkxljmldij6dn8xb7c85q"; depends=[lmtest sandwich]; }; + buildmer = derive2 { name="buildmer"; version="1.0"; sha256="1418ja7kcrnawb9nfjzky0qd7d29vnqr7czv1f4l66j9gpmgrr4r"; depends=[lme4 mgcv plyr]; }; bujar = derive2 { name="bujar"; version="0.2-5"; sha256="1mdn9kisbgsz8bp9nb9kvqng1wsf3a32wqqc5z5lp1c32ry58sii"; 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]; }; bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; }; @@ -5278,6 +5338,7 @@ in with self; { bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; bvpSolve = derive2 { name="bvpSolve"; version="1.3.3"; sha256="1q5sh3kj1c07zq7mx8sh4ggp1fvwh86394qrc3ildj4wrbakmzib"; depends=[deSolve rootSolve]; }; bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; }; + bysykkel = derive2 { name="bysykkel"; version="0.1.1.0"; sha256="19g2sjfzc0g5nnd6mjv2c62flafcd4qb6adn3ipkhrlkdp2skxkb"; depends=[data_table glue httr jsonlite magrittr tibble]; }; bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; }; c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; c14bazAAR = derive2 { name="c14bazAAR"; version="1.0.2"; sha256="03siiadhj8wp80jhm99lw7xb1p24yk9ycx2kp085a7xj82hl22jj"; depends=[crayon data_table dplyr magrittr pbapply RCurl rlang tibble tidyr]; }; @@ -5287,7 +5348,7 @@ in with self; { c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="0.7"; sha256="149brvizsx0sw3rldimnj6qh08hv05v1bhgrryyziis2n0afxsir"; depends=[lme4 Matrix]; }; cIRT = derive2 { name="cIRT"; version="1.3.0"; sha256="0jbjkmzw3z935pq12k5kmy3vdpqlpm70siv8f0bnlw42sai1qcw1"; depends=[Rcpp RcppArmadillo]; }; - cNORM = derive2 { name="cNORM"; version="1.1.5"; sha256="1ils9r11lgg3gk844yhcjgx421i99wfv08svy93js39n2dzmfmmi"; depends=[lattice latticeExtra leaps]; }; + cNORM = derive2 { name="cNORM"; version="1.1.8"; sha256="0qwqwmy2awyaji93kz9jkhqxc2fh8h7n353z5hyqa20rrnm028nw"; depends=[lattice latticeExtra leaps]; }; cOde = derive2 { name="cOde"; version="0.4.1"; sha256="1hvanmbnmkrly2s3c57r2xc0w56a4jxspc15ncfzdx94k6mvnhxq"; depends=[Rcpp RcppArmadillo]; }; cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; }; cRegulome = derive2 { name="cRegulome"; version="0.3.0"; sha256="0h850xqa6wi03gvq5cvah0mkap92q44cc925nx6fw88y8sna3p3x"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; }; @@ -5300,18 +5361,19 @@ in with self; { cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; caesar = derive2 { name="caesar"; version="0.1.0"; sha256="1l0z64fsifx37j2h61kzygbwr3z3cncn48znrpb5cq10ma42igqf"; 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.25"; sha256="0qsg6niz6b67yiqp200mi894s615y2bp0vb2sc093l9x9bc2jvfj"; depends=[]; }; + cairoDevice = derive2 { name="cairoDevice"; version="2.26"; sha256="0g1jfcm0xxaxvab21533dcrfwydpis7vl1ww7raj45g1i6vz3iiy"; depends=[]; }; calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; }; + calcWOI = derive2 { name="calcWOI"; version="1.0.2"; sha256="09g96inaayp0brbxw75l7k1cqn50f7qw0glb2g04657zmlk16i52"; depends=[LS2W wavethresh]; }; 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.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; 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.1.1"; sha256="15l1qfa3aigba2ghgr2gwcjjy7anagrwg8khsd36fymwkmqj5g69"; depends=[processx R6]; }; + callr = derive2 { name="callr"; version="3.2.0"; sha256="1s5h2k7c1vgbry90xczin66q89cbkc6mvh4679l5rsz83087pd2b"; 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.2"; sha256="0i81ffdfw3m15cfbag3l9s245dyhapqhy7adb3228vam3qp3n59b"; depends=[digest dplyr httr jsonlite stringr]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; - camtrapR = derive2 { name="camtrapR"; version="1.0"; sha256="1raxxki2xkmb7mjlfsxn2fr1dvwc86n88cbkk08bwjzsizrvsz0z"; depends=[overlap rgdal ritis secr sp taxize]; }; + camtrapR = derive2 { name="camtrapR"; version="1.1"; sha256="1lmci62r6igz3yqlh59ca3p6msf8v2wn1wz5jh6mcdh5b8k50gas"; depends=[overlap rgdal ritis secr sp taxize]; }; cancensus = derive2 { name="cancensus"; version="0.1.8"; sha256="12mhnx9bx8wdhz7cb3lz0r0i6hgq6v401hl9v3bng27pz3va2fad"; 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]; }; @@ -5338,7 +5400,7 @@ in with self; { cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; }; care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; }; careless = derive2 { name="careless"; version="1.1.3"; sha256="07yq6sfp110pkd3khfn8ajdqz2r4ipcs90mpaiynh12xl0n67x7k"; depends=[psych]; }; - caret = derive2 { name="caret"; version="6.0-81"; sha256="1fibrskjzq2f06b8gbrfp3263svfc5s5apsjwaqdg9qzs7sy7fpc"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; }; + caret = derive2 { name="caret"; version="6.0-82"; sha256="0zgkmiiarl7ll2ffyciikah61jyps41fin5pjb5l8ja2b26lgrdg"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; }; caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; carfima = derive2 { name="carfima"; version="2.0.1"; sha256="0nzwf4x59vfv5idfdcghizipjlg33v6d8scxm8rh7pxnfbc1jp56"; depends=[cubature DEoptim invgamma MASS numDeriv Rcpp RcppArmadillo Rdpack truncnorm]; }; caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; @@ -5365,7 +5427,7 @@ in with self; { catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; }; catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; }; - catlearn = derive2 { name="catlearn"; version="0.6.1"; sha256="1fm6sylbx8b7r70qic0jbaa9fiwqx13hc5jrr5ndb9wxkbjylqai"; depends=[doParallel dplyr foreach Rcpp tidyr]; }; + catlearn = derive2 { name="catlearn"; version="0.6.2"; sha256="0b038qgx6jksshi68iin1wwi66hng1fdbcr8dg7q6nqmx78bhc3k"; depends=[doParallel dplyr foreach Rcpp tidyr]; }; catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; }; catnet = derive2 { name="catnet"; version="1.15.3"; sha256="1dgqrn1lz57pwb5pca0mlvcmw9piy9xgf6fs0y2lsy4qxa9k0plk"; depends=[]; }; catseyes = derive2 { name="catseyes"; version="0.2.3"; sha256="1p0jnjjfl1jqqqk8q6yfsxrh30idfbss7v6lrrm25x8zrhxah0ww"; depends=[]; }; @@ -5397,8 +5459,8 @@ in with self; { cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; }; ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; }; - cctools = derive2 { name="cctools"; version="0.1.1"; sha256="1baqijxg75wr90y38d5g1gg8jmpz8ji7zv51wp9n1knif27rg348"; depends=[qrng Rcpp RcppArmadillo]; }; - cdata = derive2 { name="cdata"; version="1.0.6"; sha256="1fih203acngdn2mj5vm27lmgjpscmry2hq7i928402cwnwmy8k81"; depends=[rquery wrapr]; }; + cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; }; + cdata = derive2 { name="cdata"; version="1.0.8"; sha256="1fl5q3ahz34g061s00hrqjnyy1a991q29vci04kby7gy5yqxbl78"; depends=[rquery wrapr]; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; cdcfluview = derive2 { name="cdcfluview"; version="0.9.0"; sha256="0i6jipzpfcqs48w0cwjyynf3lpdppa7xh27q1rwv3jsqd246880v"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; }; cdcsis = derive2 { name="cdcsis"; version="2.0.0"; sha256="1xvfkzhgfcf8037s6yyw5i5xl1vbx6qlavvr8s4ijjcsgljgg5s8"; depends=[ks mvtnorm Rcpp]; }; @@ -5444,24 +5506,27 @@ in with self; { cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; }; cglasso = derive2 { name="cglasso"; version="1.1.0"; sha256="0qr6y06aablncj4ja4xjp4dhykqy15qmbigi4px9snpwssrqhwl2"; depends=[igraph MASS]; }; cglm = derive2 { name="cglm"; version="1.0"; sha256="1539n1q1zz1888d143w6vva9465viwcnb49frcsb74j3zvk6j4zp"; depends=[data_table nleqslv Rcpp RcppArmadillo]; }; - cgmanalysis = derive2 { name="cgmanalysis"; version="2.2"; sha256="1bsa7cxynmgbk60l68v202k2lcn1f13hrxdbzvxi9anf2y34ffdg"; depends=[gdata ggplot2 lubridate pastecs pracma readr zoo]; }; - cgraph = derive2 { name="cgraph"; version="4.0.0"; sha256="0q8cq6rjqvydawgsv7iv3qk6ancli1dg21vg1707si2hayskvzxh"; depends=[]; }; + cgmanalysis = derive2 { name="cgmanalysis"; version="2.3"; sha256="1hn755rl43irsyqna3fc5njhpj7d2jmwciv9ijn3x1v6jm20yv36"; depends=[gdata ggplot2 lubridate pastecs pracma readr zoo]; }; + cgraph = derive2 { name="cgraph"; version="4.0.2"; sha256="0gqwbiq4azyyx0mlnvv34bmz4hmfhqjqvsdm95qn52jkq0hl81zp"; depends=[]; }; cgwtools = derive2 { name="cgwtools"; version="3.0.1"; sha256="15qllfcgls6hpj51xa7mklr5ppxrs2avbiwq3y4bqbb20fld78w3"; depends=[]; }; chandwich = derive2 { name="chandwich"; version="1.1.1"; sha256="0dpd1b9bq9i8a9wlmid6rvhpmvxj8dilv9xppmzr0jrh0nrcj9yx"; depends=[numDeriv]; }; + changedetection = derive2 { name="changedetection"; version="0.1.0"; sha256="0nvm40sjsya3nqm9a8k5dv3w0vm950ni6cvjlpbq4fq8s9cjr1rx"; depends=[glmnet L1pack Rdpack]; }; changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; }; changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.1"; sha256="1cv7gkfzzb8qmm49ygrkcsvlj3hx41wj8h2msa9rrawj33awj1c6"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; }; - changepointsHD = derive2 { name="changepointsHD"; version="0.3.0"; sha256="05zmypz2jz55m9avzg63dmp7fpcgi7jpc9vf2fv0kywcvf2wz5ym"; depends=[Rcpp RcppArmadillo]; }; + changepointsHD = derive2 { name="changepointsHD"; version="0.3.1"; sha256="07dasdgyw6m5s58l08j4xz2l6f2l2r48jjrcrc5j3qj7mak715jk"; depends=[Rcpp RcppArmadillo]; }; changepointsVar = derive2 { name="changepointsVar"; version="0.1.0"; sha256="0kj9m9jik1dm5fx4c4hb559f5irpl1mvxk4wwajd5577a2fdqxb5"; depends=[lars MASS]; }; changer = derive2 { name="changer"; version="0.0.3"; sha256="1pmnspadkshz7z9f275vks1xjh6a9k37h7j51dqdjrqilzq7y6sf"; depends=[available devtools git2r]; }; charlatan = derive2 { name="charlatan"; version="0.3.0"; sha256="1i8n6kmdv8f2mnd626qja979qx35fdl1a8r9akgqznh5bhjqiq42"; depends=[R6 tibble whisker]; }; + chartql = derive2 { name="chartql"; version="0.1.0"; sha256="108csn7q8qrjhiss54f5bliv3av7psq7kfryspajbdb6wm9ciz3p"; depends=[ggplot2 stringr]; }; cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; - chebpol = derive2 { name="chebpol"; version="2.0"; sha256="0iz7iz7b1mc67gkgklh8zmnhacgq1cgdfy0w2wd54g0jz934d77p"; depends=[geometry]; }; + chebpol = derive2 { name="chebpol"; version="2.1"; sha256="0dvmdcrdk7mc2gxbmz645x42rras8iqdp8yzg1kslcynaj665arb"; 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=[]; }; checkmate = derive2 { name="checkmate"; version="1.9.1"; sha256="1y4ylzn55kpyfpzcx9rxb9413d3ck6hair36ldl0ak61ia5kc75p"; depends=[backports]; }; checkpoint = derive2 { name="checkpoint"; version="0.4.5"; sha256="0ml6lr8vmnrj2d073mr6dxsy0sqf50vyc956j9pnmzan2k7qv2wc"; depends=[]; }; checkr = derive2 { name="checkr"; version="0.4.0"; sha256="15dlclg567dfr6v7irc6hnhjfzn0w43wrw48md6b9mlswkk8lhmd"; depends=[err]; }; cheddar = derive2 { name="cheddar"; version="0.1-633"; sha256="09mw8rr5xb06gw3hbk7zv2nnx6mwhs6i19ffbp9pv3yv2945cjlf"; depends=[]; }; + cheese = derive2 { name="cheese"; version="0.0.1"; sha256="0yjb68qlz62vmvjf6c8qfblihkkigfbhxpw42mm6qdy4f483mpr2"; 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]; }; chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; @@ -5471,11 +5536,11 @@ in with self; { chicane = derive2 { name="chicane"; version="0.1.0"; sha256="1f7sxqwg9s8l3lz538kyq8x5csqyq8g67vpm4zh9c962kg5m3f55"; depends=[data_table doParallel foreach gamlss gamlss_tr MASS]; }; childesr = derive2 { name="childesr"; version="0.1.0"; sha256="14jca7lxyn0fip794l70mznhz4ld6iix995wrmiqynxdms6j80np"; 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.1"; sha256="1l3lpliir5hhkihia8s815ac81rrgpw5n58fcdys2ivs0jfslkm2"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; + childsds = derive2 { name="childsds"; version="0.7.4"; sha256="1dyzidmbr7608y65kymf7x5s19qjsz9hxzfv51ml1kaymml1hbf3"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; chillR = derive2 { name="chillR"; version="0.70.15"; sha256="17qmjy10zidf5z4sx3j6ly6yyyyp99kws3s963dddy9w7z651pmj"; depends=[assertthat fields ggplot2 httr jsonlite Kendall pls plyr R_utils raster RCurl readxl reshape2 RMAWGEN sp XML]; }; chinese_misc = derive2 { name="chinese.misc"; version="0.2.0"; sha256="0spm77z5wwsin3xdnhy0naw9rfl4c3iysck9gs7jy15a0iizm3wn"; 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]; }; - chngpt = derive2 { name="chngpt"; version="2019.3-8"; sha256="0p728380kmxajh44pgri1pvf34mc7gc94vgw0yd5xh4wfhr4k45h"; depends=[boot kyotil MASS Rcpp RcppArmadillo survival]; }; + chngpt = derive2 { name="chngpt"; version="2019.3-12"; sha256="0adni2ikx19hd3r9mhwm2z5c39pihnmxzjxqrc8ycg3nbh5p53kd"; depends=[boot kyotil MASS Rcpp RcppArmadillo survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; }; cholera = derive2 { name="cholera"; version="0.6.0"; sha256="0asy5hq3fjcj7wlfhhgivaxzvfbmkxwlfbjqnzhfjfb8s43kfnb1"; depends=[deldir ggplot2 HistData igraph KernSmooth pracma RColorBrewer scales sp threejs TSP]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; @@ -5493,11 +5558,11 @@ in with self; { chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; }; ciTools = derive2 { name="ciTools"; version="0.5.1"; sha256="02jgi09vkzsan47mvg65ciqc1q4vmrl14v2i5bsaqxbvxwd65lww"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; }; cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; }; - cimir = derive2 { name="cimir"; version="0.1-0"; sha256="1fcamhc95nmy2007rws3ricnr623b5dipqbmbw8jrafvpvj7cs6q"; depends=[dplyr glue jsonlite purrr RCurl readr rlang stringr tidyr]; }; + cimir = derive2 { name="cimir"; version="0.2-0"; sha256="1j0syb9jkz8qkd26ygmyhh260b25pkx59b6y7z9gb3r447hhlxa5"; depends=[dplyr glue jsonlite purrr RCurl rlang stringr tidyr]; }; cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; }; circglmbayes = derive2 { name="circglmbayes"; version="1.2.3"; sha256="1a60d8jpvwx2qwmy2if60c5vni9hp73fdwgz7mwi5xd5l67zwd3h"; depends=[BH coda ggplot2 Rcpp RcppArmadillo reshape2 shiny]; }; - circlize = derive2 { name="circlize"; version="0.4.5"; sha256="0qhn9jzw7gd0jp9rmqrlbmy5ql6hjsa68pkp0acfz1h215dl8ah9"; depends=[colorspace GlobalOptions shape]; }; + circlize = derive2 { name="circlize"; version="0.4.6"; sha256="1yjnb88pnzk5c1p0vjxykc7cr3394ln5axviqcf12ajibvy8rj6f"; depends=[colorspace GlobalOptions shape]; }; circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; }; circumplex = derive2 { name="circumplex"; version="0.2.1"; sha256="0123dnzm8kxbj9k2h0mwcmbmj442dyjwh23zq9yaps2531prsrr2"; 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=[]; }; @@ -5529,15 +5594,15 @@ in with self; { cleandata = derive2 { name="cleandata"; version="0.3.0"; sha256="1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk"; depends=[]; }; cleanerR = derive2 { name="cleanerR"; version="0.1.1"; sha256="0rghn8rx7dj5clmc1dqvqwfm9kiva04k9gxsjjga3109l4jcpg63"; depends=[data_table plyr]; }; cleangeo = derive2 { name="cleangeo"; version="0.2-2"; sha256="1bhpn53v36652mwg2ba2a6cs34slb7i0df2ibssyr2lnx5gciq4i"; depends=[maptools rgeos sp]; }; - cleanr = derive2 { name="cleanr"; version="1.1.3"; sha256="0vf2c2inb729kzmpxaznqa2zwj80j1ix9198gc36zq41ag5pd7jk"; depends=[checkmate]; }; + cleanr = derive2 { name="cleanr"; version="1.2.0"; sha256="1yd6w4jv4rj1g67i3q7h0z2n8nycvg67ixxgf49fplxnjhxq09g5"; depends=[checkmate pkgload rprojroot]; }; clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; }; clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; clhs = derive2 { name="clhs"; version="0.7-0"; sha256="0wliffs16misvlsxcng89a6yasq9blrlic88n59334vj60p42l3m"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; - cli = derive2 { name="cli"; version="1.0.1"; sha256="1r2yih4c0bdmbx0qrarlf0m1p5z30sri755zmdazsq2pw76zp07g"; depends=[assertthat crayon]; }; + cli = derive2 { name="cli"; version="1.1.0"; sha256="02hdwvdq5nic6dhxj88jbgsc9m8yrz3yibigg6szkggxyk6hzh2g"; depends=[assertthat crayon]; }; 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.20"; sha256="140ncl7iv48yxnwf55rf8cwcyznzw7kslkjzymslyqmhvvw43q6p"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; }; clickstream = derive2 { name="clickstream"; version="1.3.0"; sha256="01bii527xy7hdph1pm6f1g4qnwa5yf3mwz01rjg1h2gc12s5vzgg"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; - clifro = derive2 { name="clifro"; version="3.2-1"; sha256="1y3xr61d9y6kb2h3i3a75l15hi3fxrjkf6w09dp5fk06hv6j90vr"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; }; + clifro = derive2 { name="clifro"; version="3.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; climatol = derive2 { name="climatol"; version="3.1.1"; sha256="012spjgw20bg4rlxgwh05rhaswa4afbd35sq1isidm6i73ma0yjq"; depends=[mapdata maps]; }; climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; }; @@ -5557,6 +5622,7 @@ in with self; { 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]; }; + cloudSimplifieR = derive2 { name="cloudSimplifieR"; version="0.1.9"; sha256="0wp582y817f6z7kpw9nn665d6pdn0zqyadjbragw7ij4x73ncksq"; depends=[aws_s3 aws_signature jsonlite readr]; }; cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; }; cloudml = derive2 { name="cloudml"; version="0.6.0"; sha256="0p34wrrs06c17lbjlkjhm04ffg3l3zfkxb7swikjbim0j5aww2kh"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; }; clpAPI = derive2 { name="clpAPI"; version="1.2.9"; sha256="1dgfs124lcarcwh75f5mi5z9y723s2ik5kz2g9fxgcama7r01a1x"; depends=[]; }; @@ -5567,11 +5633,13 @@ in with self; { clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; }; clusrank = derive2 { name="clusrank"; version="0.6-2"; sha256="1hjxks8cb1mp1d93rcpwqjrxqavspmzjrxvflhv6nqx41ar9dpxv"; 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.1.2"; sha256="1hy7jc8yfg554l439lfrppdsizrdmvxrqf9dwbkjckbvggg54f0k"; depends=[cluster fda 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.1-36"; sha256="111pnhj92hly3a1km41wdq3w80s6lld8j31rygbczb5dig5cmlb9"; depends=[RColorBrewer]; }; + clustMixType = derive2 { name="clustMixType"; version="0.2-1"; sha256="1m6pv1r3wdszji8nqs6yyl2405092yrdxq3vl8z1x15lnj1c87yh"; depends=[RColorBrewer]; }; clustRcompaR = derive2 { name="clustRcompaR"; version="0.2.0"; sha256="151xq8qf1mrl35kyhdliwl2jpdkpkbl3gdnrvrybanihry2p0kqg"; depends=[dplyr ggplot2 ppls quanteda]; }; - cluster = derive2 { name="cluster"; version="2.0.7-1"; sha256="1grxbifbc4nwig25dmjgkympnbzb4al0w6k1c0ibdhpk1h4l20di"; depends=[]; }; + clustcurv = derive2 { name="clustcurv"; version="1.0.0"; sha256="055hxwpvfm37gvgc5ar8qk6ksny89hmr79w1jmxyynml47lwllrl"; depends=[doParallel doRNG foreach ggfortify ggplot2 Gmedian survival wesanderson]; }; + cluster = derive2 { name="cluster"; version="2.0.8"; sha256="0jkmlhjknndh0lmyvqz7s7j1hhnarixm6zb39np4ssw47flk0nfc"; 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]; }; @@ -5580,17 +5648,19 @@ in with self; { clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; }; clusterSEs = derive2 { name="clusterSEs"; version="2.5.1"; sha256="0xg33m22vbhdgngidk8hfyd5avkn5lqn463bqxjyzgwnm5mz6yxx"; depends=[AER Formula lmtest mlogit plm sandwich]; }; clusterSim = derive2 { name="clusterSim"; version="0.47-3"; sha256="050x4jasnclj4vm27cjgsspcrvb0lijnkpyavcysvbz8psllx629"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; }; - clusteredinterference = derive2 { name="clusteredinterference"; version="1.0.0"; sha256="1dnbymivxkrhx39maannhvm8ynlgjxsiavd2d9ych5nq4mjvhnjg"; depends=[cubature Formula lme4 numDeriv rootSolve]; }; + clusteredinterference = derive2 { name="clusteredinterference"; version="1.0.1"; sha256="01w7i9pmvwmrlf5q6y2d48ib0bm16j16xiw4pqnrvbndx4d6wf6n"; depends=[cubature Formula lme4 numDeriv rootSolve]; }; clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; }; clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; }; clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; }; clusterlab = derive2 { name="clusterlab"; version="0.0.2.6"; sha256="0c0br3nf5zgq5d4119sr4cmm1hq9f1ayphi0j4n5dzpwc8kq4518"; depends=[ggplot2 reshape]; }; clustermq = derive2 { name="clustermq"; version="0.8.6"; sha256="0kwqkkx51wdb8ngvvdh93gh02j9hdgswdkdnlrxvv0whk37ir8h2"; depends=[infuser narray progress purrr R6 rzmq]; }; clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; + clusternor = derive2 { name="clusternor"; version="0.0-3"; sha256="0qf1k5y9i60skdqz7glq7czwg84gafnxfg0npx772xydvivan210"; depends=[Rcpp]; }; clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; }; clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; }; clustrd = derive2 { name="clustrd"; version="1.2.2"; sha256="0jcx6afns87wyrc7j2rmc57q4447caxwrkq0j7fys5jbkcidw7bh"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; }; clustree = derive2 { name="clustree"; version="0.3.0"; sha256="0chf6sq313f36752v17ga9ba6wrhyf7dzjnnpgl6xr0056fw8hch"; 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]; }; clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; }; @@ -5627,7 +5697,7 @@ in with self; { coda_base = derive2 { name="coda.base"; version="0.1.11"; sha256="01vmm1qzm9vfgd6s5nd92xk4h89iarprp6jb1y7bqwg8is4l7jp3"; depends=[MASS Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codebook = derive2 { name="codebook"; version="0.8.0"; sha256="1bak8jmm8r03760i0abhr66b7bqfa64azgk1yh22w706d2clzlr0"; depends=[dplyr DT future ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert lubridate miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr userfriendlyscience]; }; - codemetar = derive2 { name="codemetar"; version="0.1.6"; sha256="1jjm1c7fkrzyhb57ckdf3d808im5j6c20ykkjsnddh220jy4sgss"; depends=[crul curl desc devtools gh git2r jsonld jsonlite memoise purrr readr sessioninfo stringi stringr tibble usethis whisker]; }; + codemetar = derive2 { name="codemetar"; version="0.1.7"; sha256="15dhi561bxz4wvlxah7dq5p9m2qdkmcr3p4mf52w5qm9rigcyz92"; depends=[commonmark crul curl desc gh git2r glue jsonlite magrittr memoise pkgbuild purrr readr sessioninfo stringi stringr tibble usethis whisker xml2]; }; codep = derive2 { name="codep"; version="0.9-1"; sha256="17jziwm56icswa4ngp51ah8w1ma7ij3cksbdaipk0ikqvb5kinkb"; depends=[]; }; codetools = derive2 { name="codetools"; version="0.2-16"; sha256="00bmhzqprqfn3w6ghx7sakai6s7il8gbksfiawj8in5mbhbncypn"; depends=[]; }; codified = derive2 { name="codified"; version="0.2.0"; sha256="1hmw7yrw4qx8v9rkqqvqf4013s9whq5qlgwz7v882j4slpvm6gb1"; depends=[checkmate dplyr kableExtra knitr magrittr readr rlang tibble tidyr]; }; @@ -5650,7 +5720,7 @@ in with self; { collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; }; collateral = derive2 { name="collateral"; version="0.4.2"; sha256="1i1fzvm838s2cfmxw654vwmp9rl9f9985vjildkxyx2f6571sjfm"; depends=[crayon pillar purrr]; }; collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; }; - collections = derive2 { name="collections"; version="0.1.5"; sha256="0g7730xn7slaz4swsx29prcgn47pq7pxcjjramrpgi4rfbs6a6xi"; depends=[R6]; }; + collections = derive2 { name="collections"; version="0.1.6"; sha256="1wd2wz6xg7nk54kwb142fw8qi0zbwk3j07v0kj7myradhcs6a29b"; depends=[R6]; }; collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; }; colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; coloc = derive2 { name="coloc"; version="3.1"; sha256="1321675wz1vn7rcd2sm4c9h183nwnmp0lqww5nykjf792ijyaal8"; depends=[BMA flashClust ggplot2 reshape snpStats speedglm]; }; @@ -5667,7 +5737,7 @@ in with self; { 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.5"; sha256="0pr28fhv7alvki9f6wncys8lxihsl6q6lr8xffw4fkkgyapnhqxg"; depends=[Hmisc pracma sp]; }; - colorspace = derive2 { name="colorspace"; version="1.4-0"; sha256="0mpmvz2sycjp4c9y3v3qin7mdjy812hwi7cyjnblcw6xb1ckq06f"; depends=[]; }; + colorspace = derive2 { name="colorspace"; version="1.4-1"; sha256="0wyny3ah2d74hqv80s6imrarpna09gq3j9rjnz6zx2qg0lx72gb9"; depends=[]; }; colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; colourvalues = derive2 { name="colourvalues"; version="0.2.2"; sha256="0i6p7xn9b59ywgbrby78zqxz3bc45bkqyc131kb3987zy4wvh438"; depends=[BH Rcpp]; }; @@ -5684,12 +5754,12 @@ in with self; { commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; commonmark = derive2 { name="commonmark"; version="1.7"; sha256="024iz1qp2kv6iz6y69ir0jk3qhjps86rhkzlcmhqsxx97rx7cjni"; depends=[]; }; commonsMath = derive2 { name="commonsMath"; version="1.2"; sha256="1j914f4fqrzp4wwis7i14krsxbdwb2dznzrjdnimy1irs1macyw3"; depends=[]; }; - comorbidity = derive2 { name="comorbidity"; version="0.2.0"; sha256="0imdnd9fxbl0d5vy1ia7844har8k689mvwbqa7pdy3rz9wmp2q3z"; depends=[checkmate stringi]; }; + comorbidity = derive2 { name="comorbidity"; version="0.3.0"; sha256="0fymlh479jfyknqwg9jh9b5j6h6ha7i4qyqd3nvqhxj5910c1c3j"; depends=[checkmate stringi]; }; compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; 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="1.7.1"; sha256="16y71gcydb675vkhd6xlpjpd9g1nrhqsfvlzabs8ii5i0xxwypbr"; depends=[dplyr htmlTable magrittr stringr tidyr]; }; + compareDF = derive2 { name="compareDF"; version="1.7.2"; sha256="1k9yl679l5d6sc3rfqiw20p1gzjj73kfkamdqm5m66ny1wrgkz9w"; depends=[dplyr htmlTable magrittr stringr tidyr]; }; compareGroups = derive2 { name="compareGroups"; version="4.0.0"; sha256="1akg12kgxhxvdsaydqxb28s96nw3xnwdygi8apa6f67r3m6824i3"; depends=[chron epitools gdata HardyWeinberg Hmisc kableExtra knitr rmarkdown SNPassoc survival xtable]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparer = derive2 { name="comparer"; version="0.1.1"; sha256="1nmvqzrvyxdsidkr243qdn0lj2s7j3jv1sh0mdlxm2v5063nyryr"; depends=[progress]; }; @@ -5705,8 +5775,8 @@ in with self; { complmrob = derive2 { name="complmrob"; version="0.6.1"; sha256="1dr80r1p05h3mlnjbgh6kfw86np8y2bhy9yi5qydv85w52k133n1"; depends=[boot ggplot2 robustbase scales]; }; compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; compositions = derive2 { name="compositions"; version="1.40-2"; sha256="12mp05yi7jkdqg9iwh6bc9sx6sdxagcnrirznxy9hq8502p7238i"; depends=[bayesm energy robustbase tensorA]; }; - compound_Cox = derive2 { name="compound.Cox"; version="3.14"; sha256="118s0j8xkv0fk8hvzfyw2dwkh76ky5k98dnh92vh6akcz1wm0iam"; depends=[numDeriv survival]; }; - comprehenr = derive2 { name="comprehenr"; version="0.5.4"; sha256="15qjvffsa1m8nsy6xlrqg664h3nib83c8a5k1hxwiy6qw414p43k"; depends=[]; }; + compound_Cox = derive2 { name="compound.Cox"; version="3.15"; sha256="1c8mzr8zcc51yq85lvph9ry449b2l9553laiv850najswj1pjnfh"; depends=[numDeriv survival]; }; + comprehenr = derive2 { name="comprehenr"; version="0.6.0"; sha256="05hciws2wiq8i5daificd2z3c6r778pkcdzsnn7sf5cs833asy5p"; depends=[]; }; compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; 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=[]; }; @@ -5717,7 +5787,7 @@ in with self; { concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; }; concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; }; - concurve = derive2 { name="concurve"; version="1.0.4"; sha256="1lbd7zcd7jdmszw55yrljw1c4hh9q1736jf59by8c8kybnkigivs"; depends=[ggplot2 metafor]; }; + concurve = derive2 { name="concurve"; version="1.0.5"; sha256="00zp77i7g5k237rnimzhw6gixz8gra54v1z5mhafwi09p9bzram3"; depends=[ggplot2 metafor]; }; 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="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; }; @@ -5729,7 +5799,7 @@ in with self; { 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]; }; coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; }; - conf = derive2 { name="conf"; version="1.5.0"; sha256="17w8vslppp1f88vz9f4m85x2zyw65mjxd5h0r8s8l9ckbbykv5fg"; depends=[fitdistrplus SDMTools STAR statmod]; }; + conf = derive2 { name="conf"; version="1.6.0"; sha256="16qyhydxwz4wdgckvrqcypdybb4rcyh99f3w3xghxjai20qskadj"; depends=[fitdistrplus SDMTools 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]; }; @@ -5737,7 +5807,7 @@ in with self; { configr = derive2 { name="configr"; version="0.3.4"; sha256="0wsw5kbmkbc95ds4m311m25fn9wrc5wq06jvzjsnnh86ax2w43is"; 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=[]; }; - conflicted = derive2 { name="conflicted"; version="1.0.1"; sha256="0hj9dvyi59y917cac1d3g1bgaghs40nr71z3y2msr29q01d1sqkp"; depends=[memoise rlang]; }; + conflicted = derive2 { name="conflicted"; version="1.0.2"; sha256="1a09qnid6gjbm3by499vkamrb5zlrwhggxq98jlgam9ccpidcd9c"; depends=[memoise rlang]; }; conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; }; confreq = derive2 { name="confreq"; version="1.5.4-3"; sha256="1jn9v9z04a2yni4l3i7969kzzpgaxkdfdggi74dgp3jchda6vip7"; depends=[gmp]; }; congressbr = derive2 { name="congressbr"; version="0.2.0"; sha256="058sir7qss8i8cdjlckimj85b7gad6kfww40z1x0gdb9ndcd7904"; depends=[dplyr glue httr janitor lubridate magrittr progress pscl purrr stringi stringr tibble tidyr xml2]; }; @@ -5750,9 +5820,9 @@ in with self; { 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]; }; container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; }; - contextual = derive2 { name="contextual"; version="0.9.8"; sha256="088l6nzbcac93bjqsfdcsbigp38ywh7d7m1am00f7fxl4szlvkac"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6]; }; + contextual = derive2 { name="contextual"; version="0.9.8.1"; sha256="1phcbqsa01qz2m5zd4s3nzf06szwyhh231hlqnarqvhn38lynsa9"; 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.6.1"; sha256="0vw6gwiajxzaai6ky0b89l2jg4kd4c6xxzb1cmzxlcdrhwmhz402"; depends=[BMS coda gtools mvtnorm tseries]; }; + conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; }; contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; }; contrast = derive2 { name="contrast"; version="0.21"; sha256="1fgm6qm3svqg8ryq2kd1h9z6f3ni8kki7gl3izvjw6wir97ph8nw"; depends=[geepack Hmisc MASS nlme rms sandwich]; }; control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; @@ -5777,7 +5847,7 @@ in with self; { 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="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; }; - corTest = derive2 { name="corTest"; version="0.9.7"; sha256="19lri1gxm75kpvnzfbahqkg5bhzxcicvi7jpk3r4sg67kajzxyrg"; depends=[MASS]; }; + corTest = derive2 { name="corTest"; version="0.9.8"; sha256="03dhy84a7caf030br9ybr5zxfq49y72gwj462ay245b09k4f2v3r"; depends=[MASS]; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; @@ -5789,6 +5859,7 @@ in with self; { corehunter = derive2 { name="corehunter"; version="3.2.1"; sha256="0cxvhmi768kz3q8hydb6y9nqvc8hvkmq8nc5yfry4k94whk12wax"; depends=[naturalsort rJava]; }; 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.1"; sha256="0kwzpbr69gvkajwvyykbpqfvp5ndsks1a70iwnlvbkdyl4vl3fck"; depends=[glmnet palasso]; }; coroICA = derive2 { name="coroICA"; version="1.0.1"; sha256="0hjy1sdii8kk859bj1xv3vh1hzxznhymhgdb583z57i0hqxnijiv"; depends=[MASS]; }; corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; }; @@ -5813,7 +5884,7 @@ in with self; { costsensitive = derive2 { name="costsensitive"; version="0.1.2.1"; sha256="0q50q39wngyqfg4vxhxdb8v64v0ws7njs2zzf6qhlhipqhhxq55n"; depends=[]; }; cotrend = derive2 { name="cotrend"; version="1.0.1"; sha256="14yzfq5a3wi26gn45mp2zm2yn6gic90csk9by66m08fgpzznz4dq"; depends=[xts]; }; couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; }; - countTransformers = derive2 { name="countTransformers"; version="0.0.5"; sha256="12hngibx9idi71j15vn23f4cfmq7ac3xqxwyg9xr11irypzcb419"; depends=[Biobase limma MASS]; }; + 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.0"; sha256="1kb7na35xk257a6bd9ihgbn13ygn5s553s9nph0hg7iw5nikknap"; depends=[ggplot2 MASS shiny]; }; countgmifs = derive2 { name="countgmifs"; version="0.0.1"; sha256="19d8xr7ipqp16w46c3mrg15jfcvpj7n4pds8zw6mgw4g81bcxamf"; depends=[MASS]; }; @@ -5853,32 +5924,34 @@ in with self; { cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; }; cplexAPI = derive2 { name="cplexAPI"; version="1.3.3"; sha256="1li5sbakkq8hrgwsa4i1qa5bdjj6vm6s9sq23ccknbb8bxp4zmwv"; depends=[]; }; cplm = derive2 { name="cplm"; version="0.7-8"; sha256="0gvl3xwqbyqgqd42l97ryy8qsf23njqfgvc16w21124s77wsixaw"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; + cplots = derive2 { name="cplots"; version="0.4-0"; sha256="1k4kazw7lw2d991brnzhma6qvg8kwslrbi9q4gy61x02wcig927n"; depends=[circular]; }; cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; }; cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; }; - cprr = derive2 { name="cprr"; version="0.1.1"; sha256="0bnq3961bqf1y1f37x60qkwmq50vnvcpv4axq0yw5n1mrs20mllj"; depends=[]; }; + cprr = derive2 { name="cprr"; version="0.2.0"; sha256="049xnma0rdnya7zp05iraq15nwjgmdmli9g7xxprab822047vld7"; depends=[]; }; 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=[]; }; cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; - cquad = derive2 { name="cquad"; version="1.4"; sha256="1sxf30rikzr4mj1nyr12ys7gcnx5vq0rpd9djc2lkfbqlvi4mmai"; depends=[MASS plm]; }; + cquad = derive2 { name="cquad"; version="2.0"; sha256="0y2vwlbplp8b9xpv3byy3nah3xa3jwv57jaqqmjjwaw8m3q8ss9v"; depends=[MASS plm]; }; cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; }; cramer = derive2 { name="cramer"; version="0.9-3"; sha256="1kdad8nndhics4282gfy9ncllk2kpawdy8ybq71vcd7hc7kf0zq5"; depends=[boot]; }; - crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; }; + crank = derive2 { name="crank"; version="1.1-1"; sha256="0y2pdxj1mrba7qmnm0clwgl5k3mwnn0y57zzym2xi09dr583a5dd"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; }; cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; }; cranly = derive2 { name="cranly"; version="0.3"; sha256="1kv2281awvd4xc657wprbsy13smx6779msnczby7sw0x87y5k0x1"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr visNetwork]; }; crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; 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-1"; sha256="0h97vr9sy7hncjxv5v3y79pw2qqzpx6z6nqgx6k2ics1lf9misyb"; depends=[Formula ordinal sandwich scoringRules]; }; - credentials = derive2 { name="credentials"; version="1.0"; sha256="1r6da0j33adsmfnm992xbqda7bvxybc6kbcl6gaf05673k9jc8vb"; depends=[askpass curl jsonlite openssl sys]; }; + credentials = derive2 { name="credentials"; version="1.1"; sha256="0izwskymymkxdwsdj7zapqpkc6g37c0m6c2na0y00s1kwr73d2qd"; depends=[askpass curl jsonlite openssl sys]; }; credsubs = derive2 { name="credsubs"; version="1.0.1"; sha256="0n3684fxknvvs57g2vjqykgdjfbpl6242nd23sm9nv2fn57q8k2c"; depends=[]; }; credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; }; cregg = derive2 { name="cregg"; version="0.3.0"; sha256="08dhn4i5i27zw3ayqp7lkw5z8dzckv8fhflpvz0mphax34pm3z72"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; }; crfsuite = derive2 { name="crfsuite"; version="0.2"; sha256="10d7gahqqc6g6l99n6g5r49hlngdl3k9jz9j2c4x9hx1r8f8gql6"; depends=[data_table Rcpp]; }; cricketr = derive2 { name="cricketr"; version="0.0.17"; sha256="0jhb4d81jgmk38cyzz8nbfqy90272xxy3kj0xr22vnw845vhir80"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; }; crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; }; - crimedata = derive2 { name="crimedata"; version="0.1.0"; sha256="006wz4nvfq10dppkg8kqp2bmllcc7zpwdqkp3nqwm4qgw7pllyvz"; depends=[digest dplyr httr magrittr purrr readr stringr tibble]; }; + 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]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; crmPack = derive2 { name="crmPack"; version="0.2.9"; sha256="1w9xrfhhxkirxh36y8jym9v1wc2y0x7mfajl55635r0ll1j99cxi"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; @@ -5900,7 +5973,7 @@ 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.1.3"; sha256="0gvrki9ldm3yrnp6zx2awqg4p3pqjzv1088gn3nbg00j0i3s9m5h"; depends=[gtools VGAM]; }; crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; }; - crplyr = derive2 { name="crplyr"; version="0.2.0"; sha256="14j0cn3ci6vbmimcinzp25ym0h264405jn8gw7w0gk3rcamgh50s"; depends=[crunch dplyr lazyeval purrr rlang stringr tibble]; }; + crplyr = derive2 { name="crplyr"; version="0.3.0"; sha256="07az5b2snilagxm6fh0csldmyslkl0ydbbw8zn6d04h1aq7adzrm"; depends=[crunch dplyr ggplot2 lazyeval purrr rlang scales stringr tibble viridisLite]; }; crqa = derive2 { name="crqa"; version="1.0.9"; sha256="1k6jgkmgbjab78dynng1hlxdbnqrpwmiiw54rgyfhx6v3lcir75d"; depends=[fields Matrix plot3D pracma tseriesChaos]; }; crqanlp = derive2 { name="crqanlp"; version="0.3"; sha256="1ndd5k44w232x6k564r84lyahljgcnldfwgih3iiar3il94drbdg"; depends=[corpus crqa gutenbergr RCurl tm]; }; crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; @@ -5912,9 +5985,9 @@ in with self; { crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; }; 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="0.7.0"; sha256="1aphgqrpfqmwg8dvq226qxgw10m05xrrd9l738klml3zd88k5wly"; depends=[curl httpcode mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.25.0"; sha256="12r6iv080daqdh6anxwkj1hyclilnhi7v55k6cdskw0nlqwgzfji"; depends=[crayon curl httpcache httr jsonlite]; }; - crunchy = derive2 { name="crunchy"; version="0.2.0"; sha256="1q9mqpkg5ljb798922fmvjjp36kyjr1rrm6jf3s2fwjrhq186y3z"; depends=[crunch shiny]; }; + crul = derive2 { name="crul"; version="0.7.4"; sha256="05305jwwx65fbh8045ayhb1nz88rzbigq6ffc6v8kz73d9kdsqy9"; depends=[curl httpcode mime R6 urltools]; }; + crunch = derive2 { name="crunch"; version="1.26.0"; sha256="00i1x09jhzrrhk9qaj6xw2yifvp8msfmjj2varklbb4a09vlz1wn"; depends=[crayon curl httpcache httr jsonlite]; }; + crunchy = derive2 { name="crunchy"; version="0.3.0"; sha256="04n3wdpszsk097snxgis8fw91zycmxsdyiah81xj2l1c94n5qqca"; depends=[crunch httpcache miniUI rstudioapi shiny]; }; cruts = derive2 { name="cruts"; version="0.5"; sha256="08mklbmwgaq6cf3hd40mingplwjss5im30l5j6nmy7lijp15nq7k"; depends=[lubridate ncdf4 raster sp stringr]; }; crypto = derive2 { name="crypto"; version="1.1.1"; sha256="1kcldvl1rm363ah46hna6lcv8fkc48gp4d1vm24iig8fmi5rxa4x"; depends=[cli crayon curl dplyr httr jsonlite lubridate progress rstudioapi rvest tibble tidyr xml2 xts]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; @@ -5938,11 +6011,13 @@ in with self; { ctmle = derive2 { name="ctmle"; version="0.1.1"; sha256="1k9nr2xbaqrbpp31vdcnmpwyazcw79k0r3gbcbinva4pgv2psp29"; depends=[glmnet SuperLearner tmle]; }; ctmm = derive2 { name="ctmm"; version="0.5.5"; sha256="16nv0bvvcj27095d3adis1rai8prfls206vxbdqmrsg3vxsd55z3"; depends=[data_table expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal scales shape]; }; ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; }; + ctrdata = derive2 { name="ctrdata"; version="0.17.0"; sha256="09pxvy9ndifhc2cviw7z69shlka4jcs8qk3iydz9psxyrcna97s0"; depends=[clipr curl httr jsonlite mongolite rvest xml2]; }; ctrlGene = derive2 { name="ctrlGene"; version="1.0.0"; sha256="0gz2js2n990sfwxwigp4dxqcf94f9bzcinyzjign5yvyr53fakvk"; depends=[psych]; }; cts = derive2 { name="cts"; version="1.0-22"; sha256="0kcbppfsx1hvnsz6nmj8frrqrglcr6cmasd1ma34qkqb9f6q0xry"; depends=[]; }; ctsem = derive2 { name="ctsem"; version="2.8.2"; sha256="0d6j71q7rnajryx0qas4sgyfaq84sw75sq3gcc9wjdl20kipnqy6"; depends=[BH corrplot data_table DEoptim KernSmooth MASS Matrix mvtnorm OpenMx plyr Rcpp RcppEigen rstan rstantools shiny StanHeaders]; }; ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; }; cubature = derive2 { name="cubature"; version="2.0.3"; sha256="0wvs80i4axj7pdcy9gjl08qzjbcjkldha94xy4gdxc34vgmh7gvr"; depends=[Rcpp]; }; + cubeview = derive2 { name="cubeview"; version="0.1.0"; sha256="1gy023qnkxmkfmcrihjlwd504z7n3c4a8baxa2wkz0l45pf4y2c1"; depends=[base64enc htmltools htmlwidgets lattice raster 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]; }; cultevo = derive2 { name="cultevo"; version="1.0.2"; sha256="0rmncp4mrdpf3izhhqn9406i36j3d3d7i8cglip04lkfbypl9jvy"; depends=[combinat Hmisc pspearman stringi]; }; @@ -5960,14 +6035,14 @@ in with self; { customLayout = derive2 { name="customLayout"; version="0.3.0"; sha256="0zarqsdcjy8cymwrb6648nil509q9rhmp4633sidmmjclpyjca2q"; depends=[assertthat flextable gridExtra officer RColorBrewer rvg]; }; customizedTraining = derive2 { name="customizedTraining"; version="1.2"; sha256="0kjp22bzv7a3xynhm9xmabfcms21586p8caz1nk1w88qdvidqfqd"; depends=[FNN glmnet]; }; customsteps = derive2 { name="customsteps"; version="0.7.1.0"; sha256="1v6ks8j1mj623yai515xnrpx60hvilbrsn59r3zw30n68555cvw8"; depends=[dplyr generics magrittr purrr recipes rlang tibble tidyselect]; }; - cusum = derive2 { name="cusum"; version="0.1.0"; sha256="1vl2mpasbv87jwzikiik2vdnzy517gknskjpl2iacwfjl63gnzi1"; depends=[checkmate]; }; + cusum = derive2 { name="cusum"; version="0.2.1"; sha256="14zw0m3i4ii46yykzxj9mcqjg8radf8p3ixm36jx7z5biacf8kq5"; depends=[checkmate]; }; cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; - cutpointr = derive2 { name="cutpointr"; version="0.7.4"; sha256="0d9g0xrypfh382zpil16yh65bl3rlygj7vgzkqblwad8ladbd27s"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; }; + cutpointr = derive2 { name="cutpointr"; version="0.7.6"; sha256="0mwpl807h8mdzlw710jngwimwgq4hns79mv2pd5lh36pd9s5qx6b"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; }; cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; }; cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; }; cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; - cvar = derive2 { name="cvar"; version="0.3-0"; sha256="164k8b40w1npbq3r9i6n9m0hkia3wavsid88zyc63j56lxxk8zmm"; depends=[fGarch gbutils Rdpack]; }; - cvcrand = derive2 { name="cvcrand"; version="0.0.3"; sha256="00r97bi0ihq7b9wihqi83j0p8bfgnl01m6wi400jwnb098rqc0nj"; depends=[tableone]; }; + cvar = derive2 { name="cvar"; version="0.4-0"; sha256="1rfsmw2a639pkj8l5g2xm6z48jrxsywbysk7c0czpdvrh4h9h84f"; depends=[fGarch gbutils Rdpack]; }; + cvcrand = derive2 { name="cvcrand"; version="0.0.4"; sha256="1150vn753m95gpc1clyf4xzzgwmnzdh83prw8a3ikps0l6grvrps"; depends=[tableone]; }; cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; }; cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; @@ -5975,7 +6050,7 @@ in with self; { cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; 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.1.1"; sha256="0ihvgliwssf5jprb7f842vsck1d5x657c43pb6wi03y4wdz2r0s5"; depends=[]; }; + cxhull = derive2 { name="cxhull"; version="0.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; }; cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; }; 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]; }; @@ -5983,6 +6058,7 @@ in with self; { cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; }; 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.0.1"; sha256="1shnry1wd3618y92bzdv4wld826hjscryql9l8p1hy9wcvmpbjzh"; depends=[getPass openssl sodium]; }; cystiSim = derive2 { name="cystiSim"; version="0.1.0"; sha256="0pz8jxi4lgcwzrb4dh8xn63xhpaga5rzg5hwqicwv8isc16iqizd"; depends=[ggplot2 knitr magrittr]; }; cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; }; @@ -6026,9 +6102,9 @@ in with self; { dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="1.2.0"; sha256="0w2dslyzr35y6mjg46sq7cc3mar6v29md1i716hiix9kzy7b5782"; depends=[DT ggplot2 gridExtra haven htmltools magrittr pander robustbase stringi whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; - dataPreparation = derive2 { name="dataPreparation"; version="0.3.9"; sha256="1ap25xk0lvb94d79zz7dqc0y1f53fdxmhs2ij44qkjxzzd34ik30"; depends=[data_table lubridate Matrix progress stringr]; }; + dataPreparation = derive2 { name="dataPreparation"; version="0.4.0"; sha256="1zr6qx934vw6rxmx2bi6d9i1ykaxdc5x568djnhvjc7vz7dfcb6r"; depends=[data_table lubridate Matrix progress stringr]; }; dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; - dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.3"; sha256="0lrv6fyqi7k079wdpqilgjlb4j2qfs3r02d9ip8s9yznfwqsl826"; depends=[curl dplyr httr jsonlite lubridate readr reshape2 xml2]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.4"; sha256="01vmmjhxhgmfa3m9fc41j07d5rcspfz7qpc0zwrpi90xcqv5fhk7"; depends=[curl dplyr httr jsonlite lubridate readr reshape2 xml2]; }; datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; }; 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]; }; @@ -6055,7 +6131,7 @@ in with self; { dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; }; date = derive2 { name="date"; version="1.2-38"; sha256="1ziy17kz02j7lals14s43rs9lmxxfn2ppfi55q4b3m4gfj9pr4jc"; depends=[]; }; datetime = derive2 { name="datetime"; version="0.1.4"; sha256="0nn1yxknsn3crmwbkws5kvfjhd65dw0fkfbg67gba0dyaqp1jg37"; depends=[]; }; - datetimeutils = derive2 { name="datetimeutils"; version="0.2-12"; sha256="023jxsih2zlfv9yldn68cbrdl7jw5rpbz4cc9y0z530bb1fs8d1k"; depends=[]; }; + datetimeutils = derive2 { name="datetimeutils"; version="0.3-0"; sha256="1f63vzinj39pf85bw9xa4szkwmy4d4rxxnqm1jd396ywppgxzn7c"; depends=[]; }; datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; }; datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; }; dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; }; @@ -6069,7 +6145,7 @@ in with self; { dbhydroR = derive2 { name="dbhydroR"; version="0.2-7"; sha256="1yp3n8hw2dc1ar3nz5k5zvj7s8f1bjckxrd0jnbxv73il75gx4k0"; depends=[httr reshape2 XML]; }; 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.6-3"; sha256="0b3vbsb01rz46mspfk8v9dgwqkxnjkv5d6152zg1zsvyv0z9wvqd"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; }; + dbmss = derive2 { name="dbmss"; version="2.7-0"; sha256="0fhvbn5v4b5n447hwljdzwfb68bpmrskwd7ni1vpqwcbix903rm4"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils]; }; dbparser = derive2 { name="dbparser"; version="1.0.0"; sha256="060hmnwhindwlk7xjcz1nbr4lazd4v4918zs6q13ba9gp9ydi98c"; depends=[DBI dplyr ggplot2 odbc purrr tibble XML]; }; dbplot = derive2 { name="dbplot"; version="0.3.1"; sha256="1mx87cr08xliqz09qmrx8pcxxj2jm9aml5wp9p41ns210wc9mjdy"; depends=[dplyr ggplot2 purrr rlang]; }; dbplyr = derive2 { name="dbplyr"; version="1.3.0"; sha256="07p23vyvi7s4abldhkyir05kcf7xnfc18igfryq12j67xd0jql0m"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; }; @@ -6079,7 +6155,7 @@ in with self; { 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]; }; dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; }; - dclone = derive2 { name="dclone"; version="2.2-0"; sha256="05myb01ypnhf9wdk3i8s9xldn8ihvw7gf4ajqld886nvc306rfkv"; depends=[coda Matrix rjags]; }; + dclone = derive2 { name="dclone"; version="2.3-0"; sha256="0w1bhzsnmnhsrrw5ffm89pj2wy2fmx14y7g6b1mb2wlwbczjzzsh"; depends=[coda Matrix rjags rstan]; }; dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; }; 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]; }; @@ -6137,8 +6213,8 @@ in with self; { demogR = derive2 { name="demogR"; version="0.6.0"; sha256="06x82ffbdv6ifl8xh52d3npdwha67v1ylfjp78j5pa4wdqkg221b"; depends=[]; }; demography = derive2 { name="demography"; version="1.21"; sha256="1q5x9kqxdcp1ywi09786qgyz9gld6nk8m859vrm324idpd0n8dca"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; demu = derive2 { name="demu"; version="0.2.0"; sha256="0prfl2i3q2n5f4qpvkksyi8qvwj2fd9v82cr6val7abvcvbn9276"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; }; - dendextend = derive2 { name="dendextend"; version="1.9.0"; sha256="1jiani6zwfajky2vafvay2hq158nh99rdrk3j00lycspds9v35fd"; depends=[fpc ggplot2 magrittr viridis whisker]; }; - dendroTools = derive2 { name="dendroTools"; version="1.0.2"; sha256="156iylz62mps24d0lnxwal5nsl4qnysx7m0bb070b45v6x4cp9in"; depends=[brnn Cubist dplyr ggplot2 gridExtra knitr magrittr MLmetrics oce plotly randomForest reshape2 scales]; }; + dendextend = derive2 { name="dendextend"; version="1.10.0"; sha256="091jznl549d44w1h8kk1vwddzhijkyh0wpgkykd494fnc8rzpw48"; depends=[fpc ggplot2 magrittr viridis whisker]; }; + dendroTools = derive2 { name="dendroTools"; version="1.0.3"; sha256="1b1vc872600x4gbs2ma4a8cixh4x3pzqmp404mlh2jh5qa8fr8n4"; depends=[brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly randomForest reshape2 scales]; }; 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=[]; }; @@ -6164,7 +6240,7 @@ in with self; { describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; descriptr = derive2 { name="descriptr"; version="0.5.0"; sha256="0bbd3h07s4mfhryh6yyvgs4xs0nshxngyapz89jsc1drl3dn6plh"; depends=[cli dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales tibble tidyr vistributions xplorerr]; }; descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; }; - desctable = derive2 { name="desctable"; version="0.1.4"; sha256="06j15yln4cz2s6lhjdj8q58sd0y3v2fkpn502ny8iz8jy0j75x0h"; depends=[dplyr DT htmltools pander purrr]; }; + desctable = derive2 { name="desctable"; version="0.1.6"; sha256="1qmwfhsy8lvz7gi49gdka3jizdhrnrnk08ka36h46kf7b7lv0p1g"; depends=[dplyr DT htmltools pander purrr]; }; 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=[]; }; @@ -6172,14 +6248,14 @@ in with self; { designmatch = derive2 { name="designmatch"; version="0.3.1"; sha256="0px6iyqik4sfs25yybamvf3ay0vd6r75acj8hin76jl6l7fwk30f"; depends=[lattice MASS Rglpk slam]; }; 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.4"; sha256="0brmdp095zcwx7gncng1ls972kr67ldwiq081wyafn9jm9z461ix"; depends=[lattice reshape2]; }; + desplot = derive2 { name="desplot"; version="1.5"; sha256="0macg3ds79jl2v44arfhbb26i8yk19cz4jn04raml8758829caql"; depends=[ggplot2 lattice reshape2]; }; detect = derive2 { name="detect"; version="0.4-2"; sha256="03xzv13y2l15afyp00lgvbh51vxg1jaakxjcbnsxzdgb11039x2g"; depends=[Formula Matrix pbapply]; }; detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; }; detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; }; detpack = derive2 { name="detpack"; version="1.1.2"; sha256="0vrzg4h80jkkghgm86jfqxshfb4pwqv66d7sndkxh3ji9gfd7d84"; depends=[]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; detrendr = derive2 { name="detrendr"; version="0.6.0"; sha256="0dlkhyxdxzxlbnw3wa05rykfczmkm45ymfhz1qgad7vzikzd4472"; depends=[assertthat autothresholdr checkmate doParallel dplyr filesstrings foreach glue ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang sigmoid stringi stringr]; }; - detzrcr = derive2 { name="detzrcr"; version="0.2.4"; sha256="1n68vb0j5fy7nwa90lfkl0yr4iwyqjsjgqj6xs20nwmhpd3kjhyq"; depends=[ggplot2 MASS shiny]; }; + detzrcr = derive2 { name="detzrcr"; version="0.2.5"; sha256="0pv8m9p3j2n1myn2y7mfcv4j59cj4d84gl42fwmyha7hmi0fs8m0"; depends=[ggplot2 MASS shiny]; }; devEMF = derive2 { name="devEMF"; version="3.6-2"; sha256="0q9il3r69g7a9mmxwjvbrqc1w86ji02jq4p8nk07da9axfp8crcy"; depends=[]; }; devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; devRate = derive2 { name="devRate"; version="0.1.9"; sha256="1dy9hfhhlxj5sim69870dkwrarrl5pvmfvls8ys43h300my331gp"; depends=[]; }; @@ -6189,7 +6265,8 @@ in with self; { dextergui = derive2 { name="dextergui"; version="0.1.6"; sha256="1brkkq140z3dv0xflw0dinww2nja9c6iajqv0a0l0m13r1c5caja"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets igraph jsonlite networkD3 RColorBrewer RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; }; - dfcomb = derive2 { name="dfcomb"; version="2.6-0"; sha256="1cqxpw28vps0f1jwvwbkw9j1fxn8ng3a45qk17cxyd3z5pnfvp5g"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + dfConn = derive2 { name="dfConn"; version="0.1.1"; sha256="1cf1rr1v7qp5d624rp6jz6f2v806lmrsf8fabj8bnssvds3jzj52"; depends=[data_table doParallel fields foreach ggplot2 gplots gtools nlme Rcpp RcppArmadillo stringr]; }; + dfcomb = derive2 { name="dfcomb"; version="3.0-0"; sha256="1vsqlhmajv33nbnh8igisyv3rzzh2fdwbk5y0zlnrwvr79r19k5w"; depends=[BH Rcpp RcppProgress]; }; dfcrm = derive2 { name="dfcrm"; version="0.2-2.1"; sha256="01rn3zvi9xljmx48lkclckhnixian1vwq1frr8n784dsclp86spg"; depends=[]; }; dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; }; dfmeta = derive2 { name="dfmeta"; version="1.0.0"; sha256="0ca48adfhaxac33jmxbynlyg3ak9l5mmjhlr69n4hnz6325gn9vb"; depends=[data_table ggplot2 lme4 plyr]; }; @@ -6200,7 +6277,7 @@ in with self; { dfpk = derive2 { name="dfpk"; version="3.5.1"; sha256="010rlxj66ar3y61fnm7ys3p6aimlr8ylqq4q4flzr9m88klz8701"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; }; dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; }; dggridR = derive2 { name="dggridR"; version="2.0.3"; sha256="1gdwxrl5c5mprfk7rx5mk8davi4mmg1crccxaaipnbnsilg9j9vh"; depends=[dplyr ggplot2 Rcpp rgdal sp]; }; - dglars = derive2 { name="dglars"; version="2.1.0"; sha256="1miqrsb1k36mcfvwf4i94z7sn3qq6wkikwv3fiyzyd2q7ny9a068"; depends=[Matrix]; }; + dglars = derive2 { name="dglars"; version="2.1.1"; sha256="15dqiqvyary88l0cws9dgrddk0xchfmn66zz3ki06cfjph75nmnh"; depends=[Matrix]; }; dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; }; dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; }; dgo = derive2 { name="dgo"; version="0.2.15"; sha256="16z3vag1fwsnmynqh0zpwq5qp5ac3xf4787lwqy7asx8qgcc3wmw"; depends=[assertthat data_table dgodata ggplot2 lubridate R6 rstan survey]; }; @@ -6233,11 +6310,11 @@ in with self; { diffMeanVar = derive2 { name="diffMeanVar"; version="0.0.6"; sha256="0zivbd22hp0biy4vnjh21f4djfg5bl9az0wlhn47rk7fw65rgipb"; depends=[Biobase lawstat MASS methylumi missMethyl]; }; diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; }; diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; }; - diffdf = derive2 { name="diffdf"; version="1.0.2"; sha256="13jx8lx9y9h5lmm023z619l6j5d0q005s8khg6zb0hw3i81wri4x"; depends=[tibble]; }; + diffdf = derive2 { name="diffdf"; version="1.0.3"; sha256="0nz0jwa02yc16cx51z5hp5zaw40gbcyqli3jpxgrnzw76f8jhkah"; 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.1"; sha256="1zvjl2i38nyhk63bncqc5cva1m40sm692w7a36qc455s2jnskfh8"; depends=[JuliaCall stringr]; }; - diffobj = derive2 { name="diffobj"; version="0.2.1"; sha256="1bs00dglymwmilhbaik1pz3ivswd8kzi2my1gxq7k4lfkpamgsmx"; depends=[crayon]; }; + diffobj = derive2 { name="diffobj"; version="0.2.2"; sha256="1faf2f2bfckg1hl41k5zhji7jhz39zrrk6qk8pq1ldlavmgiszdq"; 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]; }; @@ -6262,10 +6339,11 @@ in with self; { dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; }; dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; discSurv = derive2 { name="discSurv"; version="1.3.4"; sha256="0xawvadgy5lkzhk60kb4ga1gh4niqpr9p6wxgrp88mbwp7q600kl"; depends=[functional mgcv mvtnorm]; }; + discfrail = derive2 { name="discfrail"; version="0.1"; sha256="1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j"; depends=[Matrix numDeriv survival]; }; discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; }; discharge = derive2 { name="discharge"; version="1.0.0"; sha256="1hwsdrbajmpfdc9arb1pjhx2w45dy3zrba9ibcrnpyqhhr4i1c5m"; depends=[boot checkmate CircStats ggplot2 lmom]; }; disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; - disclapmix = derive2 { name="disclapmix"; version="1.7.2"; sha256="05fwr03w62yd643hc1py5aw96wpl5v4mc4frk9hypyraj1y9amw5"; depends=[cluster disclap MASS Rcpp RcppProgress]; }; + disclapmix = derive2 { name="disclapmix"; version="1.7.3"; sha256="0hh20ff3szh9s9r1hdymk73ysn0v5lh2gfzgqpvfvdhcc5z8xjk7"; depends=[cluster disclap MASS Rcpp RcppProgress]; }; disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; }; discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; }; discoveR = derive2 { name="discoveR"; version="1.1.0"; sha256="00hqaq7gmlf7dpdw6i3f50jvp8m8095ld15lb0zy3zl7b80mr278"; depends=[colourpicker DT factoextra ggplot2 rmarkdown rstudioapi shiny shinyAce shinydashboard shinydashboardPlus shinyjs stringi zip]; }; @@ -6277,7 +6355,7 @@ in with self; { diseasemapping = derive2 { name="diseasemapping"; version="1.4.6"; sha256="16y2w8qjq442qdbqlrg3s2mn53rlcipl22m3q168gda5klm4f7sl"; depends=[sp]; }; 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.2"; sha256="1dihcb5smsjl57562vnm9w63izbzl22vr0ky5far66cxz0y6di2k"; depends=[ade4 ape geiger geometry geoscale mnormt paleotree phangorn phyclust vegan]; }; + dispRity = derive2 { name="dispRity"; version="1.2.3"; sha256="1218sfm7spl7lqdjfn35wg69bcxwdfypwv4hqff22shkyvvm6lh7"; depends=[ade4 ape Claddis geiger geometry geoscale mnormt paleotree phangorn phyclust 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=[]; }; @@ -6285,24 +6363,24 @@ in with self; { dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; dissever = derive2 { name="dissever"; version="0.2-3"; sha256="1lgs5nmv3lpm4gsryxvcwiwibvvg9flv23q8maisp77x49c18qcp"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; }; distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; }; - distances = derive2 { name="distances"; version="0.1.6"; sha256="1n21klp81bcixfr54051qizmw597wk6bq45yb59s5fkz0s1rf0xg"; depends=[]; }; + distances = derive2 { name="distances"; version="0.1.7"; sha256="1xhv7mf5753d6jnbrmmy6k670li5h2gd8c789mm5w9hxb40rwald"; depends=[]; }; distcomp = derive2 { name="distcomp"; version="1.0-1"; sha256="0f69bxw52ai39dmkmfvrs0lbibcgmv6n849xa9xgd2jm5mvbc58f"; depends=[digest httr jsonlite R6 shiny stringr survival]; }; distcrete = derive2 { name="distcrete"; version="1.0.3"; sha256="0sa6z2mpmk51ig1r7bmpbyv2jd8z6z7mixki2vlq1kybg8cx3wmi"; depends=[]; }; 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=[]; }; - distillery = derive2 { name="distillery"; version="1.0-4"; sha256="1m0pgmlvk7bsb6q3kxagnq422babk61sf73naavac68v8x2q8fix"; depends=[]; }; + distillery = derive2 { name="distillery"; version="1.0-6"; sha256="1mi3ig9jq0kd7yrwc5m37lmrw04p1b4lirnbsxi10z3n5yay4429"; 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.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; }; - distr = derive2 { name="distr"; version="2.7.0"; sha256="0z822y1mj8h368k1iclnaviz6m6wgnl97jwgisb8qah98f4dbmwh"; depends=[MASS sfsmisc startupmsg]; }; - distrDoc = derive2 { name="distrDoc"; version="2.7.1"; sha256="0zbj550lflq0i7i900cb3ybrcik40ahsjz24yf5jnxvx397glsfx"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; - distrEllipse = derive2 { name="distrEllipse"; version="2.7.0"; sha256="0k6jicf8411jzyv9hi63qng9mq6bbil2qgwy7lijgvy2dr4d0niw"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; - distrEx = derive2 { name="distrEx"; version="2.7.0"; sha256="0mhf79fxwvy8x261ckfz93z05f2dn8p70hpdzn47xyh7z8dg38gd"; depends=[distr startupmsg]; }; - distrMod = derive2 { name="distrMod"; version="2.7.0"; sha256="14c2djk3faw4z1b4fgwpk35qfyvix7b5jcaglc9g6rx43f8h81hp"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; }; - distrRmetrics = derive2 { name="distrRmetrics"; version="2.7.0"; sha256="01z3vm5qfnrp5qd518f7h7dynjjg3am0hrk7zqv8kjzxgsisgnq9"; depends=[distr fBasics fGarch startupmsg]; }; - distrSim = derive2 { name="distrSim"; version="2.7.0"; sha256="1fihq54kng7icqs6z27rdrykql00c33f0d8cznbizjsz6ipm94d6"; depends=[distr setRNG startupmsg]; }; - distrTEst = derive2 { name="distrTEst"; version="2.7.0"; sha256="19w92php04fp3c4ip7zz2zs210h4dp9nj3g3ddq26hlh7ng9kk85"; depends=[distrSim setRNG startupmsg]; }; - distrTeach = derive2 { name="distrTeach"; version="2.6.1"; sha256="0x60xlij1m9q7xhi9vnf61vb2px9aah8iqaki6d87c1pxylmqnvr"; depends=[distr distrEx startupmsg]; }; + distr = derive2 { name="distr"; version="2.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; }; + 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]; }; + distrMod = derive2 { name="distrMod"; version="2.8.0"; sha256="0dzqy529raak8gwxxf8r3rj19s8ibw1liycl0w47drrpk3xbkjyq"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; }; + distrRmetrics = derive2 { name="distrRmetrics"; version="2.8.0"; sha256="17kbl8b4q8w7il1f02yqr11filhbd5axjwwna20gvjim501jizwi"; depends=[distr fBasics fGarch startupmsg]; }; + distrSim = derive2 { name="distrSim"; version="2.8.0"; sha256="0g16mljlz7fnb5k6c9h5vplm3n51sdbybv9cifbia0y6p9zml383"; depends=[distr setRNG startupmsg]; }; + 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.1.0"; sha256="1zm6zfppvfs6w3l849l2fmj6z4g7p67p0fg6iw7h8j03wxpfglkq"; depends=[bamlss formatR gamlss gamlss_dist ggplot2 magrittr mvtnorm RColorBrewer rhandsontable shiny viridis]; }; distrom = derive2 { name="distrom"; version="1.0"; sha256="0wylw7yaylf5j8cy8g45jrw91mwx6w0i7vf9ysnj5kxyznq1gl6y"; depends=[gamlr Matrix]; }; distrr = derive2 { name="distrr"; version="0.0.5"; sha256="06zmknpdldh4yy3gd1ki6p856pwllb605z1142j4kqxj2ni3lkq7"; depends=[dplyr magrittr rlang tidyr]; }; @@ -6312,7 +6390,7 @@ in with self; { diveMove = derive2 { name="diveMove"; version="1.4.5"; sha256="0lik5r5y7q5r7gh9d9y9r2m8vvibn13dp9p50j0hpzk67wgw3vya"; depends=[geosphere KernSmooth quantreg uniReg]; }; diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; }; diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; }; - diversitree = derive2 { name="diversitree"; version="0.9-10"; sha256="0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7"; depends=[ape deSolve Rcpp subplex]; }; + diversitree = derive2 { name="diversitree"; version="0.9-11"; sha256="1jqfjmmaigq581l4zxysmkhld0xv6izlbr1hihf9zplkix36majc"; depends=[ape deSolve Rcpp subplex]; }; divest = derive2 { name="divest"; version="0.7.2"; sha256="1zzc7nik78g8ca4zbkx5618npf1kg362km4lpvc7ympi8ysf81zg"; depends=[Rcpp RNifti]; }; divo = derive2 { name="divo"; version="1.0.0"; sha256="0xy4yxvx2grskdzb5z73mhgrq0nfhdkm2hxahdns7pb1fgajxyjx"; depends=[cluster]; }; dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; }; @@ -6322,8 +6400,8 @@ in with self; { dlib = derive2 { name="dlib"; version="1.0.3"; sha256="1is8j1gwf22n7yixg40rb6p4mrnbzijwfjl6vsniq8qkyy7z8k32"; 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.3.8"; sha256="0666jfbx3yhxwknfc4lwn7ys7iyc5vdjvv694sn4gqv1k87p568r"; depends=[mgcv nlme tsModel]; }; - dlookr = derive2 { name="dlookr"; version="0.3.8"; sha256="0l1p0s8lhpkvw3gpq5k2hsi7sl31yc1gv6nllsvay1bqqm09dw78"; 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]; }; + dlnm = derive2 { name="dlnm"; version="2.3.9"; sha256="0vbrp9x7n94wjrigw124i3i7szy0bsh4sdggi8nsizn2ccsv5pnq"; depends=[mgcv nlme tsModel]; }; + dlookr = derive2 { name="dlookr"; version="0.3.9"; sha256="12c7lq8vswmmgjplk9j9qmhxi54yn0xh3q01qn2kp896hg0sp61q"; 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]; }; dlsem = derive2 { name="dlsem"; version="2.4.1"; sha256="0baklvzcyp7byxq1l003i25ciysiscsyrb7w5jqyhg8zzy2j452h"; depends=[graph Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.1.0"; sha256="0s92rdpw3m534wgjaic4srsp9i1pa3ibfmr4h7p3ly51zhza6l5h"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; }; @@ -6337,7 +6415,7 @@ in with self; { 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]; }; doBy = derive2 { name="doBy"; version="4.6-2"; sha256="02vbv9nfgywg6lsiialkmfnax5z3rkyb9nr8j9l2cp8xi6ml95mb"; depends=[dplyr magrittr MASS Matrix plyr]; }; - doFuture = derive2 { name="doFuture"; version="0.7.0"; sha256="1q7x1fl8yji5xyy55476l61jah17lh08j87fb6xba87xja2lq3r0"; depends=[foreach future globals iterators]; }; + doFuture = derive2 { name="doFuture"; version="0.8.0"; sha256="17xxykxcn7z11xd401a3z93vj6z08469x9lpib4vjhlskdfjcwsh"; depends=[foreach future globals iterators]; }; doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; doParallel = derive2 { name="doParallel"; version="1.0.14"; sha256="01qjs4iw9f1kgymcypj0m2s4pvgqhxaycpli0fb8lq3dc0vpzfyb"; depends=[foreach iterators]; }; @@ -6345,8 +6423,7 @@ in with self; { doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; }; doSNOW = derive2 { name="doSNOW"; version="1.0.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; }; dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; }; - docker = derive2 { name="docker"; version="0.0.2"; sha256="00zq4zmv2y6q069q92dn8db2bj96kfy7pv2s58q21dxkp1c4s6qg"; depends=[reticulate]; }; - dockerfiler = derive2 { name="dockerfiler"; version="0.1.1"; sha256="17r8az17vkj46cljp0pa15xh9x2p5w85csm2hickfk2lyg2pbjnx"; depends=[attempt glue R6]; }; + dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; }; docopt = derive2 { name="docopt"; version="0.6.1"; sha256="06zknnd0c5s2y0hbddzdlr3m63ib783izpck6pgz7sjbab5pd068"; depends=[]; }; docopulae = derive2 { name="docopulae"; version="0.4.0"; sha256="186mfiy4ygx6spnv7yrm5h0k6nf2g1xhk1l05iij39j5al5d9j21"; depends=[]; }; docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; }; @@ -6356,15 +6433,16 @@ in with self; { documenter = derive2 { name="documenter"; version="0.1.1"; sha256="0y6zrvmb9bhc1ni4v89h9pq5ara8p2v4b35ylasia5s9x1y93mcp"; depends=[htmltools magrittr officer xml2 yaml]; }; docxtools = derive2 { name="docxtools"; version="0.2.1"; sha256="09fcamrr3yw1zrj4bx8ra9yidprk1h44p48by85zjqwd1ly4gqbf"; depends=[dplyr ggplot2 lubridate purrr rlang stringr tidyr]; }; docxtractr = derive2 { name="docxtractr"; version="0.6.1"; sha256="03bcaiwxxybbdxh26rp4bl66aiv4hxmgn21w6dxm383xha03iqfw"; depends=[dplyr httr magrittr purrr xml2]; }; - dodgr = derive2 { name="dodgr"; version="0.1.2"; sha256="1jg50614pjmkw090kbr9xdcbyf2p7rmgv6nwvv94b8x4nk9cv1yr"; depends=[igraph magrittr osmdata rbenchmark Rcpp RcppParallel sp]; }; + dodgr = derive2 { name="dodgr"; version="0.1.3"; sha256="0ca7hqnjaj6zq9abzjbp3m3n5vcypgv855w6a0j6zh07y2wxskxb"; depends=[digest igraph magrittr osmdata rbenchmark Rcpp RcppParallel sp]; }; doex = derive2 { name="doex"; version="1.0.0"; sha256="1d70pb0wxc47z401ya2awjpx0rgipicxgbvkhwinx2mg0jpa8kki"; depends=[]; }; dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.0.0"; sha256="1870qg17jiq1g2693d912y5jxp2b2692hfdg2qbqa0h2w0lf0lx1"; depends=[]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; - doremi = derive2 { name="doremi"; version="0.1.0"; sha256="0qqg0kl806gsidcigwggpx1g5p691b4300dfipiv4cfxp0pl5r1k"; depends=[data_table ggplot2 lme4 lmerTest zoo]; }; + doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; }; dosearch = derive2 { name="dosearch"; version="1.0.2"; sha256="090k7fbla5xsczbbz7qglnbnngi1gdhjis4yy6bccw9v9s4mfg9s"; depends=[Rcpp]; }; 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=[]; }; 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=[]; }; @@ -6380,19 +6458,20 @@ in with self; { dplR = derive2 { name="dplR"; version="1.6.9"; sha256="0pb2f0f09qwi6az7c0pp28jhv5cgdfy4wqwfsqgkq5nlzlbkbnri"; depends=[animation 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="0.8.0.1"; sha256="0p6dbjrgqyklc67g53v1a5xdp9x2jpcsdcs6v3djf9d366fqh244"; depends=[assertthat BH glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; }; + dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.1"; sha256="1p16l1ak48r96blkd514bqiry7bcqbjpxzg8qq1xs207rhmk3fd5"; depends=[bit64 DBI dbplyr dplyr odbc rstudioapi]; }; dplyrAssist = derive2 { name="dplyrAssist"; version="0.1.0"; sha256="1lqizh70b1apyr4578917gv6s0i7p84ak96a57kvwipmh36a4ywn"; depends=[DT magrittr miniUI plyr rstudioapi shiny shinyAce shinyWidgets stringr tidyr tidyverse]; }; dpmixsim = derive2 { name="dpmixsim"; version="0.0-9"; sha256="064i122j8vkpjxzfrhp25kb6nv5j3a7s8qk0202x7vnvj9caqjvx"; depends=[cluster oro_nifti]; }; dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; }; dprint = derive2 { name="dprint"; version="0.0.4"; sha256="13bq6yjlp5p5rcsz684rqcigp42xnz3p5phnqmrhzm874gfzm8rj"; depends=[]; }; - dqrng = derive2 { name="dqrng"; version="0.1.0"; sha256="0yws0rgw559zz586jhlmnq5rfd7zcm17bvnxp40vs93dfpnjjm6p"; depends=[BH Rcpp sitmo]; }; + dqrng = derive2 { name="dqrng"; version="0.1.1"; sha256="0w5r71nrqfjpqp4xqhv30jjnwa6qmkzbrixhip1i4kr9w5h7hkdr"; depends=[BH Rcpp sitmo]; }; dqshiny = derive2 { name="dqshiny"; version="0.0.3"; sha256="1fra6fbv8if7wwr8vi3261rdzv4kj99y841lb9xiv1mh72r3mx58"; depends=[htmltools shiny]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; dr4pl = derive2 { name="dr4pl"; version="1.1.8"; sha256="13ic6lmk2cdh6pvjfpkcnv41mgr27amay2g501ag5ppl4b95lc2q"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; }; drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; }; dragonking = derive2 { name="dragonking"; version="0.1.0"; sha256="01b01wd1s2b8sa9f0kfbf2pbzhaqra7xxskigqh3vlj389xqm1id"; depends=[]; }; dragulaR = derive2 { name="dragulaR"; version="0.3.1"; sha256="1cw5v7m1b4pxsizsjb3zdzhydxj577p6q5fcjklsvpzmiixzlyav"; depends=[htmlwidgets shiny shinyjs]; }; - drake = derive2 { name="drake"; version="6.2.1"; sha256="1g6dhcrls5zyxlqp3155k9cjh25zbnq02fv654z48pid6bbsni7n"; depends=[codetools digest formatR igraph pkgconfig rlang storr tibble]; }; - drat = derive2 { name="drat"; version="0.1.4"; sha256="0vrpqf793vinx4v7jrbn910iplvpmrlwhdjqqzx8cl2k9hl43x08"; depends=[]; }; + drake = derive2 { name="drake"; version="7.0.0"; sha256="0864s1qyvypg7ig4ni1zd0qq8ha3jlzm129nl8a37cf19ry7gw37"; depends=[base64url digest igraph rlang storr]; }; + drat = derive2 { name="drat"; version="0.1.5"; sha256="0i80c4hyclwnq8g8amvdid9pwr11mwbscwydaxmvbrbhv3qzjg6d"; depends=[]; }; draw = derive2 { name="draw"; version="1.0.0"; sha256="0kbz8rcgygl4fhmljzaan5jl7wjvfljcaykm7q9lw9s6m78p06gz"; depends=[]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; }; @@ -6405,7 +6484,7 @@ in with self; { drtmle = derive2 { name="drtmle"; version="1.0.4"; sha256="0k8cps3kpfrlv33a0czjp327qzdj69lwbpv4k5q7qjcv0878yypg"; depends=[doFuture future future_apply future_batchtools np plyr SuperLearner]; }; drugCombo = derive2 { name="drugCombo"; version="1.0.3"; sha256="03hlv6alhjd84liixb7nqcfgyhcr59bjni049h71jpicqzci2qk9"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; }; ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; }; - dsa = derive2 { name="dsa"; version="0.61.7"; sha256="0d4i9r6arbks6gynxd90ccnk2bc9x2xl20khc8f4in79mhd3lkm1"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; }; + dsa = derive2 { name="dsa"; version="0.70.3"; sha256="0ilfrrfdvw86p6q5jskh0fqnqrcz75j2ldzhvwfpbdr9bh65jfai"; 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]; }; dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; }; dslabs = derive2 { name="dslabs"; version="0.5.2"; sha256="1igzn6g9sgbmvqbqq588573618ii9ki3gda9b2hi9r8ljpgys8h6"; depends=[ggplot2]; }; @@ -6434,7 +6513,8 @@ in with self; { dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvmisc = derive2 { name="dvmisc"; version="1.1.3"; sha256="0x391pxg5mqgp5xxc8qwhwxky8ds7d9gr9iwmsb12c92kxfk00bv"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma purrr rbenchmark Rcpp survey]; }; dwapi = derive2 { name="dwapi"; version="0.1.3.1"; sha256="1sz4n8vn7cmlilxzhkm4rdfca0904cbh28n5383p9pr46bdi69q5"; depends=[httr jsonlite readr rjson xml2]; }; - dyads = derive2 { name="dyads"; version="1.1"; sha256="0jlyg4bz3zp4g5ig0swwi72bxaj85wll05h6vishnvmnprpdc96n"; depends=[MASS mvnfast]; }; + dyads = derive2 { name="dyads"; version="1.1.2"; sha256="014gphxkn0wkdq5zgd71vv9dmzyswgpari59w5mf2070c0rr56n5"; depends=[MASS mvtnorm]; }; + 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]; }; @@ -6445,7 +6525,7 @@ in with self; { dynamac = derive2 { name="dynamac"; version="0.1.7"; sha256="15x6rdzmqdd6v4rm60pi7ji4ldf3hlmdv7b49vmp7z73b209554l"; 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.3"; sha256="0flbvsgh5vqfs4lbhn5arjyhz7lah2hclax59pjp9za2gl73vnsn"; depends=[boot Rcpp RcppArmadillo survival]; }; + dynamichazard = derive2 { name="dynamichazard"; version="0.6.5"; sha256="1f12c89p5b6yfhha5gzacf82bjgmvri5xnhhpwcqrxa3mli4d1hb"; depends=[boot nloptr Rcpp RcppArmadillo survival]; }; dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; }; 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]; }; @@ -6454,14 +6534,15 @@ in with self; { dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; dynlm = derive2 { name="dynlm"; version="0.3-6"; sha256="1g8qsb5m69yn35sm0shd97vbnbpqfkjkd7lbkwch1gpfxkld53zq"; depends=[car lmtest zoo]; }; dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; }; + dynparam = derive2 { name="dynparam"; version="1.0.0"; sha256="0rzkksb0j7vybz4mk9c4sm3zcxdjll1bqx54cbal8a0iq259rigp"; depends=[assertthat carrier dplyr dynutils Hmisc magrittr purrr stringr testthat tibble tidyr]; }; dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; }; dynprog = derive2 { name="dynprog"; version="0.1.0"; sha256="1rvn2zyhdi60y01zbvfv4him6iz2ljdr7ivkr7m7y7yd1lg547ax"; depends=[rlang]; }; - dynr = derive2 { name="dynr"; version="0.1.13-4"; sha256="11qs6zj73y8x1pvlnq09f1sapdg9b933a45il0p8w23zj1232205"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; }; + dynr = derive2 { name="dynr"; version="0.1.14-9"; sha256="0cxi295kl4kj6h43wclaqmdk0q92l7fgn08kak9gx0vy2f78wjas"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; }; dynsbm = derive2 { name="dynsbm"; version="0.6"; sha256="0sdy42ihymhzx577jc2qr7lwirc9lviz3sagfy09zhbwizz5a4kw"; 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-6"; sha256="12bfv6bykgsyxryydhjs89yvk7akam5gy89mzn1hv4ilrpc5mlmw"; depends=[BH ggplot2 nleqslv plyr reshape survival]; }; - dynutils = derive2 { name="dynutils"; version="1.0.1"; sha256="1kg6rpvkz90652w3kwaxyddlkjcyv8pr2qcaba0780zybnqskvl9"; depends=[assertthat crayon desc devtools dplyr glue magrittr purrr Rcpp stringr testthat tibble tidyr]; }; - e1071 = derive2 { name="e1071"; version="1.7-0.1"; sha256="11fqm4shmksalkazcwvzfknp3amigw7fr8wdwanqa5v5kx7ihyq9"; depends=[class]; }; + dynutils = derive2 { name="dynutils"; version="1.0.2"; sha256="0sjbc56nqah07v6p5bi7m805r2nyx402c4fq457520ligjvv0z6b"; depends=[assertthat crayon desc devtools dplyr glue magrittr purrr Rcpp stringr testthat tibble tidyr]; }; + e1071 = derive2 { name="e1071"; version="1.7-1"; sha256="1zlxz3da216q6v6r4ff60il121xwz7g7m639vzdwglhw3jjh8psw"; depends=[class]; }; eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; }; 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]; }; @@ -6474,17 +6555,18 @@ in with self; { earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; 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="4.7.0"; sha256="046n5p3mbz09m5l41h7sc80203p9vpkjyx8z36v82ya2s8bkfv44"; depends=[plotmo TeachingDemos]; }; + earth = derive2 { name="earth"; version="5.1.0"; sha256="1mrr26ssynyw9nikzgiynqf5k9clrhy8hnprdgsqqa8jrx8nzi56"; depends=[Formula plotmo TeachingDemos]; }; + earthtide = derive2 { name="earthtide"; version="0.0.5"; sha256="02lhc95m1lw1xn3j47k00883r5zkhkj7a4ilhph88dn0nh91ls7g"; 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.28"; sha256="1qw5kw8qx210f7n7395cs2bh7jl204wr69f99qs6x9ssg8n4g68q"; depends=[ca vegan]; }; + easyCODA = derive2 { name="easyCODA"; version="0.31.1"; sha256="1g3k8a06zsif5a7xma4dz5zcdbxyc6i58jf5rnnyypxhj6xm5abc"; depends=[ca ellipse vegan]; }; easyDes = derive2 { name="easyDes"; version="5.0"; sha256="1msybgv4b7xlvp93lk64mdrqprr5qqc9ma1bz7glchhlkyyl8c21"; depends=[multcomp PMCMRplus]; }; easyNCDF = derive2 { name="easyNCDF"; version="0.0.4"; sha256="1hd7b6pdm5j41a4v0jxhbqdy2bz5gj86fsfwj0l7gg7h32d6hkhq"; depends=[abind ncdf4]; }; - easyPubMed = derive2 { name="easyPubMed"; version="2.12"; sha256="139sv60v3fpv5vszvz0072f0kgj0kkgdrv3iwy85yn5p5lk1xs32"; depends=[]; }; + easyPubMed = derive2 { name="easyPubMed"; version="2.13"; sha256="1wd8idyqz7kgygp34mjp2abx82775ry8l07vsqdlqnc6fdnvg55d"; depends=[]; }; easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; }; easySdcTable = derive2 { name="easySdcTable"; version="0.3.3"; sha256="0hhi1nwc84b0mjs2sw2qmvj3cmfkk9kr3rni9fkyyds1dhwgrvvh"; depends=[sdcTable shiny SSBtools]; }; easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; }; - easyalluvial = derive2 { name="easyalluvial"; version="0.1.8"; sha256="12ham1dg571mfvqwz6i7kqz7s0h2zg0dm409bpk5lf1lqv37z012"; depends=[dplyr forcats ggalluvial ggplot2 magrittr purrr RColorBrewer recipes rlang stringr tibble tidyr]; }; + easyalluvial = derive2 { name="easyalluvial"; version="0.2.0"; sha256="1bbygr512zzlyjzmf5lh9bks2f10k1mja5scrrrgf0ls3gnyw8ln"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; }; easyanova = derive2 { name="easyanova"; version="6.0"; sha256="16cypapzrsf70wrpd0rq00kks96rx3kiqnxswd410l6ss2gnni7h"; depends=[car emmeans lme4 lmerTest]; }; easycsv = derive2 { name="easycsv"; version="1.0.8"; sha256="1i2k5372b6a5pypk6m0rsvvkcy0y51pvh57a60rpgqk8q0yq8pig"; depends=[data_table]; }; easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; }; @@ -6493,10 +6575,11 @@ in with self; { easyreg = derive2 { name="easyreg"; version="2.0"; sha256="0qxcrgcc306g4i2wnph94wa7sj06mqxi96cvbpnk9mi46ps0l1kw"; depends=[car nlme]; }; 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.8-0"; sha256="0241l0vf1791vxkahxlf9d2bd1073hyl0nfmccafzaa0k76z369w"; depends=[nlme]; }; + eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; 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]; }; ebimetagenomics = derive2 { name="ebimetagenomics"; version="0.6"; sha256="0jaz7l71pnf3i2q83mx0pjqli9sn30a4b9vshcmp70v3h6xdj9wx"; depends=[breakaway sads vegan]; }; + ebirdst = derive2 { name="ebirdst"; version="0.1.0"; sha256="1bj4jb2cg08z58p9ih9c9f3jfy8xxm4rz99hdm29282dy37xn7dz"; depends=[car data_table dplyr fasterize gbm ggplot2 gridExtra mgcv PresenceAbsence rappdirs raster rgdal scales sf stringr tidyr viridisLite xml2]; }; ebmc = derive2 { name="ebmc"; version="1.0.0"; sha256="0v9hkzy8ljddmi6wdjd1jga4ib566ikr1vgrvxba67ka524r6bbp"; depends=[C50 DMwR e1071 pROC randomForest rpart]; }; ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; }; 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]; }; @@ -6523,10 +6606,10 @@ in with self; { ecosim = derive2 { name="ecosim"; version="1.3-1"; sha256="0gpgjswqmibnz9lpcidvw3y1wmd38l4lyha4fbs0agiz6yyfiyjn"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; }; ecospat = derive2 { name="ecospat"; version="3.0"; sha256="1c9cbxs022f2bjnvgdfxhmqkzr30svna596r1fn5i7zsqd7dm0w6"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; }; - ecotox = derive2 { name="ecotox"; version="1.3.3"; sha256="0hd99s77x4k5q54p4xi2b68jninw7ss6s2za5rizw9w2cpngxxf4"; depends=[ggplot2 tibble]; }; + ecotox = derive2 { name="ecotox"; version="1.4.0"; sha256="1x048njvlq7mp0fpx2nal8znhnkw5cnq2z0rmvknm2m66lfhds7a"; depends=[ggplot2 tibble]; }; ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; }; - ecoval = derive2 { name="ecoval"; version="1.2.1"; sha256="0dm2vqk5hgs4dh9ms10srjjblk09sidn7m06r714h1vswcd7bphs"; depends=[jpeg rivernet utility]; }; - ecp = derive2 { name="ecp"; version="3.1.0"; sha256="0siq5acpy4wmqzm6zvpqj1m8a05hgk5jhb1clv06y40kqk5kjrap"; depends=[Rcpp]; }; + ecoval = derive2 { name="ecoval"; version="1.2.3"; sha256="1din9133jpkkxyp14kz2k3gkphlqcgmj13vfxfqh0chlncdnj092"; depends=[jpeg rivernet utility]; }; + ecp = derive2 { name="ecp"; version="3.1.1"; sha256="0s0286ky1imhhs89bp1ylx8wvii55v7wzg1g49l03az64971kayj"; 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.1.2"; sha256="0dy6n2gaz6qgfj2gvavlgl4ic15wq1lb9ykynihi77nyxnz67i46"; depends=[dplyr psych]; }; ed50 = derive2 { name="ed50"; version="0.1.0"; sha256="1j3n79slf5s9g4cwz0dj6gc63bcvmfgg787d88csh9l91k8kpbbw"; depends=[boot]; }; @@ -6538,9 +6621,9 @@ in with self; { edeaR = derive2 { name="edeaR"; version="0.8.2"; sha256="1ypicc3vvyal9cswv0jv79p1k6bfgiknh9sgik9187jrsbfcwb99"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; }; edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; }; edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; }; - edfReader = derive2 { name="edfReader"; version="1.2.0"; sha256="0r4918swpfddz246kkvy10a07s178zmwp7m4ydxvi8di6iga76hk"; 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="1.0.9"; sha256="1jh0aaizirj4i4kc6gq9kkpa1xdqxbjhj7fys8ap1xxxx6nfpcnf"; depends=[ggplot2 R_utils RColorBrewer tm wordcloud XML]; }; + edgar = derive2 { name="edgar"; version="2.0.1"; sha256="132wyaf5w1vbvghr079icrra71hk5p8plrk4wx8anag54b5m0q4r"; depends=[qdapRegex R_utils stringi stringr tm XML]; }; edgarWebR = derive2 { name="edgarWebR"; version="1.0.0"; sha256="0rnf3s5d5sclvd4y195mfkrazg4qvpyyrgl6jcqikygbcz8hg3j8"; 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]; }; @@ -6551,12 +6634,13 @@ in with self; { edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.2"; sha256="105jv2sz10xbl881lkhgmxzgmb8629mqsminhd197khrkf9nv40i"; depends=[lasso2 MASS mvtnorm rgl]; }; edstan = derive2 { name="edstan"; version="1.0.6"; sha256="1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5"; depends=[ggplot2 rstan]; }; educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; }; + eechidna = derive2 { name="eechidna"; version="1.3.0"; sha256="1hh6qmdsq700q16g7fjvk6gq8z3kd4562ch5pvlb0zqgjx52jskf"; depends=[colourpicker dplyr ggplot2 ggthemes magrittr plotly purrr rgdal rgeos shiny sp stringi tidyr]; }; eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.6"; sha256="07wpz8zlgkbzkhmv569w7rnz3i830391arrh17sg2gc4fx9h1559"; depends=[geoR lme4 metafor mvtnorm]; }; 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="0.1.5"; sha256="13c5k2si8aq2461iz9413hlqzgkb25zrdfvizzk8s2nn60npyaw9"; depends=[dplyr pracma R_matlab readr rlist stringr viridis]; }; - eeptools = derive2 { name="eeptools"; version="1.2.1"; sha256="0idrwh6khz1sbslx35kmm6f79njam0xl48r3aiy70p2l569rj89h"; depends=[arm data_table ggplot2 maptools vcd]; }; + eeptools = derive2 { name="eeptools"; version="1.2.2"; sha256="1sc9km926pnl6dhk7ir2zx4693bki10zrq09v07k177wq7xlphw9"; depends=[arm data_table ggplot2 maptools vcd]; }; eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; }; effectFusion = derive2 { name="effectFusion"; version="1.1.1"; sha256="1z3m1wadl5qs37mbj335xghinji9qx9njrd9ckvz63xh1sgpz89i"; 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]; }; @@ -6575,7 +6659,7 @@ in with self; { eha = derive2 { name="eha"; version="2.6.0"; sha256="0nw72jcwcx2rzlzsrmdvg7pymyzf5icynidlr1m9b70v6rnqr84b"; depends=[survival]; }; 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="2.1"; sha256="0kv4k1zk1gz3fapy2i2ydy0n38hy95i10r3hr3dx8mkkf3nsj46h"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; }; - eiPack = derive2 { name="eiPack"; version="0.1-8"; sha256="18mil21gv83p2s16j084b3w45pp9zj4fnw03i02f7jdqqrcpygcr"; depends=[coda MASS msm]; }; + eiPack = derive2 { name="eiPack"; version="0.1-9"; sha256="1rivccqfr5hz80xgfw652993zg0pw7yd0by52hyp7bwm89gsjksq"; depends=[coda MASS msm]; }; eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; eigenmodel = derive2 { name="eigenmodel"; version="1.10"; sha256="1x613ipqpsq5yj4bb68g7yfwavd75n02xajr2cpbzsa2vyipvpsa"; depends=[]; }; eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; @@ -6591,7 +6675,7 @@ in with self; { elasticsearchr = derive2 { name="elasticsearchr"; version="0.3.0"; sha256="0h3r2vdxn0hygf65cq4p9ff4zh1ndsd7nl7cbwzsnkcnra4grsb9"; depends=[httr jsonlite]; }; elec = derive2 { name="elec"; version="0.1.2.1"; sha256="1gk75y83n6hvv36fp1n6kncln35j6f3ahasnzhc4fp71aq6q6vjf"; depends=[]; }; elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; - elect = derive2 { name="elect"; version="1.1.3"; sha256="02j9khm2nkg422xhz226i4ba2zs08cws0srfqr1y83kvqsr857yh"; depends=[msm nnet]; }; + elect = derive2 { name="elect"; version="1.2"; sha256="1hjqhmdklspssa75x8xdhv2narqgw80qh259hyfwfgnvva97w2ja"; depends=[msm nnet]; }; elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; }; electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; }; electoral = derive2 { name="electoral"; version="0.1.1"; sha256="0lmw9kwr189dzfxzlns9fmhrdy93ja8jl2s4jir07lichyiavs03"; depends=[dplyr ineq tibble]; }; @@ -6602,7 +6686,7 @@ in with self; { elliplot = derive2 { name="elliplot"; version="1.2.0"; sha256="186i4gr8k9bifzssblln8z6wxfmnplls3kc4m2liiz86mzsnim9r"; depends=[]; }; ellipse = derive2 { name="ellipse"; version="0.4.1"; sha256="0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs"; depends=[]; }; ellipsis = derive2 { name="ellipsis"; version="0.1.0"; sha256="0pw94qpg81xmsdsagpqxddv7m2cmdszmyyq99dk3caqqj01z7wg6"; depends=[]; }; - elliptic = derive2 { name="elliptic"; version="1.3-9"; sha256="0gw1klhp9l7xjmwgh43wrvwnvvyz7mbnfjn49hxy3yqsi4fjgnw1"; depends=[MASS]; }; + elliptic = derive2 { name="elliptic"; version="1.4-0"; sha256="1dhba0yfxjd5rlqsxp5a7s2hclfkla9wigsr39dlma67l6qjjmxn"; depends=[MASS]; }; elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.1"; sha256="1n71b5pqd1szhmp4q1h9aqgkx7s54f5i3xk5nljwzsn7cyih1kb3"; depends=[KernelKnn Rcpp RcppArmadillo]; }; elo = derive2 { name="elo"; version="1.1.0"; sha256="0xcbzhmqz5n80ybzhydz3ndzxd72gwadj8g5y4bxxfvf5il1f5yv"; depends=[pROC Rcpp]; }; emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; }; @@ -6622,17 +6706,17 @@ in with self; { emojifont = derive2 { name="emojifont"; version="0.5.2"; sha256="0s1as6i5dz2rbd1aashn99fji2iksjzrkdkfi7wqnnxxpmkha3yx"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; }; - empirical = derive2 { name="empirical"; version="0.2.0"; sha256="0kjkrsk9yf7dmpr6y04z43j5jy54q3vg6blyqphapp5fxq0pdhs4"; depends=[barsurf]; }; empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; }; emplik = derive2 { name="emplik"; version="1.0-4.3"; sha256="1g4hz85bvw29c77zs0ig487z92jjl682vv457x81l077h0psvk7c"; depends=[quantreg]; }; emplik2 = derive2 { name="emplik2"; version="1.21"; sha256="1980bwc4fc4rwzlwya030n5rv8rq0s82hnw955mvaxrbmicnqlla"; depends=[]; }; - ems = derive2 { name="ems"; version="1.2.1"; sha256="17q59r032r2dzsf2y90im4441b90zy5lnj3xrjax3ly85n1h5ngb"; depends=[]; }; - emstreeR = derive2 { name="emstreeR"; version="2.1.1"; sha256="1hp100nymfriqgfyjjbkcgw5ibn6wfyxscyqw1r5zhkwv6jigymr"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; }; + ems = derive2 { name="ems"; version="1.2.7"; sha256="1l4javnfhlb6y40dpdvri2795yj0s9zqf8bi02s5llx5lcq3bxbd"; depends=[]; }; + emstreeR = derive2 { name="emstreeR"; version="2.1.2"; sha256="1kk6cpxc46fshiwnjnvvqhdd02c77hx85mz842whbc6a3vw5w0bf"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; }; emuR = derive2 { name="emuR"; version="1.1.2"; sha256="1z4xyrqylrmni34bq234c8c9dcxqlww0ylyzgql6qan1hma8bw8d"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS purrr RCurl readr rlang RSQLite servr shiny stringr tibble tidyr uuid wrassp]; }; - emulator = derive2 { name="emulator"; version="1.2-19"; sha256="03abw344qw21g8vb90z1kjqczh2cq2ppl0k438dh7xijzxdpdbn8"; depends=[mvtnorm]; }; + emulator = derive2 { name="emulator"; version="1.2-20"; sha256="11z25iqyzck0s4hw0i86i9jsi52w9bjxx3zdpafssyfqfk7z5avw"; depends=[mvtnorm]; }; enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; }; enc = derive2 { name="enc"; version="0.2.0"; sha256="0n4s3abxmpndppm18dcibap2n22xpjzafn5xjskfdfrz3wjfy1kb"; depends=[]; }; encode = derive2 { name="encode"; version="0.3.4"; sha256="1ibrxa0lzni8c1nm3x061vj55faz8fvfgbl7c7b2wfanh5qnny9j"; depends=[]; }; + encryptr = derive2 { name="encryptr"; version="0.1.2"; sha256="0wx06fa3gkpz9xjcwd8hlannmlm00phliksmnm9mqlinprd47sd5"; depends=[dplyr knitr openssl purrr readr rlang]; }; endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.1"; sha256="067wrb5vhi9qn66rwp38cb4kss2yc55blh5dnl99fsvpc0qs146p"; depends=[coda]; }; @@ -6640,14 +6724,13 @@ in with self; { energy = derive2 { name="energy"; version="1.7-5"; sha256="15k9dg0a82cs9ypm0wpcsff3il1hzhnnv86dv5ngby1r144czhi4"; depends=[boot Rcpp]; }; energyr = derive2 { name="energyr"; version="0.1.2"; sha256="0gjw2cvpvhyywxlx3vfkhlh7zjwig46z1zwdc01zxwflvdx3z40n"; depends=[RgoogleMaps]; }; enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; }; - english = derive2 { name="english"; version="1.2-2"; sha256="11mq2q0xjxcmwd64r5xb95kfbpkx6bkc5k4by6c19gn2v77fycp9"; depends=[]; }; + english = derive2 { name="english"; version="1.2-3"; sha256="1gyj3wzx9spibmly7blw2i3gx9gvy22iy8js4r9gn8d3hpv4yf98"; depends=[]; }; engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; enpls = derive2 { name="enpls"; version="6.0"; sha256="07cwxxxsz2rj6d9dhmbfbv1vmk753ca7yy8ssq8lp4lxz3n4cp6p"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; enrichR = derive2 { name="enrichR"; version="1.0"; sha256="0lfdr45sdyqhvgz8q4qdbk12mpv86d6id665kq6aaslgr8jggfmn"; depends=[httr rjson]; }; enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; enrichwith = derive2 { name="enrichwith"; version="0.2"; sha256="063q4jbs6054djk6qf3105p7na4kndvr549w5c4fiz8264r8bnvv"; depends=[]; }; ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; }; - ensembleEN = derive2 { name="ensembleEN"; version="1.1.2"; sha256="033i4bcnr62kmrp1fafdw6vx8ir38kqchgxp4fidg3i750nkjnda"; depends=[Rcpp RcppArmadillo]; }; ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.2"; sha256="16d8030zfdwifqrh45vz3gf5n0bix0mhsmsnydgjq1fghdklcmyx"; depends=[chron ensembleBMA evd]; }; ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; }; ensemblepp = derive2 { name="ensemblepp"; version="0.1-0"; sha256="1b3rhg8mv1x3caz3xg84cwx8m88055n6yl36d9i4ws6vbj8vx68f"; depends=[]; }; @@ -6735,12 +6818,12 @@ in with self; { esmprep = derive2 { name="esmprep"; version="0.1.4"; sha256="1d1rr11fldxsamn19za03sdyvvybkh3bm5zvlrlkz022jj7pgxlr"; depends=[lubridate]; }; esquisse = derive2 { name="esquisse"; version="0.1.7"; sha256="1mvwyc8l8hcqyk06sbcfr5bjnky4jdc262izsjwscsnni8rbxcan"; depends=[ggplot2 ggthemes htmltools jsonlite miniUI RColorBrewer rstudioapi scales shiny shinyWidgets stringi viridisLite]; }; esreg = derive2 { name="esreg"; version="0.4.0"; sha256="1qfidbmdrm4vy72yjnpaadhm993xv6qqy44a8hk0l4isvmg51a5i"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; - essHist = derive2 { name="essHist"; version="1.1.1"; sha256="06wmvwjgbb1bfsjn4bv3p2m0i5nc6shn2p62kjp3iv6z42f5wndc"; depends=[Rcpp]; }; + essHist = derive2 { name="essHist"; version="1.2.0"; sha256="0kfxhnd7y2cs1j5xbck3hfx8m0biaklv8r04plr5pn640fw2q3ba"; depends=[Rcpp]; }; essurvey = derive2 { name="essurvey"; version="1.0.2"; sha256="0r1hkdksidx974pi08hg25qlzfxazqmzamwqg2njks2r9xk299p8"; depends=[haven httr rvest stringr xml2]; }; estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; }; estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; }; estimatr = derive2 { name="estimatr"; version="0.16"; sha256="0zd2zrmfijdkyg55mxvk1h2h9k3zc55pvfb1vx0l7xi51vblz798"; depends=[Formula generics Rcpp RcppEigen rlang]; }; - estmeansd = derive2 { name="estmeansd"; version="0.1.1"; sha256="0jy4rkwirs1zs6y3czs3iajgc1g0g27g68a4vnv93di609hhbal4"; depends=[metaBLUE]; }; + estmeansd = derive2 { name="estmeansd"; version="0.2.0"; sha256="07xbdsfz8vidp8pv2ix5g2y6y2cks14fzbjx74pa17696rnklrw3"; depends=[metaBLUE]; }; estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; estprod = derive2 { name="estprod"; version="1.1"; sha256="15grcpyhaazd1sl8544gx4zpjqi9p17d6siyb6a1ykzzyy1v1fln"; depends=[boot Formula gmm lazyeval minpack_lm]; }; estudy2 = derive2 { name="estudy2"; version="0.8.5"; sha256="0aqvlgzp98965xmjmmg2dxj79bjcvgv0qa89h5l1lp0i0c23p908"; depends=[matrixStats quantmod Rcpp zoo]; }; @@ -6798,7 +6881,7 @@ in with self; { exifr = derive2 { name="exifr"; version="0.3.1"; sha256="0394f04wq5dnqbnbaq7gxv4ggis4kf3b8dhhjzlybsbip6nmv54x"; depends=[curl jsonlite plyr rappdirs tibble]; }; exiftoolr = derive2 { name="exiftoolr"; version="0.1.1"; sha256="0qip3r2vvxj0ax2pf150hmka70yiv9k2vlfj5pxyminri7scvf39"; depends=[curl jsonlite]; }; exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; }; - expSBM = derive2 { name="expSBM"; version="1.0"; sha256="1d926izlpc8dl74n9nmqc38p4xkw3g4dgbn8a9ny6p1aj3ynxgdf"; depends=[gtools mclust Rcpp RcppArmadillo]; }; + expSBM = derive2 { name="expSBM"; version="1.1"; sha256="10l2in6l5l61lrj2rrf5rjgphb7px3xb8alx976vksq96c5l9rdj"; depends=[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]; }; experiment = derive2 { name="experiment"; version="1.1-4"; sha256="08d9m72l6n2ygy5x8aakzv3n71ybqy1i8yzv55f7r4w1kk4pbk5i"; depends=[boot MASS]; }; @@ -6806,18 +6889,18 @@ in with self; { expint = derive2 { name="expint"; version="0.1-5"; sha256="12ki8j17p070kq2mdzzai755wy1n6kvinax0ldd63kynij9n0gdh"; depends=[]; }; explor = derive2 { name="explor"; version="0.3.4"; sha256="1gdahxglpk7wyf89ixqaqw95rzac4kii2qyxkk3b26hg5chfnd7k"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; - expm = derive2 { name="expm"; version="0.999-3"; sha256="04k4a6g071jkjc0d30ncmf713dj16brcs9m6pj43hnycc1caq6si"; depends=[Matrix]; }; + expm = derive2 { name="expm"; version="0.999-4"; sha256="15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q"; depends=[Matrix]; }; expoRkit = derive2 { name="expoRkit"; version="0.9.2"; sha256="0qlzz86cyfz2yyynz8bj28086d1pc93gvjy1idip80m7z6vsrsxq"; depends=[Matrix SparseM]; }; export = derive2 { name="export"; version="0.2.2"; sha256="03i3jk4b9q1sak6m36p349bzqcwfq3bw6y8sgrw65475mrwipm4m"; depends=[broom flextable officer openxlsx rgl rvg stargazer xml2 xtable]; }; expp = derive2 { name="expp"; version="1.2.4"; sha256="00r5f80wnz91n0ksp1dvrxpd6zyfis2v3rizsnm7qqnnwj3d4q1c"; depends=[deldir rgeos sp spatstat spdep]; }; expperm = derive2 { name="expperm"; version="0.1.0"; sha256="0siq0jh0fvv2y4p12icmwqbpdg6833c853c6k7xkzad3h6vyh0dp"; depends=[]; }; - exprso = derive2 { name="exprso"; version="0.4.7"; sha256="066cqzbmdbrprqxd5dx9220k20pgidc49rqvksznadsxnrbzhq61"; depends=[cluster e1071 frbs glmnet kernlab lattice MASS nnet plyr randomForest ROCR rpart sampling]; }; + exprso = derive2 { name="exprso"; version="0.5.1"; sha256="02fz2awxxgf5avnnvv10kr20zvzdmal7z9jbmjxzw5kjqrcv7jci"; depends=[cluster e1071 frbs glmnet kernlab lattice MASS nnet plyr randomForest ROCR rpart sampling]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; expss = derive2 { name="expss"; version="0.8.10"; sha256="00h68pni8z1mnwzvjyr7zlxnp2b8rm6qbv5kjwa2a2q7fs3nswl7"; 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]; }; - extRemes = derive2 { name="extRemes"; version="2.0-9"; sha256="0cpvcajk9xyy7662nqkyx333vrxpwsc5nmv0bfnhsbgijz5y0hvm"; depends=[car distillery Lmoments]; }; + extRemes = derive2 { name="extRemes"; version="2.0-10"; sha256="08fj72gpq2d6695hbm3cgwgal64z009ykrirby7g6r0akfcsx5ic"; depends=[distillery Lmoments]; }; extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; }; extdplyr = derive2 { name="extdplyr"; version="0.1.4"; sha256="0rxwpspn3905f4l27cwgi9rlj379hb6b4kkb0kjq8gzpkg2fznh1"; depends=[dplyr lazyeval tidyr]; }; exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; }; @@ -6826,7 +6909,6 @@ in with self; { extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; }; extraDistr = derive2 { name="extraDistr"; version="1.8.10"; sha256="00lvqp5bb3iak5myiz4rqm887bkq9sdh7aybmz84mmfni6q01m28"; depends=[Rcpp]; }; extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; }; - extracat = derive2 { name="extracat"; version="1.7-6"; sha256="1a4ppfr9lsr1hlbf6m47sm8kflq8rp2khp1vc9xmnr9jxlwz3l2d"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; }; extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; }; extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; extremeStat = derive2 { name="extremeStat"; version="1.4.0"; sha256="0fvkvlm47ri05w9h5qa937ijsc5lg51jc825wq9pmn7aiv58yxzm"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; @@ -6842,7 +6924,7 @@ in with self; { 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]; }; - ezpickr = derive2 { name="ezpickr"; version="1.0.3"; sha256="02l4ghzw24gpgh0q37j7995v5isa59jh2cy36rxd7mramgf1ycn2"; depends=[haven jsonlite magrittr mboxr purrr readr readxl stringr textreadr tibble writexl]; }; + ezpickr = derive2 { name="ezpickr"; version="1.0.4"; sha256="0aziz6n9jqs6zldgpplrqw7835c5zfq5s4swjlajj65rhp6dwqbn"; depends=[haven jsonlite magrittr mboxr purrr readr readxl stringr textreadr tibble writexl]; }; ezplot = derive2 { name="ezplot"; version="0.2.2"; sha256="07ls5pfaykn7l9lygfqn9vvi821xqgwyzdc6zpyphj9nyran0480"; depends=[dplyr forcats ggplot2 magrittr rlang]; }; 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=[]; }; @@ -6871,7 +6953,7 @@ in with self; { 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="4.5"; sha256="0d396a3ns3h2p4rdi45xcs3rfb18aqd95n8dszgdh8snf1776b9r"; depends=[coda corrplot doParallel doRNG foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; - fabricatr = derive2 { name="fabricatr"; version="0.6.0"; sha256="11vl2gabri7pb2ka7aqq3w7rxsi26qcdyqdhca9jpxm2m0swm2ms"; depends=[rlang]; }; + fabricatr = derive2 { name="fabricatr"; version="0.8.0"; sha256="1lx53424g6g5bn914dx42zsdjfsmk6s5xxcl7k2wcpr5bvnpir3x"; depends=[rlang]; }; face = derive2 { name="face"; version="0.1-5"; sha256="0n7vlq29krsdcp8r32irhvf7xbcxy5g7663qncmbhj5x45sviqh6"; depends=[Matrix matrixcalc mgcv]; }; facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; }; facerec = derive2 { name="facerec"; version="0.1.0"; sha256="1dipcnxjz6yd34w0jrrvj5p0pwdgz1l5m9zvri7mflnz7g34gmaj"; depends=[dplyr httr jsonlite knitr magrittr rlang snakecase stringr]; }; @@ -6887,7 +6969,7 @@ in with self; { fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; }; 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.4.0"; sha256="0ncwdy66975argnghp8kkd9f571pphk6wj572wp8nhl5qkrfi7rk"; depends=[callr igraph MakefileR pkgbuild withr]; }; + fakemake = derive2 { name="fakemake"; version="1.4.1"; sha256="0jmcbdq5gp7abqiihn8zi2l0whiwnc763lqrk2wflac4d0zw275z"; depends=[callr igraph MakefileR withr]; }; 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=[]; }; @@ -6915,7 +6997,7 @@ in with self; { fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; }; fastLink = derive2 { name="fastLink"; version="0.5.0"; sha256="1hgz4c26qlsdlp7gx0rsvkwn6xv86d7yk186sp7j6nfh2p9b1ccz"; 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="1.0.1"; sha256="0r8spqqixkgp96396qnwwqi4f3hkr1m8cpyhwipshdx32xlzs0lv"; depends=[Matrix]; }; + fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="1.1.1"; sha256="1k4ljlxbibaa1shdikhczszmly3d5z9j7plglya7s8qh69zndz2m"; depends=[Matrix]; }; fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; }; 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.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; }; @@ -6935,7 +7017,7 @@ in with self; { fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; }; 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]; }; - fastrtext = derive2 { name="fastrtext"; version="0.2.6"; sha256="1l5wxg7188dd2pgpdlxkl6i5dmd7f9skb5h2999sr7xnsw5p7bs4"; depends=[assertthat Rcpp]; }; + fastrtext = derive2 { name="fastrtext"; version="0.3.1"; sha256="02xjgqklxh0br1ciy7z3vrka6d84ypr637cbh9ah11h1z7kkpg4s"; depends=[assertthat Rcpp]; }; fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.3"; sha256="00pnzr3v7vm965b3cvgplasw00akmixybvm6l9bn609c2kqbf5p3"; depends=[kinship2 multgee]; }; fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; }; @@ -6944,7 +7026,7 @@ in with self; { 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]; }; fbati = derive2 { name="fbati"; version="1.0-3"; sha256="03a48sndphxrm4bmk0qx0lxnk4akkdpbvldq9dcnf9hxxmrfivh4"; depends=[fgui pbatR rootSolve]; }; - fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; }; + fbroc = derive2 { name="fbroc"; version="0.4.1"; sha256="1v73wl3yckcqx43fz1lzcsy6v08vmbmi7yi623yhgqywixxv2bx3"; depends=[ggplot2 Rcpp]; }; fc = derive2 { name="fc"; version="0.1.0"; sha256="0x41xfchy499kz0qi7fp12vpkbcddprv19mmk48lxzavv4f5avfh"; depends=[codetools]; }; fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; }; fclust = derive2 { name="fclust"; version="2.0.2"; sha256="032iqrnsbs2ckhlxw9gnsqxpxj38hqnrlq46k11rvyf5zlpnci99"; depends=[MASS Rcpp RcppArmadillo]; }; @@ -6959,7 +7041,7 @@ in with self; { fdaPDE = derive2 { name="fdaPDE"; version="0.1-4"; sha256="0n72x5h00n17yxjniim2qxz2phy1srk04dn6ivvc58k3x252fzkh"; depends=[RcppEigen rgl]; }; fdadensity = derive2 { name="fdadensity"; version="0.1.1"; sha256="0jj5gprv3ihdjic261czqnv7c13mxsmjmv7gn2gv4483kgijlkz9"; depends=[fdapace Rcpp]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; - fdapace = derive2 { name="fdapace"; version="0.4.0"; sha256="09qwl1bkcrfaxk0938v0ddd8aiyf0vi6619rpsg7f82rbc5i73mp"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; + fdapace = derive2 { name="fdapace"; version="0.4.1"; sha256="1k10j6nlsidyms1a0nnki46ddyyywpz8gnnnjm3k17wxyi69bmg1"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; fdasrvf = derive2 { name="fdasrvf"; version="1.8.3"; sha256="1lqyadg17ddd3vksbaxc7bpwvk0afsd59rfg0n5wrgvhbd473s0y"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat 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]; }; @@ -6969,7 +7051,7 @@ in with self; { 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-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; }; - feather = derive2 { name="feather"; version="0.3.2"; sha256="138vnlwhkwayyim4rbx6rnf91kzhfij6v2f91ppx2174ky5611h6"; depends=[hms Rcpp tibble]; }; + feather = derive2 { name="feather"; version="0.3.3"; sha256="0ls8lmygyjq60467s88h66d7fczjp1d3a2106rfq4dx9lyfvdfsa"; depends=[hms Rcpp tibble]; }; feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; 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]; }; @@ -6987,7 +7069,7 @@ in with self; { fetchR = derive2 { name="fetchR"; version="2.1-1"; sha256="0i5k40i7ryfbk1l4nn0k5hnmzhhp6970ns1j82hnih7kmdl4rlwj"; depends=[plotKML rgdal rgeos sp]; }; ff = derive2 { name="ff"; version="2.2-14"; sha256="1w724q4jpzbvzpilb2ifviaxkjgk9lzwxz9gksnvicbmfa20fqqw"; depends=[bit]; }; ffbase = derive2 { name="ffbase"; version="0.12.7"; sha256="04kxx2f3f0743c5nvpb7x1x0pcd220dazpd5ag1pidxbz3xa85nw"; depends=[bit fastmatch ff]; }; - ffmanova = derive2 { name="ffmanova"; version="1.0.0"; sha256="1jbdilf2d85sziabdv1nqzgmdc46pp9x3s3wzwxyri5xxvl3vy5l"; depends=[]; }; + ffmanova = derive2 { name="ffmanova"; version="1.1.0"; sha256="0019m9vxnh5yxr5k7zflzyhd533a842cjjkcpqyannshnrbfndvy"; depends=[]; }; ffmetadata = derive2 { name="ffmetadata"; version="1.0.0"; sha256="0gjv5fl3p0kz28c91l4qf34a2685a24l5841ixdg7wivfs5v9npv"; depends=[httr jsonlite]; }; ffstream = derive2 { name="ffstream"; version="0.1.6"; sha256="036ikhah4y85khgfmvxwsn3vavvw1is8i9k2lw474wxlh4cxa3kd"; depends=[Rcpp]; }; fftw = derive2 { name="fftw"; version="1.0-5"; sha256="037jnf0hgjlw4k2yj8kl9vi8h6vzsff261hn35f1kndywpl4zjdg"; depends=[]; }; @@ -6996,6 +7078,7 @@ in with self; { fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; 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.4.2"; sha256="1j450wsl7qar3x9fwp6w48vb9ypj1lz930b8ay5nxyx2785b467a"; depends=[data_table]; }; fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; }; fieldRS = derive2 { name="fieldRS"; version="0.2.1"; sha256="04h6jwlpar5s0rv35379qr0f64ca3hg510qh62k896rn38z2265d"; depends=[caret concaveman ggplot2 raster rgeos sp spatialEco stringdist]; }; fields = derive2 { name="fields"; version="9.6"; sha256="1v7z48a8jmdcil28rj8c3455k6rssr5v9qi6dyhhpbb193bj8121"; depends=[maps spam]; }; @@ -7009,7 +7092,7 @@ in with self; { files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; }; filesstrings = derive2 { name="filesstrings"; version="3.0.0"; sha256="1r32z9xlid9pj8sapb73iwzq6cczz96f1ipdbszwb6x9vlq2nw7l"; depends=[checkmate magrittr matrixStats ore purrr Rcpp rlang strex stringr tibble]; }; filling = derive2 { name="filling"; version="0.2.0"; sha256="0yxixwgvn7jq09j4r3q33mmdda9a4anfi7y0xqscbdjz6p9bx48w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; - finalfit = derive2 { name="finalfit"; version="0.9.0"; sha256="01vhybrrf0bliv53xnphz3w3z1m034vcmvqnvjnlm9c2kaqmsb7s"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr readr scales stringr survival survminer tidyr]; }; + finalfit = derive2 { name="finalfit"; version="0.9.1"; sha256="05pmj08qrbyf562bczixf9vdrk4xczfic615dk8mnsya0gk53lw8"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr readr scales stringr survival survminer tidyr]; }; finch = derive2 { name="finch"; version="0.2.0"; sha256="1vganbkz2d96xfz2jf1q0kqarc575w3nswss2igynsbbd0y53mjm"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; }; findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; findpython = derive2 { name="findpython"; version="1.0.5"; sha256="0icifm4z6hhpmcjrg75a875iph0ci890ss02kdv3725pijc236iy"; depends=[]; }; @@ -7027,7 +7110,7 @@ in with self; { fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; }; fishmethods = derive2 { name="fishmethods"; version="1.11-0"; sha256="0ikxvq0mkw0s382ias04il06sbqfiq8phx69f5pdzvbm5xskzmxs"; depends=[boot bootstrap lme4 MASS numDeriv]; }; fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; }; - fishtree = derive2 { name="fishtree"; version="0.2.0"; sha256="1pmiy84lc5lbj6gszgrq2ai1wypcg54d31y8b3x2hsj362mlw5jf"; depends=[ape jsonlite rlang]; }; + fishtree = derive2 { name="fishtree"; version="0.3.0"; sha256="1xf2pdyrg6a5ygwfv71j39f7j3cjq1nmzpn5ivk0flrqvd1jbai0"; depends=[ape jsonlite memoise rlang]; }; fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; }; fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; }; fitDRC = derive2 { name="fitDRC"; version="1.1.1"; sha256="09z9l27iwl0fd3zy6rsdhmy8qbm5d9a4wcaj5rxp7ynlnpi102aa"; depends=[]; }; @@ -7045,6 +7128,7 @@ in with self; { fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; }; + flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; }; flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; }; flare = derive2 { name="flare"; version="1.6.0"; sha256="0ygif9a7a99qwv0b488wymmmncp6f5ww9yz13s4qs6p8yf37x1r1"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; @@ -7058,9 +7142,9 @@ in with self; { 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]; }; flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; }; - flexsurv = derive2 { name="flexsurv"; version="1.1"; sha256="1vj8zsfgq2rv6v7na4w7n7z3farc69qsavm7pnmnhkaylz61gq26"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp 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="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; }; - flextable = derive2 { name="flextable"; version="0.5.1"; sha256="0arxgal67ahsq8v0zbvc767qadn7lg3f7mmqa9gjjz6sri0y6gsx"; depends=[data_table gdtools htmltools knitr magick officer rlang rmarkdown xml2]; }; + flextable = derive2 { name="flextable"; version="0.5.2"; sha256="0sabdvkdlx5i1nr7nz68cappwsibzsjxpmiz3yp948ckbfmkdb27"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; }; flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; }; flip = derive2 { name="flip"; version="2.5.0"; sha256="08x5hwxaxbgc745gblja7gcy0b5wbp7jf90lkha75zl5cc9iyksl"; depends=[cherry e1071 plyr someMTP]; }; flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; }; @@ -7075,7 +7159,7 @@ in with self; { 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.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; + flsa = derive2 { name="flsa"; version="1.5.1"; sha256="0x4fksps364841qckp218rfslx1dvwns1rhw2w7dcnhj7kfkcv59"; depends=[]; }; fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; }; fluspect = derive2 { name="fluspect"; version="1.0.0"; sha256="0j80wx00s8ljqg1qaqw66rj7kxhhk438hb0syv0lr9vld03cxy2w"; depends=[pracma]; }; flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; @@ -7091,6 +7175,7 @@ in with self; { foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; foghorn = derive2 { name="foghorn"; version="1.1.0"; sha256="161smkvx1pzn8sskr137iiqhcm0jp5rrrmc1valamh0zz5glcdk8"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; + foieGras = derive2 { name="foieGras"; version="0.2.1"; sha256="1l2aajf1wvr17nk0vzn9a6sp5ihgcxq3jxk8yiy0lwrj24qqm4a0"; depends=[argosfilter dplyr ggplot2 gridExtra lubridate magrittr RcppEigen sf stringr tibble TMB]; }; folderfun = derive2 { name="folderfun"; version="0.1.1"; sha256="0ynq8chx3rrlsa8ln4xy0zif0df0nb64wyfgvl42yg6m3gq1cayb"; depends=[]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; }; @@ -7111,7 +7196,7 @@ in with self; { foreign = derive2 { name="foreign"; version="0.8-71"; sha256="1mv04w3ycz0ymsszn8aa87k6k5sb8mg8lhf1b8w4zpfrphpkkliv"; 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="0.4"; sha256="00b66ga25hgbd47fy8rjnxvnxjsvxhqj7k3axnzhgja14ng1mrms"; depends=[curl raster rgdal rvest SDMTools xml2]; }; + forestChange = derive2 { name="forestChange"; version="0.5"; sha256="0lw9gd0awh72kx7ra1rkrxr1msrc4bm4rq91xcym4s2nniwjrl5a"; depends=[curl raster rgdal rvest SDMTools xml2]; }; forestControl = derive2 { name="forestControl"; version="0.2.0"; sha256="1w1x7i57dqlrm6zzgx4k0p1zs83nrg2w2jhhvjjk9s6y1ba3whyg"; depends=[dplyr magrittr purrr Rcpp tibble]; }; forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; }; forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; }; @@ -7121,6 +7206,7 @@ in with self; { forestmodel = derive2 { name="forestmodel"; version="0.5.0"; sha256="09gwgsh42gkmhs8ijq5xfbbkb1hk6sjb0q32mw2ymc6x9ycr1a9j"; depends=[broom dplyr ggplot2 lazyeval tibble]; }; forestplot = derive2 { name="forestplot"; version="1.7.2"; sha256="1cqk0fwpbn4an6xn28kpvqmcp3mgv8isg8dy755sv5fkqzzjz1dg"; depends=[checkmate magrittr]; }; forestr = derive2 { name="forestr"; version="1.0.1"; sha256="0m26x7ngl89ngk1qhg50npmwli2npmjs9pfb9rg5hmx4fzr8k63i"; depends=[dplyr ggplot2 plyr]; }; + foretell = derive2 { name="foretell"; version="0.1.0"; sha256="0al8x57969dnxd8g21x6j66pyx5xk0da4ywbarq9b43n7q9mkk4z"; depends=[]; }; forge = derive2 { name="forge"; version="0.2.0"; sha256="0pjfzsc35agkh0zfw2czwajkbsyn6liys5irl5bhz5r1vim3jmwa"; depends=[magrittr rlang]; }; formatR = derive2 { name="formatR"; version="1.6"; sha256="0a9229rg3s9qga5v2fwfdqr0z3bk2yycv8kijrcm3jh66l68zjgm"; depends=[]; }; formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; }; @@ -7132,7 +7218,7 @@ in with self; { fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; }; foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; }; fourPNO = derive2 { name="fourPNO"; version="1.0.5"; sha256="0nx6rl34jklsn48wphh16rxm57hfxndc1zfddgl9yw5nfmfll7gs"; depends=[Rcpp RcppArmadillo]; }; - fourierin = derive2 { name="fourierin"; version="0.2.2"; sha256="0hy033bzybdc214z10wnbqph5f83fsr13admnzwb1d2drpbljnc8"; depends=[Rcpp RcppArmadillo]; }; + fourierin = derive2 { name="fourierin"; version="0.2.3"; sha256="05r3zz7ccmxlm2rn797zg80q9hik92wvalvkldzsi0124ripy47g"; depends=[Rcpp RcppArmadillo]; }; fpCompare = derive2 { name="fpCompare"; version="0.2.2"; sha256="10a87bpbpvrbrpyfx7ygyr9b7wd3fp79nd4g2ggl1gz3b1daqgxq"; depends=[]; }; fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; }; fpc = derive2 { name="fpc"; version="2.1-11.1"; sha256="1ari57hkgqsxh6khr6j52cfrzc0096cnn1q7ghxk2z4brdd4rznc"; depends=[class cluster diptest flexmix kernlab MASS mclust mvtnorm prabclus robustbase trimcluster]; }; @@ -7180,12 +7266,13 @@ in with self; { frontier = derive2 { name="frontier"; version="1.1-2"; sha256="1vpjd57cc6niwqibhz1ib46zj57d5a9m40yaq7kr9awk9di65ryz"; depends=[Formula lmtest micEcon miscTools moments plm]; }; frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; - fs = derive2 { name="fs"; version="1.2.6"; sha256="0kqqaqqml8x3r1mdld40iwns0ylj2f52qsdh1vcn39f7w7c2ka8j"; depends=[Rcpp]; }; + fs = derive2 { name="fs"; version="1.2.7"; sha256="03aq2ill03ladsa4438nrz213ks2mqhxsrb9fjsp62bhk36v8k1a"; depends=[Rcpp]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; }; - fsdaR = derive2 { name="fsdaR"; version="0.4-4"; sha256="0wya7wjpr095lm914i8dhagkmk48f5ksgmpliy5ximxbjrn3jcwr"; depends=[ggplot2 reshape2 rJava rrcov]; }; + fsdaR = derive2 { name="fsdaR"; version="0.4-6"; sha256="0lj2kaan5n4g2ckj6d4sfvab0a45h164m1fjvqf57c0ymhaswz76"; depends=[ggplot2 reshape2 rJava rrcov]; }; fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; fslr = derive2 { name="fslr"; version="2.22.0"; sha256="1a3sclwhmalp4g05yr8gw80zgcbqvgpbppj1pyw4x846ahk1wikd"; depends=[neurobase oro_nifti R_utils]; }; fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; }; + fssemR = derive2 { name="fssemR"; version="0.1.3"; sha256="0hv1b2lkwx3srsgmigk4n6qxyb7dzy3bj16y0brkc8fs3ni1zw56"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; }; fst = derive2 { name="fst"; version="0.8.10"; sha256="1wlrkky5anjv7a1ma3kvrbq0pzv6mff2fvp5rkgrwzp9cqmms997"; 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]; }; @@ -7199,7 +7286,7 @@ in with self; { fullfact = derive2 { name="fullfact"; version="1.2"; sha256="13729m2s8b32d9i9c6g2r0zkcqsw9p7nhdig8isarfn4bjzqhf71"; depends=[afex lme4]; }; fulltext = derive2 { name="fulltext"; version="1.2.0"; sha256="0xajp1940xfxxfkl2fiwg8c0j285hvrqy0iwaxg9iqn5sjvjfgw4"; 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=[]; }; - funData = derive2 { name="funData"; version="1.3-2"; sha256="0qifkrw4a6hrm8msxcy1dxrfiw88xmxw8avg5ls7bginq4bfsk51"; depends=[abind fields foreach]; }; + funData = derive2 { name="funData"; version="1.3-3"; sha256="01aklp1k3k0bhs3dzlcr3phyk27d2nw0b8r154chiix5m67nfhbf"; depends=[abind fields foreach]; }; funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; funHDDC = derive2 { name="funHDDC"; version="2.2.0"; sha256="1s4k6wvs6x88c7whw0bkb3pfhp8wqcmzlsv8div9df0i2fisf3zr"; depends=[fda MASS]; }; funLBM = derive2 { name="funLBM"; version="1.0"; sha256="0krx5v1lakrrxk0j249k7sr7c6r40yg1l8l10laf4444j2qn8rjp"; depends=[fda funFEM]; }; @@ -7208,6 +7295,7 @@ in with self; { funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; }; + funcy = derive2 { name="funcy"; version="1.0.1"; sha256="08r9nyqq83vzaddxcqwf4zilkz935p40vssfn3afs1bkkda5xyya"; depends=[calibrate car cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; }; fungible = derive2 { name="fungible"; version="1.80"; sha256="0apsc2c6jzf6w54acgk4sag3rs0324diqxkjjsqnp6v4ijlz1n0z"; 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]; }; @@ -7246,7 +7334,7 @@ in with self; { fxtract = derive2 { name="fxtract"; version="0.9.1"; sha256="1b6ijxda969m7b74zyyd6rm1g706z2691awjlx23xwfirfkc2jka"; depends=[checkmate data_table dplyr future future_apply magrittr R6]; }; 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="0.1.4"; sha256="13l2lmrvzxvp2mkwlg12bapzavv4rpwjk5l771fc7himf0il411w"; depends=[cgdsr htmlwidgets jsonlite stringr]; }; + g3viz = derive2 { name="g3viz"; version="1.0.4"; sha256="1c1iv8wv7dhf5mmbjddpj5qzifkzm459263d0z5qyqca6fm1x4l8"; depends=[cgdsr htmlwidgets jsonlite stringr]; }; gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; }; gDefrag = derive2 { name="gDefrag"; version="0.1"; sha256="1xzp12p7w4gsy88hjl1n0ylymjbm3wqypqavkb97if94mwhlfqsh"; depends=[igraph maptools rgdal rgeos sp]; }; gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; }; @@ -7265,7 +7353,7 @@ in with self; { gSeg = derive2 { name="gSeg"; version="0.6"; sha256="19njl093qidwjcwzxkzip78ahgq3zwhc0kscvhjpzb49qkg3srrj"; depends=[]; }; gStream = derive2 { name="gStream"; version="0.1.0"; sha256="02ww3s3pc7x8kvi697rfilpl5swi33v4k0q5wkv4rf6mc319m5qk"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; - gWQS = derive2 { name="gWQS"; version="1.1.0"; sha256="03v6b90745nd0jxil39rgay1yh1lrg9p1wbi22yffd29a2arsf22"; depends=[ggplot2 Rsolnp tableHTML ztable]; }; + gWQS = derive2 { name="gWQS"; version="1.1.1"; sha256="147ygks66yhkg05c7rwnj2i6lhwdy3vx9z0yj6z5aj9p8yj7qxqr"; depends=[ggplot2 Rsolnp tableHTML ztable]; }; gWidgets = derive2 { name="gWidgets"; version="0.0-54.1"; sha256="1vwwjpi4lbgzw3fw3j9cccs9qhqa11v5hvq4hv5px373dla8pcn2"; depends=[]; }; 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]; }; @@ -7279,7 +7367,7 @@ in with self; { galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; }; gam = derive2 { name="gam"; version="1.16"; sha256="0blg4gghw5068z180c4bf0s77ky0wspgsi6xpcfnkf2rkvj34182"; depends=[foreach]; }; gamCopula = derive2 { name="gamCopula"; version="0.0-4"; sha256="1nj5pxcbr6k7k1m44ky306yycpx20pw8awlx7lzyw1rx1hrv5ivb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; - gamRR = derive2 { name="gamRR"; version="0.5.0"; sha256="0bgllbdbp0nnsmjdywb1p0ggzx3bjqihrxz7pzprm8jycyrc9qd9"; depends=[boot mgcv]; }; + gamRR = derive2 { name="gamRR"; version="0.6.0"; sha256="0l7ql1qp3xgky82d88l143nl7l11zsj4mnkdsx10f3nmf7kykj3d"; depends=[boot mgcv]; }; gama = derive2 { name="gama"; version="1.0.3"; sha256="1k79m01r3y9am62414947zfwb1w1gh0nn48najivbjyk9i2avn9r"; depends=[ArgumentCheck cluster clusterCrit GA ggplot2 NbClust Rfast]; }; gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; }; gambin = derive2 { name="gambin"; version="2.4.1"; sha256="03n5zcwfq8g1vk5w22hw8fhqkc63zz4g9d3gdxa5g8v7v56l3dqy"; depends=[doParallel foreach gtools]; }; @@ -7288,15 +7376,16 @@ in with self; { gamclass = derive2 { name="gamclass"; version="0.58"; sha256="0dldqnbdgrafkm1a9kb0gyyfs0s2g31iv4ndlnnm2rd63ga4xxsn"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; }; gameofthrones = derive2 { name="gameofthrones"; version="1.0.0"; sha256="15jgpv197aqb56iyp4afjajx2rcxz21dhigx9mxipa0b8g2h0s6k"; 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.5"; sha256="1xvy0azyjcr077lwpnh6083ypv0j8qjd0frkc6z6vs6fgbv2lv5p"; depends=[shiny]; }; + gamesGA = derive2 { name="gamesGA"; version="1.1.3.6"; sha256="1agvh27m5sy8psbsw9nbi39wl7cf406fl9sd9hkc14139w9drfwv"; depends=[shiny]; }; gamlr = derive2 { name="gamlr"; version="1.13-5"; sha256="0fc27b6qcm01drb7pb14wri2hlb464jig3x7sb8njwrxcqqia14n"; depends=[Matrix]; }; - gamlss = derive2 { name="gamlss"; version="5.1-2"; sha256="0sq1gvsj4ydmyz3xip5565c15022rz98p979lp39i3wafrs4wh0d"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss = derive2 { name="gamlss"; version="5.1-3"; sha256="05vkhn1y4gl2m6s1fyrakq3pb9c98kns217a1k1arnxcq8di4zfk"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; gamlss_add = derive2 { name="gamlss.add"; version="5.0-1"; sha256="1agk6pfm04hf9dp5r6dvxqkj1hykx23a16q7vch2sg752z0dadgk"; 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]; }; - gamlss_data = derive2 { name="gamlss.data"; version="5.1-0"; sha256="1hg63z4pybmlihnckv9r5nxckx7rjss2rkajgrkraqxal6747b8a"; depends=[]; }; + gamlss_data = derive2 { name="gamlss.data"; version="5.1-3"; sha256="0w04lzi10hd92l160d6djafvdg4plz129jh2p9w7dsgbgq71hha9"; depends=[]; }; 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-1"; sha256="1cd0vl9klcb849i8xwyjm8ihb1da92631j1rxdbnflgffkzrkya4"; depends=[MASS]; }; + gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-3"; sha256="0154pm1f3g77krj0gxh9icz207pshdrxihb6gjv1k5aph8y69zc7"; 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_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]; }; @@ -7315,10 +7404,10 @@ in with self; { gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; }; gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; - gaselect = derive2 { name="gaselect"; version="1.0.6"; sha256="1463ch0r4nr6bjjvixgmnp8kj87v3xkql1hh43sv17c7bnbiv4yv"; depends=[Rcpp RcppArmadillo]; }; - gasfluxes = derive2 { name="gasfluxes"; version="0.4-1"; sha256="0x1ckb72xkfcm0aidj5m7d2aavqij0qdfclsm3gf3dp7rdm9ymw1"; depends=[AICcmodavg data_table MASS sfsmisc]; }; + gaselect = derive2 { name="gaselect"; version="1.0.7"; sha256="0bivbvs8yyspqskvka1s1sr6w3k0m5kk4b66wfz9bfdygnywd6wz"; depends=[Rcpp RcppArmadillo]; }; + gasfluxes = derive2 { name="gasfluxes"; version="0.4-2"; sha256="1yw63hf03y6xalcy8616rnyr5np6pgxdhmcg1ss8cxr54qz2nccq"; depends=[AICcmodavg data_table MASS sfsmisc]; }; gastempt = derive2 { name="gastempt"; version="0.4.4"; sha256="16sgjysc9x6l07jdnw515jzvc8nf237a1a3wmcwc5khyacg29lr4"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen rstan rstantools shiny StanHeaders stringr tibble]; }; - gaston = derive2 { name="gaston"; version="1.5.4"; sha256="1yjl100z6cakpfd1gqryigpclyslygzvhps7w6gyrp85yipj5i0r"; depends=[Rcpp RcppEigen RcppParallel]; }; + gaston = derive2 { name="gaston"; version="1.5.5"; sha256="0xiy36wrl480lzfcidw5k39arjmwzx4vx5qq8d4qb7ykq25hkjzz"; depends=[Rcpp RcppEigen RcppParallel]; }; gatepoints = derive2 { name="gatepoints"; version="0.1.3"; sha256="02qxxf4a6rl3l0jdgqxmzxfnqd9lh5i0q2knaxxsiz0nd74c1jg5"; depends=[]; }; gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; }; @@ -7348,11 +7437,11 @@ in with self; { 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.2-2"; sha256="0lqpxsg01ibkaq50qyccdhsl2sbb4kh9bcfifs1yzsg45bq27jf8"; depends=[igraph Matrix raster sp]; }; gdm = derive2 { name="gdm"; version="1.3.11"; sha256="1bsy8fjzc0034hxw5n4ip4lkwr38fiyvw9q21bk17sxn44cnnxz4"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; - gdmp = derive2 { name="gdmp"; version="0.1.0"; sha256="1dlzxf17ssm10pw14mk5lk0plgav2mj8xf39dacyg9hlrz9pjwki"; depends=[]; }; + gdmp = derive2 { name="gdmp"; version="0.2.0"; sha256="0fy8x9l6swrb78apwq9d9msz2y8dkfd2fkyp1pkmzxwdb85lmcdm"; depends=[]; }; gdns = derive2 { name="gdns"; version="0.3.1"; sha256="1vydl7jacldidzx1hhqang9fw8zar8wy4cgdmr9pbw22ffw2qq7s"; depends=[httr jsonlite stringi]; }; gdpc = derive2 { name="gdpc"; version="1.1.0"; sha256="1q1c9pypkb8dv6bvgizaca4p43krc52fvlvjz9l6nkpazr1qx33d"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; }; - gdtools = derive2 { name="gdtools"; version="0.1.7"; sha256="122k9spymawfnfyksxyapwq9cigydy5nrjwhrwrhy3qkax3aycf6"; depends=[Rcpp withr]; }; + gdtools = derive2 { name="gdtools"; version="0.1.8"; sha256="1ayy0s699ghaz34lklvcskfwman3x2n2772s5sa5x9k9xgsnxwcl"; depends=[Rcpp withr]; }; gear = derive2 { name="gear"; version="0.1.1"; sha256="1sqj9pz15j1v6fm4q2dp0zhdmy9zmmhmgxjwria5ihrp3b5hvwry"; depends=[lattice optimx sp]; }; gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; }; gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; @@ -7379,8 +7468,9 @@ in with self; { gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; }; gender = derive2 { name="gender"; version="0.5.2"; sha256="1kd5024z9mbyiwmj7rpn7zflmpw6jsj2sz153g3ckzyhxjbc3x36"; depends=[dplyr httr jsonlite]; }; genderBR = derive2 { name="genderBR"; version="1.1.0"; sha256="0j5wsbv797wc48lc65yhaqhpwqyr662460vj59x7r9p7d7m1ncd0"; depends=[dplyr httr jsonlite]; }; - genderizeR = derive2 { name="genderizeR"; version="2.0.0"; sha256="0r9r5x93zr58sfrww3l2vyvjyj8lir2yds08y6dzf88rs9v15w3c"; depends=[data_table httr magrittr stringr tm]; }; + genderizeR = derive2 { name="genderizeR"; version="2.1.0"; sha256="00qx2va1sm4d7v2z8kyq59rnm451v131wm1f2klk6blv4pi6x6db"; depends=[data_table httr magrittr stringr tm]; }; gendist = derive2 { name="gendist"; version="2.0"; sha256="0rs0sn1sb6j3pk2xncix04a093awlm2nw70g0rjhr7dlzmigspgb"; depends=[]; }; + 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]; }; geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; }; @@ -7405,6 +7495,7 @@ in with self; { 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.3"; sha256="0r1iqwm5jh93lbh87ks5qm4qqsp98928vg7qmv1pkahdlvl3ramw"; depends=[diagram mice plspm quantreg]; }; + genpwr = derive2 { name="genpwr"; version="1.0.0"; sha256="0wnr4xxjmxp7fs65frwrm2ajcg1pc1f7rsj0jxi102wpy1d93h8q"; depends=[ggplot2 MASS nleqslv]; }; genridge = derive2 { name="genridge"; version="0.6-6"; sha256="1hqarvd767h2vbjqfjzdr0548hxj87kv1073hfqyq5fybdlzsjx3"; depends=[car]; }; gensemble = derive2 { name="gensemble"; version="1.0.1"; sha256="03ql1qxrxixr70hs9mwiqw92qyrg9pj4046pb42g435yncw321ad"; depends=[]; }; gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; }; @@ -7417,9 +7508,9 @@ in with self; { geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; }; geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; }; geodetector = derive2 { name="geodetector"; version="1.0-3"; sha256="1x6mr05976vdxxgcb4fd3v7mq2lanrl44nqz6f6rk2dy3yhdqi5c"; depends=[maptools rgdal rgeos sp]; }; - geodist = derive2 { name="geodist"; version="0.0.1"; sha256="15x0p34qcac8v2ldf7hs4h28z44hvjqqidf5g0x2k6rz7692aqpd"; depends=[]; }; + geodist = derive2 { name="geodist"; version="0.0.2"; sha256="1knf9kbxiqpavrlna3r1mw53wjjisvxvrahzc2r0rjq4i6r7ivy7"; depends=[]; }; geoelectrics = derive2 { name="geoelectrics"; version="0.2.0"; sha256="1dmpaf16750ni4yr36cglfz9pv9jax8jxb3kwn47kxgnx3l8qq98"; depends=[fields lattice rgl]; }; - geofacet = derive2 { name="geofacet"; version="0.1.9"; sha256="0z9xd24hn9j8azd4kal81lz72zy6vv9rvwx1jsmkq7z7f1wwly48"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sp]; }; + geofacet = derive2 { name="geofacet"; version="0.1.10"; sha256="07viqfm8h469zjmpk4vp6zxmvwdcsn2wi0j8plyx1nirmxl7s0mw"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sp]; }; geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; }; geogrid = derive2 { name="geogrid"; version="0.1.1"; sha256="0b8afwgj9x56z6zh525y7qkiwbv77mjcw3v19kfba0426jn4vi87"; depends=[Rcpp RcppArmadillo rgeos sf sp]; }; geojson = derive2 { name="geojson"; version="0.3.2"; sha256="0iqf8jkqgl97a07v8ixr2pbvamwyjswqckdwl3kkxgx7bycndprv"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; @@ -7432,15 +7523,16 @@ in with self; { geomedb = derive2 { name="geomedb"; version="0.2"; sha256="1nsf7xzqayk8zbw3b6xpgiqk2w2kzc896gjswzxq128xw05cia0a"; depends=[ape httr]; }; geomerge = derive2 { name="geomerge"; version="0.3.1"; sha256="0pvyhpv4vq8mvvlybxhviq8rbazw29dgf9m0xnldaxg9r6lqdp4d"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; geometa = derive2 { name="geometa"; version="0.4-0"; sha256="0lcm5ndgx0y1d83813xxfp06j1x1lnh388v6npv4a3n0ln4kczwn"; depends=[httr R6 XML]; }; - geometry = derive2 { name="geometry"; version="0.4.0"; sha256="0lpih1a93jz021krdv78zf6fq95g8i0xw4r9aj5gq36a0vzc3i0y"; depends=[lpSolve magic Rcpp RcppProgress]; }; + geometry = derive2 { name="geometry"; version="0.4.1"; sha256="0v3ivaw8vbjyxg08dd573qk3kqfyknj5hli9503dza6p6xz0dzmm"; depends=[lpSolve magic Rcpp RcppProgress]; }; geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; }; - geomorph = derive2 { name="geomorph"; version="3.0.7"; sha256="1q9qdpb08kfs1xs5s9xjxh98wb3hqilqynwzihlz1hsv38p99y38"; depends=[ape geiger jpeg Matrix rgl RRPP]; }; + geomorph = derive2 { name="geomorph"; version="3.1.1"; sha256="1gd1vww5xqhy8ss5lmszg0hw9rxd09pyzgh8ndh0h41k2h0j5clf"; depends=[ape jpeg rgl RRPP]; }; geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; }; geonapi = derive2 { name="geonapi"; version="0.2-0"; sha256="1d3dxmnxdmdbz4kfg87mrk6ddachgb0fqvmhpscfzagwfhcs19zw"; depends=[geometa httr openssl R6 XML]; }; + geonetwork = derive2 { name="geonetwork"; version="0.3"; sha256="0qjnv91rcxzw44fmbgm4qpcrbj5qgz1lgmyw53imyhxgyv55awxv"; depends=[geosphere igraph rgdal sf sp]; }; geoops = derive2 { name="geoops"; version="0.2.0"; sha256="0n9n0j849jbqv6y6lqhyhddr5zfz8i9yi03gpg9862nzkvxd3c4k"; depends=[Rcpp]; }; geoparser = derive2 { name="geoparser"; version="0.1.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; }; geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; - georob = derive2 { name="georob"; version="0.3-7"; sha256="1bs54qmj9qwh0pxllmsvc6camw8mk44538yhm164xbm9l344s1vz"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; + georob = derive2 { name="georob"; version="0.3-8"; sha256="0d24ld42dxfs73jqwxvnf8dwjzmd30jffym29rckprip5dsinrbp"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; geosample = derive2 { name="geosample"; version="0.2.1"; sha256="1gpzrsza8ys2jdazb2ixc70y1w5lrkahlmvws1i071zby1la01iy"; depends=[pdist sf sp splancs]; }; geosapi = derive2 { name="geosapi"; version="0.3-0"; sha256="0yl2iaynhx0zgfcfkqp9hbyjh27fzhyra7q30ks9v48s0rhjv1mx"; depends=[httr openssl R6 XML]; }; geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; }; @@ -7452,7 +7544,8 @@ in with self; { geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; }; geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotoolsR = derive2 { name="geotoolsR"; version="1.0"; sha256="1arbyb1q96ya3smn9sqzqji5v21x37iyyxmvlmqmjj75an8ix5dp"; depends=[dplyr geoR ggplot2 tidyr]; }; - geotopbricks = derive2 { name="geotopbricks"; version="1.4"; sha256="1jqkdhljf0syfvkcy7wgaccrhp3hfx0kymw3vyckhmf1dkwbjvyj"; depends=[raster rgdal stringr zoo]; }; + geotopbricks = derive2 { name="geotopbricks"; version="1.5.3"; sha256="06mi13gzilp844bramrly9ar52vs3747m3236g0bwjy3b7gqdq9c"; depends=[raster rgdal stringr zoo]; }; + geoviz = derive2 { name="geoviz"; version="0.2.0"; sha256="19rglqzad9mv5wq87apilxq8vrdpb86dq0xx88jjhdk7rydkz01g"; 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]; }; @@ -7468,11 +7561,11 @@ in with self; { getTBinR = derive2 { name="getTBinR"; version="0.5.7"; sha256="08hs3k2qr0wf7bsv74765ddlfg7m5dap7yzpm5vh1jar6xdn2vzj"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble tidyr viridis]; }; 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.1.1"; sha256="14w0n658s624anvxv7sqcgy6vfaaxcc7fj4xi1k2qrxd9rdh6dza"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; - getopt = derive2 { name="getopt"; version="1.20.2"; sha256="13p35lbpy7i578752fa71sbfvcsqw5qfa9p6kf8b5m3c5p9i4v1x"; depends=[]; }; + getmstatistic = derive2 { name="getmstatistic"; version="0.2.0"; sha256="0rxj1dyfqy3fw2jhv05sw9x70p67rxmq3aqffymzal61rz6cnr3y"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; + getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; gets = derive2 { name="gets"; version="0.18"; sha256="0sg51xkiw3w3lzgmbkvv6zfr41fc4krs4dxajj2m64hv4zfl2cj6"; depends=[zoo]; }; gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; }; - gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; + gfcanalysis = derive2 { name="gfcanalysis"; version="1.5.0"; sha256="1cg34c4hr8kwc23qlv2m6qw2k7ah4w8s70q0hf4hnvp66rw4kaqh"; 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]; }; gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; @@ -7486,7 +7579,8 @@ in with self; { ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; ggalluvial = derive2 { name="ggalluvial"; version="0.9.1"; sha256="0np4dwhxz9q3p9y1w45fyvs4cphi50mbgi9wrinpi3k5i3anv6zf"; 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]; }; - gganimate = derive2 { name="gganimate"; version="1.0.2"; sha256="0i3iz9rn8kdxk8lcimmm5a8ily46h2qzddkkk06071f2h71j8gsy"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; + gganimate = derive2 { name="gganimate"; version="1.0.3"; sha256="0ngx4xjq0zvjf4fi433qyk8nxk1zvkimll0z6hs48y9k6b5mi4ch"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; + ggasym = derive2 { name="ggasym"; version="0.1.1"; sha256="01mx5yz2b4y4vh76gq323pf66r5a6d0x5pbdzfaiakiav3hdw9gf"; depends=[broom 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]; }; ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; }; @@ -7495,18 +7589,17 @@ in with self; { ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; }; ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; }; ggdistribute = derive2 { name="ggdistribute"; version="1.0.3"; sha256="07bsnfp1chf52gprw7g5kyqf6l6yzmnlv13x9dj1wa6rjwq1342i"; depends=[data_table dplyr ggplot2 magrittr tibble]; }; - ggdmc = derive2 { name="ggdmc"; version="0.2.5.2"; sha256="0gswv1f1g24z34wza6fsnj1408yjvc2na1y3wnk2xi8ccqf6rj8g"; depends=[BH coda data_table ggmcmc ggplot2 matrixStats Rcpp RcppArmadillo rtdists tmvtnorm]; }; gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; }; ggedit = derive2 { name="ggedit"; version="0.3.0"; sha256="1v9apfkm47jcqyhjrvv8ig09gz6zsss5xj5mrckfjybd5ca08rzn"; depends=[colourpicker dplyr ggplot2 magrittr miniUI plyr purrr rlang rstudioapi scales shiny shinyAce shinyBS tidyr]; }; - ggeffects = derive2 { name="ggeffects"; version="0.8.0"; sha256="152xyadj5m171z7dlzzy40y1fp2l9v46525dlw2al3qr0b7zpm61"; depends=[crayon dplyr ggplot2 lme4 magrittr MASS prediction purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + ggeffects = derive2 { name="ggeffects"; version="0.9.0"; sha256="1bbr44yk1j8pz4kcbw1cqrzcnbih9n6rsgf96a6py5094qcal2qd"; depends=[dplyr insight magrittr MASS purrr rlang scales sjlabelled sjmisc]; }; ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggetho = derive2 { name="ggetho"; version="0.3.4"; sha256="05wh0qk5cbcvcfgj5wf12qqbjgl1bbwcxywc16qdby7r4h5wy0gn"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; }; ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; }; ggfittext = derive2 { name="ggfittext"; version="0.6.0"; sha256="06zhzw7yw7i08pqb9an8gsbf7qmvf9la8s8k1zgril8jsqwf6sfl"; depends=[ggplot2 stringi]; }; ggfocus = derive2 { name="ggfocus"; version="0.9"; sha256="03adq3pdhlgckqc20aw6r70kdcrw0v4rmm848ivv6wkck4qyla3m"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; }; - ggforce = derive2 { name="ggforce"; version="0.2.0"; sha256="1xffc50vx437r798p3fanznyzzdg2ckw8rnj2kp7bi3mrx5sg9ky"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tweenr]; }; + ggforce = derive2 { name="ggforce"; version="0.2.1"; sha256="04rh9z58q288lbi933472lgl26wwbw58rfhpgfyijmw9ccz7i93m"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tweenr]; }; ggformula = derive2 { name="ggformula"; version="0.9.1"; sha256="01ngx8qh9lhmagng6abx2ky54zi3iyj5bpxlnw59slagwv7l6icx"; depends=[ggplot2 ggstance magrittr mosaicCore rlang stringr tibble tidyr]; }; - ggfortify = derive2 { name="ggfortify"; version="0.4.5"; sha256="1mqgikpg34czz0zj4q3yh4xq9iw2x9zkz00ss27r6pmi6zipb6rm"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; + ggfortify = derive2 { name="ggfortify"; version="0.4.6"; sha256="1clyha9f9ygma64xbgi78lxsp1203f2ashqhhdpm71nr6w91bm88"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; gggenes = derive2 { name="gggenes"; version="0.3.2"; sha256="19hpb8mi690482w6syqhyzrykipym0l92prcqvqc0x7szsvp26g9"; depends=[ggfittext ggplot2 rlang]; }; ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; }; @@ -7514,7 +7607,7 @@ in with self; { gghighlight = derive2 { name="gghighlight"; version="0.1.0"; sha256="1mfjvfm5xbih7k7qz6x8akbqgh0b18dz9pybfgh7rbq2ppwnhpy9"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang tibble]; }; ggimage = derive2 { name="ggimage"; version="0.2.1"; sha256="1713xghrc77y8s7gwvjwz6w70psmrqxgk7sph5jzsfvjfjdnl3xv"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; }; gginference = derive2 { name="gginference"; version="0.1.0"; sha256="0dikyqryz25ikm047clkwn0ihlxa5zia2bxp71fh8ynxxvzixz3k"; depends=[ggplot2 rlang]; }; - gginnards = derive2 { name="gginnards"; version="0.0.1"; sha256="1yn5qfzih4caba8ilb1pkxzrrxcb0gia4kan7ch2yqdgi1jxqyhq"; depends=[ggplot2 magrittr rlang stringr tibble]; }; + gginnards = derive2 { name="gginnards"; version="0.0.2"; sha256="10a4mrp2sn9c1s1bjyk8h9fxd9a2qqsggpcb2spgcha37mhz8cak"; depends=[ggplot2 magrittr rlang stringr tibble]; }; ggiraph = derive2 { name="ggiraph"; version="0.6.0"; sha256="1scz1c2272k1988qfnnd2dp90q7cah916007n9r7id2anc8fvavv"; depends=[gdtools ggplot2 htmltools htmlwidgets Rcpp xml2]; }; 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]; }; ggjoy = derive2 { name="ggjoy"; version="0.4.1"; sha256="012md2m0jqfcccb933j423m3ck31v3p0pd41gjxpyg9082y7ixyj"; depends=[ggplot2 ggridges]; }; @@ -7528,18 +7621,19 @@ in with self; { ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; }; ggmuller = derive2 { name="ggmuller"; version="0.5.3"; sha256="0qcphgal4c28lcwa1qdbryk40rkqpd4hz6phvcp6jy0n75lqi9f3"; depends=[ape dplyr ggplot2]; }; ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; }; + ggnewscale = derive2 { name="ggnewscale"; version="0.2.0"; sha256="0n6isxw85lr0k9nzq5vnjjhpf53ldc1q4lg9n0np0yv9lkxwxyp1"; depends=[ggplot2 stringi]; }; ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.1"; sha256="0fv6v41i3xlnxyjlv1vw22fl7y98xa1afr6smcxp7hfy29qgyrk1"; depends=[dplyr ggplot2 magrittr scales]; }; ggpage = derive2 { name="ggpage"; version="0.2.2"; sha256="0azf19dhc8zawm7hgsf866j3s028ybcfpmpmna86ly6z8d4j09xf"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tidytext]; }; 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]; }; - ggperiodic = derive2 { name="ggperiodic"; version="0.1.0"; sha256="0fk4nns2rffv9q3904xq81spv5160l2ddzrhs8s96h041fxwgd0z"; depends=[dplyr ggplot2 sticky tidyselect]; }; + ggperiodic = derive2 { name="ggperiodic"; version="1.0.0"; sha256="1cig715qy1kjjrn89cf505njdl2xccvjc5l0fwbqh86xgjayslxb"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; ggplot2 = derive2 { name="ggplot2"; version="3.1.0"; sha256="1msy36r21nlmnpyaw2m9k0ykmnd19b9il01b65w457pfw75prrs9"; depends=[digest gtable lazyeval MASS mgcv plyr reshape2 rlang scales tibble viridisLite 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.3"; sha256="14hqlpvnaq5psz1ljcpw9isa06827rg3fm5c1dx159rsjfi56yby"; depends=[ggplot2 gridGraphics rvcheck]; }; - ggpmisc = derive2 { name="ggpmisc"; version="0.3.0"; sha256="1mmqz3qb9j77rlxlcrki21l0s4qr2h10bk810a40jxadiv2lqbcz"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang splus2R tibble xts zoo]; }; - ggpol = derive2 { name="ggpol"; version="0.0.4"; sha256="163rhms5hclp3hp2vwamvkmngv81rgg6w4l4hw10jrv5pcs3ybyy"; depends=[dplyr ggplot2 gtable plyr rlang]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.3.1"; sha256="1kcjdpq7xz3609prbcf3ikj87wgcq9rk1pzhb62bh885plczsfz2"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; + ggpol = derive2 { name="ggpol"; version="0.0.5"; sha256="0n54mmk9alc3bd9q3jb64xvxnszqndfwpi6h6n09gpvlrbj8mkdx"; depends=[dplyr ggplot2 gtable plyr rlang]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; ggpubr = derive2 { name="ggpubr"; version="0.2"; sha256="0rkpcjb1x7lvhj68aam5airbi534jqyiq12x5xk40a25iifhghq6"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr scales tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.1"; sha256="1akhndl08nq97nvz2gzblfqsrjpxx1m632f3469mab9z1jcvaz57"; depends=[data_table ggplot2]; }; @@ -7550,6 +7644,7 @@ in with self; { ggrasp = derive2 { name="ggrasp"; version="1.0"; sha256="0lini89mcxl30kx38vny9896hdf4afrz5dgivbbikkb2yyfh2cq1"; depends=[ape bgmm colorspace ggplot2 mixtools]; }; ggrepel = derive2 { name="ggrepel"; version="0.8.0"; sha256="1m3p84d6nh9mzzvxb82vgig3ngcvkz86rjwzl9a66ckdf5p611k3"; depends=[ggplot2 Rcpp scales]; }; ggridges = derive2 { name="ggridges"; version="0.5.1"; sha256="0dhwcpy785ac2ny5bjp284595nnybi3554wd0yffsli0vzf7ry01"; depends=[ggplot2 plyr scales withr]; }; + ggroups = derive2 { name="ggroups"; version="1.1.4"; sha256="0hvz6ndg24q9v7pv8c9h0p3j5j7bnyx05095bdds66p5ig4i5pfv"; depends=[]; }; ggsci = derive2 { name="ggsci"; version="2.9"; sha256="0g73x6grbka7ahjh6z23m3wrcifp5rdfdiasbl8lq4sp6rplxwaa"; depends=[ggplot2 scales]; }; ggseas = derive2 { name="ggseas"; version="0.5.4"; sha256="1jpdijwll5l7bg7cmjnklkxffysi9ckzg50rw2a2cd00zwby11q9"; depends=[ggplot2 rlang seasonal zoo]; }; ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; }; @@ -7560,7 +7655,7 @@ in with self; { ggspatial = derive2 { name="ggspatial"; version="1.0.3"; sha256="0ka15qj3f0yq9nfkgk77wp490nz9ymi80918apv9zp6x39kcprj9"; depends=[abind ggplot2 plyr raster reshape2 rlang rosm scales sf tibble tidyr]; }; ggspectra = derive2 { name="ggspectra"; version="0.3.2"; sha256="1pzxxbi5mpgkv97mh4x6jxipg7rnh3fwn4x4iwzkhl13ccbrv12n"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; }; ggstance = derive2 { name="ggstance"; version="0.3.1"; sha256="0v7f3xdaaridw6d4jvnsfwxmpjrasvx5vl555wsrn50aah17fkvh"; depends=[ggplot2 plyr rlang withr]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.9"; sha256="102vbp1yaqza103jc1awksnkp50zz0d2vb4bphi1jhmapw55wkb1"; depends=[BayesFactor boot broom broom_mixed cowplot crayon dplyr ellipsis exact2x2 ggcorrplot ggExtra ggplot2 ggrepel ggsignif glue groupedstats jmv magrittr metafor paletteer psych purrr purrrlyr rlang scales sjstats tibble tidyr WRS2]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.10"; sha256="0jjxhh7l2hkchq3x52nk87vmqsmjsf321fxw9nh1xvciwxyfrqag"; depends=[BayesFactor boot broomExtra cowplot crayon dplyr ellipsis ez ggcorrplot ggExtra ggplot2 ggrepel ggsignif glue groupedstats jmv magrittr metafor paletteer psych purrr purrrlyr rcompanion rlang scales sjstats stringr tibble tidyr WRS2]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; ggtern = derive2 { name="ggtern"; version="3.1.0"; sha256="1fhs5s3sxhb46abzni7cyymyknk9z7ff8fanln41pkih76s5i18j"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; ggthemes = derive2 { name="ggthemes"; version="4.1.0"; sha256="1a6r384v72hb91qkg9rz2m7s3qskbl9haxynf2vzz6v1ak9xd4c5"; depends=[ggplot2 purrr scales stringr tibble]; }; @@ -7570,7 +7665,7 @@ in with self; { ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.3"; sha256="04dv33vnip0rrli1diq43v7vhr86bmxjdyxjbxz5x4371kbb312j"; depends=[deldir ggplot2 raster rgeos sp]; }; ggwordcloud = derive2 { name="ggwordcloud"; version="0.3.0"; sha256="0bndv4vfan0cx2lpa0qhkfaz4dmp6rda1mgc3vz0vhkg9v3x96k6"; depends=[Cairo colorspace ggplot2 png Rcpp scales]; }; gh = derive2 { name="gh"; version="1.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; }; - ghibli = derive2 { name="ghibli"; version="0.1.2"; sha256="1cp1kdfya11qrm5wy1mr9a98dwkkw3ssjzj2ycgna0rrsml6cawk"; depends=[ggplot2]; }; + ghibli = derive2 { name="ghibli"; version="0.2.0"; sha256="1wikcipj1gd45a0a22i7bf4j25ixv2q9ppyfdv41vfg86fzri59f"; depends=[]; }; ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; }; gibble = derive2 { name="gibble"; version="0.1.2"; sha256="0nkpjgb9paj35z4088rfvirs6z5ky7pkgnjpqqz5shgrz0ycimlh"; depends=[dplyr tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; @@ -7582,10 +7677,10 @@ in with self; { gimms = derive2 { name="gimms"; version="1.1.1"; sha256="06vq0apsadyfgnz7906v2kjy0nx3yn0agq4yschxz1r1zmgrnyki"; depends=[curl Kendall ncdf4 raster RCurl zyp]; }; giphyr = derive2 { name="giphyr"; version="0.1.3"; sha256="0q83my4l90873d1vbv42rqyajcnr0rjgp4jcxy77cha0l5rxjsyg"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; }; gistr = derive2 { name="gistr"; version="0.4.2"; sha256="0bh325pf37v307isdlvdglripfki8xr6gh7n8mgi4cjparzhrh23"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; }; - git2r = derive2 { name="git2r"; version="0.24.0"; sha256="0vfc25z4j53pc49cnp3zjwzjb72kvc0aq96wgyg10xpgvhl3z0gg"; depends=[]; }; - gitgadget = derive2 { name="gitgadget"; version="0.2.1"; sha256="02jmp5lnk156sfqlv91jn42xds98ihya1x2f97cfwpzlas5qrxky"; depends=[curl dplyr jsonlite miniUI rstudioapi shiny]; }; + git2r = derive2 { name="git2r"; version="0.25.2"; sha256="15kpvz6ry2r8ii5hzinjwkggc5kgmkbcpsdwzahsf8gha52w80p0"; depends=[]; }; + gitgadget = derive2 { name="gitgadget"; version="0.4.0"; sha256="0v6a205x493zycw4ky6ji8zd81jyw0ia47bxyklmiapxrzx8mpbd"; 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]; }; - gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; + gitlabr = derive2 { name="gitlabr"; version="1.1.6"; sha256="1p68w0q8mjpz2hr6ys1qbfw1y4b35hgs27kzfkzv9hfi1vxqfd1h"; depends=[arpr base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; gjam = derive2 { name="gjam"; version="2.2.6"; sha256="16csy2vr4ly09f5nqwad1ik1nj0yhmxs1jj1rjqdi2ramh4jlwlx"; depends=[MASS RANN Rcpp RcppArmadillo]; }; @@ -7598,7 +7693,6 @@ in with self; { glasso = derive2 { name="glasso"; version="1.10"; sha256="0nshpx14v2yny7lr8ll6nnz71n0f02sddh2c2dglfprbk89p9yp6"; depends=[]; }; glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; }; glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; - glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; }; gld = derive2 { name="gld"; version="2.4.1"; sha256="0ycm3w8s5bm5w2lqy0qa877cwjcwc9x1zyyyrknwwjjxip250iaw"; depends=[e1071 lmom]; }; gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; glinternet = derive2 { name="glinternet"; version="1.0.8"; sha256="06ak80j01cbrr6s8hmcc734z476rrqzib0xqjgv7c3jbw0api71y"; depends=[]; }; @@ -7610,6 +7704,7 @@ in with self; { glmBfp = derive2 { name="glmBfp"; version="0.0-51"; sha256="15jm450j1f0nl7vqvpb2mwapdlvn7kq2kxf5s96x21siwsz7sssv"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; }; glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; }; glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; }; + glmdisc = derive2 { name="glmdisc"; version="0.1"; sha256="1psmcgd5g6v3nq2npl3rvp2ag6g8nqcjgdkknv0b5qwkrpin8mpy"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; }; glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; glmertree = derive2 { name="glmertree"; version="0.1-2"; sha256="0p498kg873m7g90a05ki2zbki61f3ppnv874p79hlnm24hricasa"; depends=[Formula lme4 partykit]; }; glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; }; @@ -7639,7 +7734,7 @@ in with self; { glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; }; glpkAPI = derive2 { name="glpkAPI"; version="1.3.1"; sha256="06p8zvmshymcw994mmf1ar00kfj645z8dp18yy4i5bl6qydbpb8k"; depends=[]; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; - glue = derive2 { name="glue"; version="1.3.0"; sha256="1vhw5497lpfr4m8lcx9bs0fgdp4ax0sycrk6n8yksp33qd25m7kq"; depends=[]; }; + glue = derive2 { name="glue"; version="1.3.1"; sha256="1a1ycg9r3gd91visp49q49rsrdgyf8kr9dxdy3hk99kikn4z5hag"; depends=[]; }; gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; }; gma = derive2 { name="gma"; version="1.0"; sha256="08hxbs9z4vq5zjis0lgdcvlysaj1k7i0icdk3wsyqf3wd9znsibi"; depends=[car MASS nlme]; }; gmailr = derive2 { name="gmailr"; version="0.7.1"; sha256="1gniwwl0ci0wm7a3ai2lqrr590smmkdgyf3aarw6bdygn8hr3s3y"; depends=[base64enc crayon httr jsonlite magrittr mime]; }; @@ -7651,7 +7746,7 @@ in with self; { gmm = derive2 { name="gmm"; version="1.6-2"; sha256="0pbimp4g5hpi949m6dpwwds3a9dv2m4iwwg2gbqq1m62fs18hbxi"; depends=[sandwich]; }; gmnl = derive2 { name="gmnl"; version="1.1-3.1"; sha256="01mman2nh7wzlhh89iwaskz9n15v3p5llid5557dwmqn8ybzsdvx"; 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.5-13.4"; sha256="15jifzwbzqcnq2apzvsylkx4k9lillkgblm4wf4wb7y31ys0amph"; depends=[]; }; + gmp = derive2 { name="gmp"; version="0.5-13.5"; sha256="042mzsl6z6s61fy5m21yf9q83l08vnyqljn4iax7kqyiycpsp0gn"; depends=[]; }; gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; }; gmvarkit = derive2 { name="gmvarkit"; version="1.0.3"; sha256="1497n11a7m5mbb8d3hcr89yhfh64vqsxi2w6kvlrxmmx95q2cp70"; depends=[Brobdingnag mvnfast pbapply]; }; gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; }; @@ -7699,7 +7794,7 @@ in with self; { 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]; }; gpr = derive2 { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; }; - gprofiler2 = derive2 { name="gprofiler2"; version="0.1.0"; sha256="0h875bdsbccn24hspha7lbpx4b98341iwzr3ns17av4kc6i3i9y0"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; }; + gprofiler2 = derive2 { name="gprofiler2"; version="0.1.1"; sha256="00m7gz4fmi8dvabyc6sr30ca98kfyvmx1hjb8hpn83f6q9ws0j7y"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; gpuR = derive2 { name="gpuR"; version="2.0.0"; sha256="1aq9gmnl69yw7124nr8jaih7598gkknp7krmdsnx600i4k37yzjs"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; gqlr = derive2 { name="gqlr"; version="0.0.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; }; @@ -7720,15 +7815,15 @@ in with self; { graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; }; graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; }; + graphlayouts = derive2 { name="graphlayouts"; version="0.1.0"; sha256="121fsp8bmvahxckrh8b042w2f3xrfp3yp65453scxhckc9amzc7l"; depends=[gbp igraph oaqc Rcpp scales]; }; graphon = derive2 { name="graphon"; version="0.3.1"; sha256="0hi8zsmbvgb34dx9hcc6fx67f1kasj9hm1qhhkg785phf32zdj8x"; 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]; }; - gratia = derive2 { name="gratia"; version="0.2-1"; sha256="0c8gzjyn5p6k1qpsnf1kzby1w76lndlzpahfyi8hk0ccdhvyv78p"; depends=[cowplot dplyr ggplot2 mgcv mvtnorm tibble tidyr]; }; + gratia = derive2 { name="gratia"; version="0.2-8"; sha256="1diijk4s0x29aq7l8bjx5canjykj9xlsr7rajvj0jjxx7i9jaw56"; depends=[cowplot dplyr ggplot2 mgcv mvtnorm tibble tidyr]; }; graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; }; - grattan = derive2 { name="grattan"; version="1.7.0.0"; sha256="1jy3yafymznb2bnjy9njh3sn422vsmmdlzs2is941y3syzji6l84"; depends=[assertthat data_table fastmatch forecast hutils ineq magrittr Rcpp rsdmx zoo]; }; + grattan = derive2 { name="grattan"; version="1.7.1.0"; sha256="1y74c1qkyg5v0yb6vbqd73pi53qv4wvbhwkxpqrij5fgndxr4wib"; depends=[assertthat data_table fastmatch forecast hutils ineq magrittr Rcpp rsdmx zoo]; }; gravity = derive2 { name="gravity"; version="0.9.0"; sha256="1jp4mr4jnb9bqbjv2bs40qnag2l77nylg8y94yv6p4gwh6l6l9dm"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; }; grec = derive2 { name="grec"; version="1.2.2"; sha256="0xr17xq4hvl6zaajj04cwymmpzfnbwb86z0ziarj5bc5wjfw0yb2"; depends=[imagine raster]; }; - gremlin = derive2 { name="gremlin"; version="0.1.0.0"; sha256="04s770rwb0qmh394r8m9dwziwvy7famagcaargpj18qclkgnjh95"; depends=[Matrix]; }; gren = derive2 { name="gren"; version="0.0.1"; sha256="1wb5wwdjxi7q36md7xzmbw5lrggcgghkz3pmxipjpxw8kfv804xp"; depends=[glmnet Iso pROC Rcpp RcppArmadillo]; }; greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; greta = derive2 { name="greta"; version="0.3.0"; sha256="03yjf8cs4z2y1pjl7qvv2icp16f5xykd725mf1vs4zk04asq4xna"; depends=[coda future progress R6 reticulate tensorflow]; }; @@ -7752,7 +7847,7 @@ in with self; { groupdata2 = derive2 { name="groupdata2"; version="1.0.0"; sha256="11j5p3afr5qc227ljdwwwp17jzaylqlhc7g0gr3jvgrhjnijs2a0"; depends=[dplyr numbers plyr]; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; groupedSurv = derive2 { name="groupedSurv"; version="1.0.3"; sha256="15ah8v1mfyq9xi27kkl0vwwbhf16vd4hy9h809jlw1i7b1zwg4pm"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; }; - groupedstats = derive2 { name="groupedstats"; version="0.0.5"; sha256="053rpxcymhbvanl9mxzdm4bkkkg6yxjg0xd205ib3kxa2xdssxxr"; depends=[broom broom_mixed crayon dplyr glue lme4 magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; }; + groupedstats = derive2 { name="groupedstats"; version="0.0.6"; sha256="0scb4k6kq9k065bg0g0n8il5m0f3anhw25lppz1xajydy0dx6nrc"; depends=[broom broom_mixed broomExtra crayon dplyr glue lme4 magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; }; groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; }; grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; }; growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; }; @@ -7764,6 +7859,7 @@ in with self; { growthrates = derive2 { name="growthrates"; version="0.7.2"; sha256="1szyc85gi0wgg98br53lxqpamic1srvfiyq1m818j38xnlyj1lxw"; depends=[deSolve FME lattice]; }; grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; }; grplasso = derive2 { name="grplasso"; version="0.4-6"; sha256="0xr6plgnc3lp93rd4jk4dqjix8kgl8s2b68fh41k6jwd5y8d7pks"; depends=[]; }; + grplassocat = derive2 { name="grplassocat"; version="1.0"; sha256="0pi5vq7yqg0ha91y6296ckshxyq3135cg6zcs9x6xba5m5024k4p"; depends=[grplasso]; }; grpreg = derive2 { name="grpreg"; version="3.2-1"; sha256="126b2gblclp62xv8r54lqg3crd3317bqacr70whmhnadlwcpgqvb"; depends=[Matrix]; }; grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; }; grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; }; @@ -7774,12 +7870,12 @@ in with self; { gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; }; gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; }; gsbDesign = derive2 { name="gsbDesign"; version="1.00"; sha256="1kbwlpxbr70aagx9jkap9xlw13r1k3y630b08wmmny421sv4zhxl"; depends=[gsDesign lattice]; }; - gscounts = derive2 { name="gscounts"; version="0.1-1"; sha256="1x2irpp0jxninijdhsiw12j19c5yq9kljv48j81sp3k97s2f9vbd"; depends=[Rcpp]; }; + 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]; }; gsg = derive2 { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; }; gsheet = derive2 { name="gsheet"; version="0.4.2"; sha256="1mfpg91855qg0bi6wk0wy58b58lm06jw9fqdl6psqdvnmaf7n2w5"; depends=[httr stringr]; }; gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; - gsl = derive2 { name="gsl"; version="1.9-10.3"; sha256="00isw2iha5af4s7rr8svqka9mkl9l26l8h2rnk4r7fkhh7fc97sg"; depends=[]; }; + 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=[]; }; gsrsb = derive2 { name="gsrsb"; version="1.0.3"; sha256="1r4pc3zcmgwxbsmpwb6m24mmy0p78nq35bigjqvwcc32imyw4ls9"; depends=[ldbounds mvtnorm xtable]; }; @@ -7791,9 +7887,10 @@ in with self; { gsynth = derive2 { name="gsynth"; version="1.0.9"; sha256="1m9s3gymm0z6frfzmz7kv8cbdnla2vp4aam5b2zzcxwflzwbplm3"; depends=[abind doParallel foreach GGally ggplot2 MASS mvtnorm Rcpp RcppArmadillo]; }; gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; gtWAS = derive2 { name="gtWAS"; version="1.0.0"; sha256="1pk7m1apgksbh8a3xb94aj3wp9dbcv5rm6brdcjb5fsgxj7iaq5c"; depends=[]; }; - gtable = derive2 { name="gtable"; version="0.2.0"; sha256="0vz7073m0a2q12qzzihrfh5c2kx5jqi5l7z470fxmwqghdllh7l0"; depends=[]; }; + 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]; }; + gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.1"; sha256="0znr0hw6f8wxy3vj944lrlsb0a70w2p20gw50jr2ij9xikawh2ih"; depends=[data_table Rcpp]; }; gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; }; gtools = derive2 { name="gtools"; version="3.8.1"; sha256="0f5syk1qq6cjq6hwymvkiyhzwa389z94722v881ipbfqkd2q8505"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; @@ -7810,6 +7907,7 @@ in with self; { 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=[]; }; 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="1.0"; sha256="1pwdama457cjr764wlfqcsap5wjn6i613aqrhzpcd0ivi5r2b0vm"; 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=[]; }; @@ -7822,7 +7920,7 @@ in with self; { hBayesDM = derive2 { name="hBayesDM"; version="0.7.2"; sha256="0k1gcnjmblk8ign6fzv7cl9qv964mi6jaams5z22x82jnw1sx47c"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; hIRT = derive2 { name="hIRT"; version="0.1.3"; sha256="12rg4srh9s6a72gvb5f7qn9zar6yaqa7p0mfmazfqj353icrannd"; depends=[pryr rms]; }; 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.1.7"; sha256="0qy042a80l12z3bs38sknc7819cgclkfakbyhyxxz9mcfiy7kd7p"; depends=[data_table data_tree knitr rhandsontable shiny shinyFiles shinyjs]; }; + hR = derive2 { name="hR"; version="0.1.8"; sha256="0lj3ynxay3310hy8zj7pxa0plpgv4yg0ri0dg5gbwc2mz8yj9jbd"; depends=[data_table data_tree knitr rhandsontable shiny]; }; hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; }; haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; hablar = derive2 { name="hablar"; version="0.1.0"; sha256="0l7xb2z41ddm1dlq3f0k00wdskai17wcwfkia1y1k88vqjcakpzg"; depends=[dplyr]; }; @@ -7837,7 +7935,7 @@ in with self; { haploR = derive2 { name="haploR"; version="2.0.7"; sha256="1942xn79fimz42j5wl7r0f52jw9b99c9qhx0hhms9zn38xddvhv7"; depends=[DT httr plyr 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.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; }; + haplotypes = derive2 { name="haplotypes"; version="1.1"; sha256="0qnsrjzanyyiar8zpmwvfks3gj7cl8libnyg8bx983p25jwifcwl"; depends=[ape network pegas 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]; }; @@ -7868,8 +7966,8 @@ in with self; { hdbinseg = derive2 { name="hdbinseg"; version="1.0.1"; sha256="0fy9cqrygsnxkb3nxg56md19svrvkbijpxkqfk9p18cj5ibwrq94"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; hddplot = derive2 { name="hddplot"; version="0.59"; sha256="18llkpawm12cjxlcrlra60m16virfpjqiaqkvy9mb3wq1zif61rh"; depends=[MASS multtest]; }; hddtools = derive2 { name="hddtools"; version="0.8.2"; sha256="02gbqlzwxc77gllgz9sf2s73y4ngyb4warabdfyj2sm2g7jl6y12"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr tibble XML zoo]; }; - hdf5r = derive2 { name="hdf5r"; version="1.0.1"; sha256="0h222q80li8rs3cv4c5lvv3g91ygd51w43ay6fwyk9q9d315vwrj"; depends=[bit64 R6]; }; - hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; }; + hdf5r = derive2 { name="hdf5r"; version="1.1.1"; sha256="1cq4rdfd0rqvy29ml3x1iid142ljnscs8f4d2y1na13hlvkl3k05"; depends=[bit64 R6]; }; + hdi = derive2 { name="hdi"; version="0.1-7"; sha256="1q58bvlqh59hv3vb3dw92r0w1nwyifnqm5ccss54fzmf2gjsj1cj"; depends=[glmnet linprog MASS scalreg]; }; 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.2.2"; sha256="1slilv9kx36r8ss8pnarxmpass08ki40glvbnq4yn1lslmccrbma"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack]; }; @@ -7880,7 +7978,7 @@ in with self; { healthcareai = derive2 { name="healthcareai"; version="2.3.0"; sha256="0lyx9fldw28gx2lr2cpi7lyrwf5qz549v2vqxjx83ih5kxm6mlnp"; depends=[caret cowplot data_table dbplyr dplyr e1071 forcats generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; }; 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.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; }; + heatmap3 = derive2 { name="heatmap3"; version="1.1.6"; sha256="13aa9rd16k67b1fr6471bdz2a1i04k7279ck1i4rjdly9rbksnjx"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; }; heatmaply = derive2 { name="heatmaply"; version="0.15.2"; sha256="0h8s5djzj4mrmaswlcaap6jbwxrkbzc43bbqik3qf8vrqz335w04"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; heatwaveR = derive2 { name="heatwaveR"; version="0.3.6"; sha256="0bm6q4wgyvzs83hnkyhj21h422hpq5wnxajlp2bcrbmcr7r8nfwg"; depends=[data_table dplyr ggplot2 lubridate Rcpp RcppArmadillo RcppRoll tibble zoo]; }; @@ -7895,11 +7993,11 @@ in with self; { 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]; }; - hergm = derive2 { name="hergm"; version="4.0-0"; sha256="03qfl7zbn7rzb95bddwyxcwxb2jjxz4y7wh9gp8ga9lxj2q8hdqk"; depends=[ergm igraph intergraph latentnet Matrix mcgibbsit mlergm network Rcpp sna]; }; + hergm = derive2 { name="hergm"; version="4.1-0"; sha256="1myplvsw6iy970lcmy862srfspgymgi6wamh58fpg1ybkyjgw5qc"; depends=[ergm igraph intergraph latentnet Matrix mcgibbsit mlergm network Rcpp sna]; }; heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; hero = derive2 { name="hero"; version="0.0.3"; sha256="166jqxlp2x459ixm83kw55ssd86041qiwfymsk035r5aaf7nvjq1"; depends=[]; }; - hesim = derive2 { name="hesim"; version="0.1.0"; sha256="002phncl1glv3c3gwp9ifpk56j06rka26a3774xlj3zcs6izglns"; depends=[data_table Rcpp RcppArmadillo]; }; + hesim = derive2 { name="hesim"; version="0.2.0"; sha256="1pb6xlxp69jmzqmv2gxgn2wq5mz7xp4smhvqgmb3n4zhrwhzpk25"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; }; het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; }; hetGP = derive2 { name="hetGP"; version="1.1.1"; sha256="1f0lb91hb6lp9cfil1qpbqf032xv697jazcqyc1y694hdbx0jwqj"; depends=[DiceDesign MASS Rcpp]; }; hetmeta = derive2 { name="hetmeta"; version="0.1.0"; sha256="023bdjsv0ibisz47vaap9yamzjna4hhndk3haw2g1cm92wnrdra5"; depends=[metafor]; }; @@ -7907,12 +8005,14 @@ in with self; { hettx = derive2 { name="hettx"; version="0.1.1"; sha256="0zfxg88l83pzj37c5khpv4vi0v28fdnp0p8yz39scm8d8lya1dkm"; depends=[doParallel dplyr foreach formula_tools MASS moments mvtnorm plyr purrr quantreg tidyverse]; }; heuristica = derive2 { name="heuristica"; version="1.0.1"; sha256="1myivlqw6a8wh97ma9lrpgvaqb0vn4kj8yp9r4z5vc4pxgmm48g6"; depends=[Hmisc]; }; hexSticker = derive2 { name="hexSticker"; version="0.4.5"; sha256="1js6b7g4za3g6mcsf3znf0bps4qhg2h27cxg7cxcxj98mhyv8s8k"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; }; - hexView = derive2 { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; }; + hexView = derive2 { name="hexView"; version="0.3-4"; sha256="01hiqyibsd4as7jcklzg09pl12la341mg561vn16z4jzdarfvkfc"; depends=[]; }; hexbin = derive2 { name="hexbin"; version="1.27.2"; sha256="0lpfl0015lg5x7lvv9dr302bca22c7fs91pnd896ypgpzqg7pm26"; depends=[lattice]; }; hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; }; hflights = derive2 { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; hgam = derive2 { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; }; hglasso = derive2 { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[fields glasso igraph mvtnorm]; }; + hglm = derive2 { name="hglm"; version="2.2-1"; sha256="1lyxkvqzfll1qrz5c2km9ikhq0dm63x39by4vc1nmkd24yza93nc"; depends=[hglm_data MASS Matrix]; }; + hglm_data = derive2 { name="hglm.data"; version="1.0-1"; sha256="0mw1s0kahsh9jmwkxysfy5f7vbld7mpzmdnnww6im5h21jhnczx2"; depends=[MASS Matrix sp]; }; hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; }; hgutils = derive2 { name="hgutils"; version="0.2.5"; sha256="1wj2h1k1sfji5aph8r4pg94zlgq4rvxwilqhnp5q0pfvw8j656zh"; depends=[crayon limSolve magrittr stringr]; }; hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; }; @@ -7936,7 +8036,7 @@ in with self; { highlight = derive2 { name="highlight"; version="0.4.7.2"; sha256="0xc1akglgby3qd6c9y2rhcd0gpfihx5jvakji38vzlxb1m21sn10"; depends=[]; }; highlightHTML = derive2 { name="highlightHTML"; version="0.2.1"; sha256="06k2idx9aadjd6xp6kadm9jh7ap1hwg7vh0bc8vw9ll82wcp1nv1"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; - highr = derive2 { name="highr"; version="0.7"; sha256="1dzknqk4x7iiiq1jkh9bqm5qcvs7mbqxbkn5955050payavabfya"; depends=[]; }; + highr = derive2 { name="highr"; version="0.8"; sha256="0my6idnhmmgs4q1vs40y2lh56yij2p59mpwvm53wjs2zk6x1zl2b"; depends=[]; }; highriskzone = derive2 { name="highriskzone"; version="1.4.5"; sha256="09ad025ydpfsrkcfqsfm4cj6lk8shrdh6vyya7isqwrd5jfyf1qc"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat]; }; higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; }; hillR = derive2 { name="hillR"; version="0.4.0"; sha256="0wivagbn4clfm3vbxbl3p93d9yxms94gkvi7p15lh0jfdppzm4c9"; depends=[ade4 ape FD plyr tibble]; }; @@ -7969,10 +8069,11 @@ in with self; { homals = derive2 { name="homals"; version="1.0-8"; sha256="0gad0jmflw5zmzf9hk5qqmxxpbncm9gngsi24i3rgiz7565kli1r"; depends=[ape rgl scatterplot3d]; }; homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; }; hommel = derive2 { name="hommel"; version="1.2"; sha256="006m28kfpzsz02nz8mhwjcn5b761fcpvhaw63c91x08ka89x4frl"; depends=[Rcpp]; }; - homologene = derive2 { name="homologene"; version="1.1.68"; sha256="0i2ywr3rxryakp7qskgjc0pll9nskwngk5m2d2jikxxq2biqf5zj"; depends=[dplyr magrittr]; }; + homologene = derive2 { name="homologene"; version="1.4.68.19.3.27"; sha256="0d7wxisk0vqk1n165v1i19bc02zv78h5r5d3jqai5y6nkmwn01sh"; depends=[dplyr magrittr purrr R_utils readr]; }; homomorpheR = derive2 { name="homomorpheR"; version="0.2-2"; sha256="1iahq16nswlc3b87598206xdp24bg9v8acyjp1jivybl3fr4k3pq"; depends=[gmp R6 sodium]; }; homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; }; hopbyhop = derive2 { name="hopbyhop"; version="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; }; + hopit = derive2 { name="hopit"; version="0.9.0"; sha256="177kg6gqf76qhjlm259g8if0n4345mv0xxk6vi4qy5c64zx29arg"; depends=[MASS Matrix Rcpp RcppEigen Rdpack survey]; }; horizon = derive2 { name="horizon"; version="1.2"; sha256="0b8m9ghfabjgdl155wh4gc4ng2lsvyfyhsy62pldbcix757b4ck9"; depends=[raster]; }; 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]; }; @@ -8009,10 +8110,10 @@ in with self; { httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; }; httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; }; httptest = derive2 { name="httptest"; version="3.2.2"; sha256="1q2lhqi5lhdc15wjrcr4z2yxjrfhjkgn0wwxr0mawsfz8cy3703q"; depends=[digest httr jsonlite testthat]; }; - httpuv = derive2 { name="httpuv"; version="1.4.5.1"; sha256="0mqd40jckdpkjw1jjd860cdwkb03l6dkh931maijfdaqr1w9hwvn"; depends=[BH later promises Rcpp]; }; + httpuv = derive2 { name="httpuv"; version="1.5.1"; sha256="042piypg4c8sqrlcdl3dwajkafkbglsky3x7d0jpjv8s5wxnpfxm"; depends=[BH later promises R6 Rcpp]; }; httr = derive2 { name="httr"; version="1.4.0"; sha256="0j6vknwyvkjpjsxwch4q02aik4dnm3h4l0wc7dgzc555bm1g2cyn"; depends=[curl jsonlite mime openssl R6]; }; hues = derive2 { name="hues"; version="0.1"; sha256="0b6y4ld242fqzx4ccxzk4i4zbx7myk7v3a03r0klgbh2mmw3ixm0"; depends=[colorspace]; }; - huge = derive2 { name="huge"; version="1.3.0"; sha256="18psr7arynax38hcc5y9dxskhsg4a5zjw3hjbgf96zy59wdib5ch"; depends=[igraph MASS Matrix Rcpp RcppEigen]; }; + huge = derive2 { name="huge"; version="1.3.1"; sha256="06s22i2cdn6g2r8kq5csyspinayh8dxxg9gkwcf4sa1lmrgb0bf9"; depends=[igraph MASS Matrix Rcpp RcppEigen]; }; humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; }; humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; }; humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; }; @@ -8020,16 +8121,17 @@ in with self; { humidity = derive2 { name="humidity"; version="0.1.4"; sha256="1nnrjk9wjvp28s615xd9wllnwv4js3kg7rj2f6al3sk3vhiqljsk"; depends=[]; }; hunspell = derive2 { name="hunspell"; version="3.0"; sha256="0mwqw5p0ph083plm2hr2hqr50bjg2dw862dpsfm4l2fgyy3rryq1"; depends=[digest Rcpp]; }; hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; }; - hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; }; + hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.0"; sha256="1wwa1b96yglmnkvn209v8g0cvx567i2mxd7y6vjzzy5l428cf9f0"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; }; hutils = derive2 { name="hutils"; version="1.4.0"; sha256="1v5l8zl54h5jiq35ayij6gciz6qcka9gsc1hbmdq1mf5qx8js9pw"; depends=[data_table fastmatch magrittr]; }; hutilscpp = derive2 { name="hutilscpp"; version="0.1.0"; sha256="17761crl71mhhc1k0g9gb6bq3df1w9s5508k0i7b3p3zam6r40l1"; depends=[data_table hutils Rcpp]; }; - huxtable = derive2 { name="huxtable"; version="4.4.0"; sha256="08rz06dbk2rf3lh53fq46d8ssm4kxg2l0mj0i9knlapg82id957a"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; }; + huxtable = derive2 { name="huxtable"; version="4.5.0"; sha256="0gnq19432ys9wxwcjmiilp41la6nhyv4bylcs2mxx1lgcmpqiza5"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; hwwntest = derive2 { name="hwwntest"; version="1.3.1"; sha256="1mz5svx5vbisdl5wxdnwip13pq4slyigc7j52l526rr9n0l0pr5v"; depends=[polynom wavethresh]; }; 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]; }; hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; }; hybridModels = derive2 { name="hybridModels"; version="0.3.5"; sha256="0bg065j3y3xwxlib9i78pa0ghlblyp4qq1kmh3j02w8xi00rnrs6"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; }; + hydra = derive2 { name="hydra"; version="0.1.0"; sha256="0r3r8cds4h15narawxhzkrvgnf00vlgrgqdgnmbzjyyb1dmry8wn"; depends=[]; }; hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; hydroGOF = derive2 { name="hydroGOF"; version="0.3-10"; sha256="010f2i53rl4fjl65fg5wzaci0kc5khpak5v1zz9yxsj77fmrmvfy"; depends=[hydroTSM xts zoo]; }; hydroPSO = derive2 { name="hydroPSO"; version="0.4-1"; sha256="0ic43rpcr9n7fjyvw7n57pm9lhqk09pi7lg2nvngj2fg4y8288jb"; depends=[Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; }; @@ -8040,7 +8142,7 @@ in with self; { hydrostats = derive2 { name="hydrostats"; version="0.2.6"; sha256="0xfl1r5ikx3lqfrrapig9k93ifl794psm798kis10psg8cqrxmkb"; depends=[]; }; hyfo = derive2 { name="hyfo"; version="1.4.0"; sha256="03xd4nm8zmc8gw8rml8svfim64xcslvpmdcldlri9cf89s8v35br"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; hyper_fit = derive2 { name="hyper.fit"; version="1.1.0"; sha256="0iylvjzgi0a9fblh331lc3h7f0m29xb70zwx0bjik0a4sisqx068"; depends=[LaplacesDemon magicaxis MASS rgl]; }; - hyper2 = derive2 { name="hyper2"; version="1.0-4"; sha256="00999k891s5l2wcnn6ych1v60ckqd2qxyckrfxh4kxnq9891hqcx"; depends=[magrittr partitions Rcpp]; }; + hyper2 = derive2 { name="hyper2"; version="1.0-6"; sha256="1i3bngxf91qll0yidyb71p8dppdfdd4n9y3zrfhqa5l7s4rv510r"; depends=[cubature magrittr partitions Rcpp]; }; hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; }; hyperSpec = derive2 { name="hyperSpec"; version="0.99-20180627"; sha256="12bgp3nm9mwi5w3v8a9fnm4a2cxid3la0r3sxs10azikn5yw0ib5"; depends=[ggplot2 lattice latticeExtra lazyeval testthat XML]; }; hypercube = derive2 { name="hypercube"; version="0.1.0"; sha256="0iv3cfs636mwijm2rjk427izf0gk5lh2fknd7bmb8pd188ckwqmf"; depends=[stringr]; }; @@ -8056,6 +8158,7 @@ in with self; { hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; }; iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; }; + iBreakDown = derive2 { name="iBreakDown"; version="0.9.5"; sha256="03n5pgn2pn2ksc3hbkaf67daqkfgk3lqqjzndjwv48ywin51sz78"; depends=[DALEX 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=[]; }; 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]; }; @@ -8068,7 +8171,7 @@ in with self; { iGSEA = derive2 { name="iGSEA"; version="1.2"; sha256="1xlz8mbxqnrwyqj7jwma7vmvjlaccajbfxf3hi4wp5qs2pch8806"; depends=[]; }; iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; }; iMRMC = derive2 { name="iMRMC"; version="1.1.0"; sha256="04wpqdds5vfqvl8n5g64vnyh4a40dxjh8l1bgw1vdz1372n0421g"; depends=[]; }; - iMediate = derive2 { name="iMediate"; version="0.5"; sha256="0gr0nibfdmiyxz8n7pfcl1d2gxhl5g2pi9yhnmsvqzry4j3x27yw"; depends=[mvtnorm plotly]; }; + iMediate = derive2 { name="iMediate"; version="0.5.5"; sha256="1lwhrzm4g2fcazh782g7p11v5pyx165ig1dzgkmdmjffpwk0w8b4"; depends=[MBESS mvtnorm plotly]; }; iNEXT = derive2 { name="iNEXT"; version="2.0.19"; sha256="1824icipyyb01s09z5fzygnyx2rgdcjlizps3agwsjj393aii4gj"; depends=[ggplot2 reshape2]; }; iNOTE = derive2 { name="iNOTE"; version="1.0"; sha256="1969xmgfv9405r09zpd2icvjd9vvzw4dx5qaqxk1a0jvbvhp3h88"; depends=[CompQuadForm mixtools plyr]; }; iNextPD = derive2 { name="iNextPD"; version="0.3.2"; sha256="06wka2qr1jm3hvi8j0b19fr21v72gmqknz8dg0l5wl91m0prqns3"; depends=[ade4 ggplot2 iNEXT Rcpp]; }; @@ -8109,21 +8212,25 @@ in with self; { icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; icesAdvice = derive2 { name="icesAdvice"; version="2.0-0"; sha256="0sx93fsx2srmynnvs3bjb525m9a5w70qr9lghmkqa07crd991vfr"; depends=[]; }; + icesDatras = derive2 { name="icesDatras"; version="1.3-0"; sha256="0yaqlximxa3rcjxgrd0mii02mm9gpcxgw3i8pymp00bk8zixvj30"; depends=[]; }; + icesSAG = derive2 { name="icesSAG"; version="1.3-6"; sha256="08nlsvs23j7ax03gwld3ycyvhfrhs70jdjif3562q1ysgvvkbf45"; depends=[httr icesVocab openssl png xml2]; }; icesTAF = derive2 { name="icesTAF"; version="2.2-0"; sha256="1a6jza2469sc5n7n41gf89yvak3bpm0qi0f75i74887wlki7klgy"; depends=[bibtex remotes]; }; + icesVocab = derive2 { name="icesVocab"; version="1.1-4"; sha256="0ydrxxmglgcsmjccamhfyw4cr2q583y4836v3wm2gxs5pcf9q86g"; depends=[XML]; }; icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; }; icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; }; icpsrdata = derive2 { name="icpsrdata"; version="0.3.0"; sha256="17sprbbi8fmvcp8d7hwrxl5amg0j036wq483cw62zbmni3p3fl82"; depends=[httr purrr rvest]; }; icr = derive2 { name="icr"; version="0.5.9"; sha256="1vgxy0lh908g1yfigfqrlzqjb3x6k2k8d18nbf25762r4v50h5jk"; depends=[Rcpp]; }; - icsurvROC = derive2 { name="icsurvROC"; version="0.1.0"; sha256="0nz2f5fg9v3bck6vpi123r160nscqn6ai5xj9bc3r958p6a5m85h"; depends=[icenReg Iso survival]; }; icsw = derive2 { name="icsw"; version="1.0.0"; sha256="0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6"; depends=[]; }; idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; }; idealstan = derive2 { name="idealstan"; version="0.7.1"; sha256="0mqwmky04bdkjsam132pkgg8avbp6c1njzxfx70xnnxm9954vvys"; depends=[bayesplot BH dplyr forcats gghighlight ggplot2 ggrepel lazyeval Rcpp RcppEigen rlang rstan rstantools shinystan StanHeaders stringr tidyr]; }; + ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; }; idefix = derive2 { name="idefix"; version="0.3.3"; sha256="0apgz4c0377y5w88pgv3x4mck1fjkq7xy577w925iish0hqpvni7"; depends=[dplyr gtools MASS maxLik mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; idem = derive2 { name="idem"; version="4.0"; sha256="0zgc6b5gzgm5dhjqk1vkm94khizc8sngn3igv23z1v18g73vdxhi"; depends=[BH Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; }; 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.1"; sha256="1lp1mxckj4znngavv701mxcx84n9409irnpcsadj5v1grmy9352x"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; }; ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; 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]; }; @@ -8145,7 +8252,7 @@ in with self; { 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.4.3"; sha256="0124d7h8n83zb5kvvavccprlqknpqrd634zv7sz9s915xzhp7jgz"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; }; + iheatmapr = derive2 { name="iheatmapr"; version="0.4.8"; sha256="0rypfhr05x3yqaywpkkd2mjn1vwbj6hw7v8nkwm2mbff9z87aam7"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; }; 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="1.5.0"; sha256="1zam6rph6fl5z10c3inzl8lajsg7wn1z5mr0wbk8dpbx2zgygkm1"; depends=[BBmisc checkmate dplyr fields filesstrings glue magrittr purrr Rcpp readr rlang stringr]; }; @@ -8158,7 +8265,7 @@ in with self; { imagine = derive2 { name="imagine"; version="1.4.0"; sha256="1v0rds64i0f3xgg7ca14ncw4nrcc80gvjf1fbp498idq38z79qzc"; depends=[Rcpp]; }; imbalance = derive2 { name="imbalance"; version="1.0.0"; sha256="1pfhwf4844m0a8qsm852am63x18vlkbs6m1s9izrpd219616skpr"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; }; - imfr = derive2 { name="imfr"; version="0.1.5"; sha256="1f4zynra79h42dmd9qhg67wwvs7c640f5is98bq30fdphiybihgz"; depends=[dplyr httr jsonlite]; }; + imfr = derive2 { name="imfr"; version="0.1.6"; sha256="0dvhz16wfmrrs21pcys8hjlwa9xkwc78pn76zj2aq1vyj9qby0wj"; depends=[dplyr httr jsonlite]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; iml = derive2 { name="iml"; version="0.9.0"; sha256="15rv943q1kqilsr1h0pkm2gci1cl7775xma4swjfmbqmdc6acjq0"; depends=[checkmate data_table foreach Formula ggplot2 glmnet gridExtra Metrics partykit prediction R6 yaImpute]; }; immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; }; @@ -8176,7 +8283,7 @@ in with self; { imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; }; imputeR = derive2 { name="imputeR"; version="2.1"; sha256="1xsawars52jhxfpl4hx8ghhndrvqk9vrrgajrrz2xrzi88kf6in2"; depends=[reshape2]; }; imputeTS = derive2 { name="imputeTS"; version="2.7"; sha256="12y6qzy00kb7jap4h92f3zpgdazlw3y4zydhv7gzfsmx1ka7nsfm"; depends=[forecast magrittr Rcpp stinepack]; }; - imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.1"; sha256="0yxvwk1bcsid116a4zqsagf2dl3vhzva559bfjjcqdgyniapcmcj"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; + imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.2"; sha256="138rkkxkghch6c80j15z77qs6rc62c37aqnv9aq766fkzk2fffwf"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; }; imsig = derive2 { name="imsig"; version="1.0.0"; sha256="01ww48x9a189dvr81bangfhchr70l0sg26jdpcxf41nh2fmslfxx"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; }; in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; }; @@ -8188,9 +8295,9 @@ in with self; { inca = derive2 { name="inca"; version="0.0.3"; sha256="1g9js84xa5b6jl8gp4k0c55kjazfaw5g9biwk4v6vz3vwkwayyzh"; depends=[Matrix Rcpp RcppArmadillo]; }; incadata = derive2 { name="incadata"; version="0.6.4"; sha256="1aj07zhf82wwg80jp461xapw8x9caa7daa59n4mxl8nqryrs77q0"; depends=[backports decoder dplyr rccmisc rvest sweidnumbr xml2]; }; incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; }; - incidence = derive2 { name="incidence"; version="1.5.4"; sha256="1a35smzwfci76bwb0qgxw4ybdcdc0chpm9k47q6fwnssrzsp7hgr"; depends=[ggplot2 ISOweek]; }; + incidence = derive2 { name="incidence"; version="1.7.0"; sha256="1ljn9phxsf47qp12xv1ly76lm4gcqfnhrisx4sy9f6pz5rx6k5s3"; depends=[aweek ggplot2]; }; inctools = derive2 { name="inctools"; version="1.0.14"; sha256="0ial852b96x310wzvla9lahxz3mwbqqv0l0lafs0bnmyaiiwycxv"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; }; - indelmiss = derive2 { name="indelmiss"; version="1.0.8"; sha256="0674hvgdq0fxab3h55iililphrr6lqp25359crvkqqgb8higbs0h"; depends=[ape numDeriv phangorn Rcpp]; }; + indelmiss = derive2 { name="indelmiss"; version="1.0.9"; sha256="0i4qnvc0xb3ngnk8xdscmx7qnicfs7s6czawf6schb1nh2pjpzyq"; depends=[ape numDeriv phangorn Rcpp]; }; indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; }; indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; }; inegiR = derive2 { name="inegiR"; version="2.0.0"; sha256="00bhb3zvqhir2rqza3axk98lxhq98s41apwpsm242pqb7wsnmg95"; depends=[jsonlite plyr XML zoo]; }; @@ -8221,7 +8328,7 @@ in with self; { inplace = derive2 { name="inplace"; version="0.1.0"; sha256="1lmvfjxgficlzxbn953wvfa1n9lys9gqprix6zbqqr4d6vkm0srj"; depends=[Rcpp]; }; insect = derive2 { name="insect"; version="1.2.0"; sha256="0lbck8jbhymzkhm1iqd2y2xg8a26yjizw7x31b1l1kqc1l0p3kmv"; depends=[ape aphid kmer openssl phylogram RANN seqinr xml2]; }; insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; }; - insight = derive2 { name="insight"; version="0.1.2"; sha256="0cy00j4m9r690hrjdmv8wzwn8mbnkjd3g527nvsmid64h9jgks5f"; depends=[]; }; + insight = derive2 { name="insight"; version="0.2.0"; sha256="0fn9cd5qxqlpjv3d05mk66k5z5ll60x5la51mby5h7k4l6bqmsiz"; depends=[]; }; insol = derive2 { name="insol"; version="1.2"; sha256="14ikz05375pjn9hby7kwkhcnykjilbnkdy5i8lsl7c5qdbhmqcm5"; depends=[raster rgdal]; }; inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; @@ -8236,6 +8343,7 @@ in with self; { intccr = derive2 { name="intccr"; version="1.1.1"; sha256="1zrwvh0rj38saqwgnrajhnzqvlygr5zyqdhfcal6hip6pwzwrj32"; depends=[alabama doParallel foreach numDeriv]; }; intcensROC = derive2 { name="intcensROC"; version="0.1.1"; sha256="0qkgp6iw2s772zk2533jsar64f5mqgy4874swgarnfgd4jvkwy2k"; depends=[pracma Rcpp RcppEigen]; }; integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; }; + 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]; }; interactionTest = derive2 { name="interactionTest"; version="1.1"; sha256="0kr1v6wsmri8hlczfnb19s51i4fv4xphmgld35my1ic6f1jyk5p4"; depends=[]; }; interactions = derive2 { name="interactions"; version="1.0.0"; sha256="125b51mv8zn64nx7k8dlsa63hil4bb1cz9jhhl7py60j41k4b5ci"; depends=[cli crayon ggplot2 jtools rlang]; }; @@ -8254,7 +8362,7 @@ in with self; { interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; }; intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; - intoo = derive2 { name="intoo"; version="0.2.0"; sha256="0fxyni0hpzj2d2wg9h5icqz4jv917a4b4ry8kc1ly3nfd4ngmywh"; depends=[]; }; + intoo = derive2 { name="intoo"; version="0.3.0"; sha256="1f7ffbb74xkqryvxw27w2aas0r29y06q46r8g0c1gmv2n17dgpxs"; depends=[]; }; intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.1.0"; sha256="0mxg9dvhn5rr1rchpqzf5i1p37kvabcb9jyqbn49zgzcwdvm6cbs"; depends=[yaImpute]; }; introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; }; intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; }; @@ -8268,7 +8376,7 @@ in with self; { 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.0"; sha256="16mnbxq217ixfg2qfqrj97qqfpc5dj622hf80nwray6hp47lbw2s"; depends=[filenamer stringr]; }; - ioanalysis = derive2 { name="ioanalysis"; version="0.1"; sha256="13hkcks9sm7swmvd1lzzz5gqs02mjdqhrx06f7bkbf77dxckxb8z"; depends=[]; }; + ioanalysis = derive2 { name="ioanalysis"; version="0.1.1"; sha256="18df5w3xxjnk07y9bmsbla64f14d1ga63pmmg77b55wi064z5hap"; depends=[]; }; ioncopy = derive2 { name="ioncopy"; version="2.1.1"; sha256="1lkav3xvh2qazfmcxwisrjy8wzf639a4md71499jj5rmy650crys"; depends=[shiny]; }; ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; }; ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; }; @@ -8287,7 +8395,7 @@ in with self; { iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; }; ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; }; ipred = derive2 { name="ipred"; version="0.9-8"; sha256="01xcg3c121ndfpz9dirqxszknh4yb1p222p7f1wbwwhdrg1i27cw"; depends=[class MASS nnet prodlim rpart survival]; }; - iprior = derive2 { name="iprior"; version="0.7.2"; sha256="1wc7f6gh0qas197jf78pb8wmazhddbny3l0w47f3v6fqwa581ls0"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; }; + iprior = derive2 { name="iprior"; version="0.7.3"; sha256="15qzqwikxy85fcd7psz363b5wb0kpi85icfyb47hbgdhln8fi2qb"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; }; ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; }; iptmnetr = derive2 { name="iptmnetr"; version="0.1.5"; sha256="02lljbbr2sm90sgyjv6a17mbh758n93qqxfr900g0m557nsv35i8"; depends=[httr jsonlite]; }; iptools = derive2 { name="iptools"; version="0.6.1"; sha256="143gawwp3aja5vycl43n6x5hzg3yvagi8x10v9y92hkif9v075qq"; depends=[AsioHeaders BH Rcpp readr stringi triebeard]; }; @@ -8311,11 +8419,11 @@ in with self; { isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; }; isdparser = derive2 { name="isdparser"; version="0.3.0"; sha256="1fdp4zk3pzpi5m026rlsrhyl4r5rfxy9sr8d04w2i0316rziv7kc"; depends=[data_table tibble]; }; isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; }; - island = derive2 { name="island"; version="0.2.2"; sha256="1qnjyqc4vyncks9dhi2blq60zgspkwvhzbnbcnyyw3rrx2da76dd"; depends=[]; }; + island = derive2 { name="island"; version="0.2.3"; sha256="1nzch0yf3winsvyas7d097r0zik5mq38ck7irs79savyj37bcl68"; depends=[]; }; ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; }; isni = derive2 { name="isni"; version="0.4"; sha256="0mz3l8fh2rgfxfvqc729xxh6i0pfv6z90cwcd0w2mfaz9lv53j2y"; depends=[Formula matrixcalc mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; - isoband = derive2 { name="isoband"; version="0.1.0"; sha256="1i5j9vfyaygjgcbhzd2zdlcggbbvkf3xczx3j565dp7bdq7byiyj"; depends=[Rcpp testthat]; }; + isoband = derive2 { name="isoband"; version="0.2.0"; sha256="1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq"; depends=[Rcpp testthat]; }; 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=[]; }; @@ -8346,7 +8454,7 @@ in with self; { ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; }; ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; }; - ivtools = derive2 { name="ivtools"; version="2.1.0"; sha256="13zzayarsc38c4w90ilvcz0896sr4zaz47f3vwxxkp6c2pbcv2z0"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; + ivtools = derive2 { name="ivtools"; version="2.2.0"; sha256="183lfv18r763jki8i37b8hk1k1kiglmhvjnfzigqzkzqc4cwibm1"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; }; jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; }; @@ -8358,14 +8466,15 @@ in with self; { janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; janitor = derive2 { name="janitor"; version="1.1.1"; sha256="0sqp6sajdzs8wwvsfkkfpgak9fzknjfffqpgjm6an7spdvsl2js0"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; }; jaod = derive2 { name="jaod"; version="0.1.0"; sha256="0wh1nlfhks4c1dga6h7554pg44pamj73x5in71k2xw0yp292zm6x"; depends=[crul jsonlite tibble]; }; - jarbes = derive2 { name="jarbes"; version="1.7.0"; sha256="1wvix7a1wv6mb4i1r3axixyvrwg6sj5pnc22ajri0d3dbdmklv23"; depends=[ggExtra ggplot2 gridExtra MASS mcmcplots R2jags rjags]; }; + 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.3"; sha256="1mzpvm5mhmr2ahwz1lnqvp1cs805jh0zlfwspvqwr0sfbzmmkrib"; depends=[ggplot2 scales]; }; + jcp = derive2 { name="jcp"; version="1.0"; sha256="1p3bjn3m7mw8rxcmd79ss23v9sb1ad28qcirj5czpj274glnj26k"; depends=[]; }; jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; }; jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; }; jetpack = derive2 { name="jetpack"; version="0.4.2"; sha256="1mzd26hlnjf2q2yq38z4c2jf5wfn8nm8y9qqlk2dmp0lc2xxxdpg"; depends=[crayon desc docopt packrat remotes]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; - jiebaR = derive2 { name="jiebaR"; version="0.9.99"; sha256="1g39z9ms975ig2j9nd6nqja1l8gy50fa9pwlz563xk6p2z6v058j"; depends=[jiebaRD Rcpp]; }; + jiebaR = derive2 { name="jiebaR"; version="0.10.99"; sha256="0gk5plifahwjrqkd3nqlcjhbkzw3gdkkxydrdmlh1lsrys2z54f6"; 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]; }; jjb = derive2 { name="jjb"; version="0.1.0"; sha256="0izpvban8v85g6w2mnmimhdh4yg6kcaf046v3jjba368nsj67q9n"; depends=[]; }; @@ -8377,8 +8486,8 @@ in with self; { jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; }; jmuOutlier = derive2 { name="jmuOutlier"; version="1.4"; sha256="1vrihjvq8l2q7d3z80fkzzzwg6xmnfi8sipsgwic1lcbv6vnqndp"; depends=[]; }; jmv = derive2 { name="jmv"; version="0.9.6"; sha256="10i6l6wg6348hsyl238in4im2b1spb1qanb5v65h5y9p9smwn60p"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; - jmvconnect = derive2 { name="jmvconnect"; version="1.0.7"; sha256="1sy7xa2k1ilbl0gmxgqkgyhigmzngk03nrk5p7b3dxw9vr867wdi"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; - jmvcore = derive2 { name="jmvcore"; version="0.9.5.2"; sha256="0npzy2qmyxsjkkxwz08d6w42npfn0aryycwq6xaw3ldncjakk1yr"; depends=[base64enc R6 rjson rlang stringi]; }; + jmvconnect = derive2 { name="jmvconnect"; version="1.0.8"; sha256="0r2idgvhhz2dqh3svc4l8is29h4zwl0qicv8961v646c8k1pdl0i"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; + jmvcore = derive2 { name="jmvcore"; version="0.9.6.4"; sha256="1drlyhgfzn3k5ccwbddz1wbb4zd3dchpvj2pf0agwjjvs4m8i0dv"; depends=[base64enc R6 rjson rlang stringi]; }; jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; joineR = derive2 { name="joineR"; version="1.2.4"; sha256="05wr7gr3mnsfj8a1m5v1b71gh3fc4pyhj6rqapls7iwrkywbf1b6"; depends=[lattice MASS nlme statmod survival]; }; @@ -8392,15 +8501,16 @@ in with self; { jomo = derive2 { name="jomo"; version="2.6-7"; sha256="0lyvi32aikkvwdj0y2hc13kmmi0cw1icg8z9lcw10l8326sxm0vf"; depends=[lme4 MASS ordinal survival]; }; jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; }; jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; - jpmesh = derive2 { name="jpmesh"; version="1.1.1"; sha256="0smfv7wh0441aqx0c0km0kr54lsvqixn2chqvqn5sd3758k5id95"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; + jpmesh = derive2 { name="jpmesh"; version="1.1.2"; sha256="04pqx1spvs031jrd7ixq4f3c1cpwj5i8sl8r95d5gc6z7pvrcm30"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; jpndistrict = derive2 { name="jpndistrict"; version="0.3.2"; sha256="0n935zwxjjnl1w0xd790gm22pdm8ng48x79iazfkjzj8dpwymdsg"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr]; }; jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; }; + jrc = derive2 { name="jrc"; version="0.1.1"; sha256="0ywvdipbiavaifksy5nmgk9x10p4pxjflgzjzj1igxav3lsh2wpd"; depends=[httpuv jsonlite stringr]; }; jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; }; jrt = derive2 { name="jrt"; version="1.0.0"; sha256="0jy3a157bp5q8mmg2pj97idwv47mvpczignwx8jjb4nx30gs69wh"; depends=[directlabels dplyr ggplot2 ggsci irr mirt psych tidyr]; }; - jrvFinance = derive2 { name="jrvFinance"; version="1.4.0"; sha256="09gr8w3y0cjlwjhr72ml05y22m868hnvxwa3mwxdcvfb7nb1dmxz"; depends=[]; }; + jrvFinance = derive2 { name="jrvFinance"; version="1.4.1"; sha256="1gkivmvc0njm32w7yhbh02h9p212xa3m4cvrwcy7yray8g6phdxp"; depends=[]; }; js = derive2 { name="js"; version="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; }; jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; }; - jskm = derive2 { name="jskm"; version="0.3.0"; sha256="1sr0v2rwl045m8zlgii9h5kzazvid8wcwi6xifb2pr19kw7yv2kr"; depends=[ggplot2 gridExtra plyr scales survey survival]; }; + jskm = derive2 { name="jskm"; version="0.3.1"; sha256="1bij0vr6kv32r8cgxshsr9249a53w6gbbrwc56gb9s2pb03fjwrx"; depends=[ggplot2 gridExtra plyr scales survey survival]; }; jsmodule = derive2 { name="jsmodule"; version="0.7.10"; sha256="16l3f25m5g1hbb3ylyym7m0mrx127z77md6vn02vp4ssa61zx4bq"; depends=[data_table DT epiDisplay geepack GGally ggplot2 haven jskm jstable labelled MatchIt maxstat purrr readxl rstudioapi shiny shinycustomloader survey survival tableone]; }; jsonify = derive2 { name="jsonify"; version="0.2.0"; sha256="0jz0z4pnzc07hgy7cl03n5jfry6fxfddv9kj3v7faw4f349kn9ic"; depends=[BH rapidjsonr Rcpp]; }; jsonld = derive2 { name="jsonld"; version="2.1"; sha256="0lp0lp9nbk31dia2nq6xba29ymak9h5wl4zbq4pdqw6qm9iwz6ww"; depends=[curl jsonlite V8]; }; @@ -8421,16 +8531,18 @@ in with self; { jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; jwutil = derive2 { name="jwutil"; version="1.2.1"; sha256="1n9q2p167cmp134p8qpknfg4avi4nzxqmazyr1gs63sk5x51yk48"; depends=[Rcpp testthat]; }; kSamples = derive2 { name="kSamples"; version="1.2-8"; sha256="15d5q5vpp4wx5rk5kjxjdxpwc8mkq5sbdz8gi07iscrvhzb5rzfr"; depends=[SuppDists]; }; - kableExtra = derive2 { name="kableExtra"; version="1.0.1"; sha256="0vsywd0hab16gfxv2x8gwnmfm0s46ap84rfcy2r939w3a4by3lwm"; depends=[digest glue htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite webshot xml2]; }; + 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]; }; kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; }; - kamila = derive2 { name="kamila"; version="0.1.1.2"; sha256="0mcray8byifjddsmwzmcpmw3zpm1y8q3nfrgpgacb36rwprqkj6z"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; }; + kamila = derive2 { name="kamila"; version="0.1.1.3"; sha256="0ssyqn6n1jlslg5kvimakjq9xnb4r8k6ri1a76b13lr11zbl4l10"; depends=[abind gtools KernSmooth plyr Rcpp]; }; kangar00 = derive2 { name="kangar00"; version="1.3"; sha256="1gxz2lq8vbpjvnriakwipy4fl3mvhrdpnyrnyra3w7zmhlbfp2dd"; depends=[bigmemory biomaRt CompQuadForm data_table igraph lattice sqldf]; }; kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; }; + kaos = derive2 { name="kaos"; version="0.1.0"; sha256="0qhzrf4c45y1cxaaqz1037a7mynx2wyi6aa8g8c4ys7y5yfl7mvq"; depends=[ggplot2 reshape2]; }; kaphom = derive2 { name="kaphom"; version="0.3"; sha256="081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa"; depends=[]; }; kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; }; kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; }; kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; }; karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; }; + kayadata = derive2 { name="kayadata"; version="0.4.0"; sha256="0azy6aiwwi1imcw242b8c917qrni52biymgxcicfch0ncr62xrvf"; depends=[dplyr forcats ggplot2 magrittr scales stringr tidyr]; }; kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; }; kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; }; kde1d = derive2 { name="kde1d"; version="0.2.1"; sha256="14zblm0yj806an9p463hfc9xnrdkh3x8bfxld6a9cjg513kij9ib"; depends=[BH cctools qrng Rcpp RcppEigen]; }; @@ -8446,7 +8558,7 @@ in with self; { kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; }; kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.4"; sha256="1mfqblvsn9p6gdcnbypfpzk0xzn6bz1ajbrkz2dap5w35dia3kxa"; depends=[actuar dplyr ggplot2 tibble]; }; kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; }; - keras = derive2 { name="keras"; version="2.2.4"; sha256="0qnpzpnvs2jhf6sjg0giv88xfim8b5nv95nrgqs73cb74cyr4f9r"; depends=[generics magrittr R6 reticulate tensorflow tfruns zeallot]; }; + keras = derive2 { name="keras"; version="2.2.4.1"; sha256="0zirg7vmlq90fjd4p5mgyyrdfg92az8yc4ynbi9w63a39xl03ys8"; depends=[generics magrittr R6 reticulate tensorflow tfruns zeallot]; }; kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; kerasformula = derive2 { name="kerasformula"; version="1.5.1"; sha256="1b4mq1y41lz8maszlrm7w907vcz7in8napfnhas7dgal1kid4mcf"; depends=[dplyr ggplot2 keras Matrix]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; @@ -8480,16 +8592,17 @@ in with self; { 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]; }; kitagawa = derive2 { name="kitagawa"; version="2.2-2"; sha256="0hl2l42jz4wkcx94cqycw8zb3ffg72fp2f310sh5icrcnyw43bmp"; depends=[kelvin]; }; + kiwisR = derive2 { name="kiwisR"; version="0.1.4"; sha256="0jj3pj4nbmh5vczr0krxnwybr2j5mmmqfqy1dkm4dkf67fh510gs"; depends=[httr jsonlite lubridate tibble]; }; kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; }; klaR = derive2 { name="klaR"; version="0.6-14"; sha256="1g995df6286sd64nw7q9bihzkqhrasks45n8xk678y57kcadksai"; depends=[combinat MASS questionr]; }; klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; }; klin = derive2 { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; }; km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; - kmcudaR = derive2 { name="kmcudaR"; version="1.0.0"; sha256="1adixf4nsgnk8rgvcv37aznh8gxrfwn19ihh3c6siss51hlmhln2"; depends=[Rcpp RcppEigen]; }; + 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.2.0"; sha256="1y09a6l8zmxnp0xq5y8b2nbdswcyb3a9ms5a1j96sb0c500n2285"; depends=[ggplot2]; }; - kmer = derive2 { name="kmer"; version="1.1.0"; sha256="0c96rz75qggqfb0zccn0v92jx9ws2nlw8pk6j5jghllcgm99qbdc"; depends=[openssl phylogram Rcpp]; }; + kmer = derive2 { name="kmer"; version="1.1.1"; sha256="0bjfrk40plbnaxg53ysh827b17pwbhwj9d7f2x83myhnbahnwyaf"; depends=[openssl phylogram Rcpp]; }; kmi = derive2 { name="kmi"; version="0.5.4"; sha256="07h4gn69r4zxm00alj74fd0qdyp7g9x38gpi1v7yzy806wlg93fr"; depends=[mitools survival]; }; kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; }; kml3d = derive2 { name="kml3d"; version="2.4.2"; sha256="1a3hqyhrsh12l1j1xlz4zy88impw3biz6w2qc80r11m549h0m6s9"; depends=[clv kml longitudinalData misc3d rgl]; }; @@ -8527,11 +8640,12 @@ in with self; { kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; krm = derive2 { name="krm"; version="2018.8-17"; sha256="0d4isfzhlz9kxq0sbb1m60wnvcnlqzz8d45hiikgf1dfbngkyh2a"; depends=[kyotil]; }; ks = derive2 { name="ks"; version="1.11.4"; sha256="0d5i8458s8ri9pcx2jm003z1ajk7ha3pmw1sr6lgn6a8d7wgmvqb"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; }; + ksNN = derive2 { name="ksNN"; version="0.1.1"; sha256="053i6rrq76zlvwlw2clcqwb7ck5y3x2q24gd7r9rk2jl267r5mzs"; depends=[Rcpp]; }; kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; }; kst = derive2 { name="kst"; version="0.5-1"; sha256="0p0v4kwnd793rjvdq00pyvnjyzqp4n5hazxjc55am6is71ihwann"; depends=[proxy relations sets]; }; kstIO = derive2 { name="kstIO"; version="0.2-0"; sha256="01p6krb945m5jy57k479szic4yb7bap020mz1imlnsnmbnrycpx6"; depends=[MASS pks sets stringr]; }; - kstMatrix = derive2 { name="kstMatrix"; version="0.1-0"; sha256="0c8nb6cc4ng6gc21bhnj8in7rcjnsbncb3c8k70q3w340apwv2pm"; depends=[]; }; + kstMatrix = derive2 { name="kstMatrix"; version="0.1-1"; sha256="0ghqp8c86q066amvsfpzdbryqmynx7j2j81nf5fsg6zmzv72pbla"; depends=[]; }; ktsolve = derive2 { name="ktsolve"; version="1.1.1"; sha256="031z0pnx3ghflsz7p9b3xacnz8c7li82bid526zwqc8mvqy6ay4x"; depends=[BB nleqslv]; }; ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; }; kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; }; @@ -8560,7 +8674,7 @@ in with self; { lacm = derive2 { name="lacm"; version="0.0.3"; sha256="0qhvffiw2bcpnv6l4y4h12ss59yc2j0hwsg2nr4a7w4nh6yk9fwc"; depends=[numDeriv statmod]; }; laeken = derive2 { name="laeken"; version="0.5.0"; sha256="1g9r3y7b0gl91hijk9awa8rjk97mqpkxinzq2cgmx0m38ng9ylpa"; depends=[boot MASS]; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; - lagged = derive2 { name="lagged"; version="0.2-0"; sha256="053wv4z1859v4j00x6l707v6w5zdyk3r1a6naxs601607yn27n5h"; depends=[]; }; + lagged = derive2 { name="lagged"; version="0.2-1"; sha256="1s9smx3c32c0jx33cwszamrdag25kaq7fz991p017lp1cm3x0zx6"; depends=[]; }; lagsarlmtree = derive2 { name="lagsarlmtree"; version="1.0-0"; sha256="0nrrr2n2q228d1c7qrhcnczmr374i56p7kr868yl19g8ddd3gx3w"; depends=[Formula partykit spdep]; }; lakemorpho = derive2 { name="lakemorpho"; version="1.1.1"; sha256="0asrp9rvyi5ykxw922qx25rgxvyc9mh4sc7qkbpwzqw8xvgpad2z"; depends=[cluster geosphere raster rgdal rgeos sp]; }; laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; @@ -8573,12 +8687,12 @@ in with self; { landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; 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="0.3.1"; sha256="12rip0idicy3k3dsnsas186yigpk7hc3j78rzij55g6mk8qaq103"; depends=[cli crayon dplyr ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; + landscapemetrics = derive2 { name="landscapemetrics"; version="1.0"; sha256="0cqv6113pnf7iq24356wpl2iw5clx6x7wb5haflvcz1zwlzpazfm"; depends=[cli crayon 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="0.0.7"; sha256="00ckjjyq33y362xhwjic8rwz06ml3s5l8wxxf7cgh0xkzv5hwcnr"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; }; 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.2.7"; sha256="1s0v7gnm20sy8acj40cnbjlc7qf66z1c99j97rzig81d5idvmc1d"; depends=[callr collections desc jsonlite lintr R6 repr stringr styler]; }; + languageserver = derive2 { name="languageserver"; version="0.2.9"; sha256="0jg652pj6y99kdvgpvh0ggyxks7xdbp15jzwjpfkv2d75rwqpw5p"; depends=[callr collections desc jsonlite lintr R6 repr stringr styler]; }; lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 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=[]; }; @@ -8593,22 +8707,23 @@ in with self; { later = derive2 { name="later"; version="0.8.0"; sha256="08g503xjxrfxvrzj0cavsrz4m8ykbha64344j1w2r6v17js2hakb"; 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=[]; }; + 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-38"; sha256="0b8abkz7syscq883mrgv63pkwaqkcpwfx8rgbqy9vgfva0z5xszx"; depends=[]; }; latticeDensity = derive2 { name="latticeDensity"; version="1.1.0"; sha256="0amxkdf240pgqaydkfvmv1mgsl17jv57938sl96clw1bzd4ilnld"; depends=[sp spam spatstat spdep splancs]; }; latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; }; lava = derive2 { name="lava"; version="1.6.5"; sha256="13rlqdg42ylnz4hc932bl50xismrcr4d9ykcd9zs19cw5mckjx0f"; depends=[numDeriv SQUAREM survival]; }; lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; }; - lavaSearch2 = derive2 { name="lavaSearch2"; version="1.4.1"; sha256="0c3b3827axwhgnnicvr4y0cxpxsqhizfywxylw4d76zkm4alk3ds"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; }; + lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.3"; sha256="1z6ppcdcpw4wrh3ljn3fw78rqkyxg68psbr805ri3h2ab8xcc38m"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; lavaan = derive2 { name="lavaan"; version="0.6-3"; sha256="0hw856kv11zqn6nd4216rh19i6xbnc1rh044r7jvvxkhzgbqkyxz"; depends=[MASS mnormt numDeriv pbivnorm]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; }; lavaanPlot = derive2 { name="lavaanPlot"; version="0.5.1"; sha256="01bx1snd3zhc8dmq0f407qhw2d00f6d38qpr791qc1mq5kr3d8qj"; depends=[DiagrammeR lavaan stringr]; }; lawn = derive2 { name="lawn"; version="0.5.0"; sha256="0yvlps6g9ya383615y7x624hnwb6qfs6i5yg4cchp6lkvz2xdd5y"; depends=[jsonlite magrittr V8]; }; - lawstat = derive2 { name="lawstat"; version="3.2"; sha256="03ppzyx3x6vx1n2k5l8gl9j2q2mnqa1im5smxnrlncan7yzjy7sf"; depends=[Kendall mvtnorm VGAM]; }; + lawstat = derive2 { name="lawstat"; version="3.3"; sha256="117w8b1skw9kh03dm67p17q6ifyh3zq2ivm85ix1nvpyrq3pcfvp"; depends=[Kendall mvtnorm Rdpack VGAM]; }; lazy = derive2 { name="lazy"; version="1.2-16"; sha256="1psh3sng1pm23pjwy7iszb21ys7d29ry34ymvpgxj6zdhywwi5n7"; depends=[]; }; lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; }; lazyWeave = derive2 { name="lazyWeave"; version="3.0.2"; sha256="1a7l0rgkp3xq2s6bikciq778fwyr282baa6jk9ip4a71s931p2ag"; depends=[Hmisc labelVector]; }; - lazyeval = derive2 { name="lazyeval"; version="0.2.1"; sha256="0q9zx78ncy2ffzrf9sh053069kd3w1xn1ss3gsbyf3y4jhza9cw3"; depends=[]; }; + lazyeval = derive2 { name="lazyeval"; version="0.2.2"; sha256="1m10i059csrcqkcn59a8wspn784alxsq3symzhn24mhhl894346n"; depends=[]; }; lazyrmd = derive2 { name="lazyrmd"; version="0.2.0.1"; sha256="0yzamy1bfq0d7mnrr24wzvvw6lq7rhfs6qnqypfmym65j5kfj0f8"; depends=[digest htmltools htmlwidgets knitr rmarkdown]; }; lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; }; lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; @@ -8621,6 +8736,7 @@ in with self; { lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; }; lcmm = derive2 { name="lcmm"; version="1.7.9"; sha256="15x8i7cvifbrb64cqjng0hvk6ajnla0yakj4pfd8d4s20nzivij4"; depends=[survival]; }; + lconnect = derive2 { name="lconnect"; version="0.1.0"; sha256="0wk1kx0awj6d9w4sn0csws0sksx9cb4b4l9xpjqnyavc4zfhxj8l"; depends=[igraph sf]; }; lcopula = derive2 { name="lcopula"; version="1.0"; sha256="07a9k5fp03s6jnjawg11j4458xrsrrqxv6kf3cs58ymv0j2s1qyd"; depends=[copula pcaPP Rcpp]; }; lcpm = derive2 { name="lcpm"; version="0.1.0"; sha256="1miyq9pxwbn6l9099dbb5i4fnrjrnyj9yq5j6lv76bv7ih1kxp4a"; depends=[Matrix numDeriv plyr]; }; lctools = derive2 { name="lctools"; version="0.2-6"; sha256="06hhz0sjdrci1li03f09wij1qrl74sla2938fbkx72ffy0mdg310"; depends=[MASS pscl reshape weights]; }; @@ -8643,6 +8759,7 @@ in with self; { leaflet_opacity = derive2 { name="leaflet.opacity"; version="0.1.0"; sha256="19dkl105sf7c9wrpl8kzwsjwwc7r9qb4c1g85w2lavpj0pbyazxw"; depends=[htmltools htmlwidgets]; }; 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]; }; leafsync = derive2 { name="leafsync"; version="0.1.0"; sha256="0p6pb7w5yz2wj33kdh7ixii9f6b8zv018psp6b7ifr7npgdxi3vx"; depends=[htmltools htmlwidgets leaflet]; }; leanpubr = derive2 { name="leanpubr"; version="0.3.1"; sha256="0c8pmzn25cwv0wccf30zrrqrs5amlk8iqyyva9vp9976wzwgbxrx"; depends=[httr jsonlite xml2]; }; leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; }; @@ -8654,39 +8771,40 @@ in with self; { learnr = derive2 { name="learnr"; version="0.9.2.1"; sha256="0jbk0g6fkw7zs8ykzhsvh9vvz8xmc4v03bqzjsa5mmpxpqan5vx5"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; }; learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; }; learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; - ledger = derive2 { name="ledger"; version="2.0.0"; sha256="18nf555wy40xgrvbrinxl9z5063x0daibrli9616aicrydrl0rhi"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; }; + ledger = derive2 { name="ledger"; version="2.0.1"; sha256="1cfbd7i9m8xk46s4g60004yyvmmwb9w9pnf0cl7bnpn2280q4r5q"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; }; leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; }; lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; }; + legocolors = derive2 { name="legocolors"; version="0.1.2"; sha256="15ji5kx1vja89jzjgawbn5h9jhk02g5cxp5l8jc9hjvr5i0dhajl"; depends=[]; }; leiden = derive2 { name="leiden"; version="0.2.3"; sha256="0w0wpnhh6qx33da9gnsmnfr9kbvn6b3jkcfaa2h9g5yp67ghh11v"; depends=[reticulate]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; lemon = derive2 { name="lemon"; version="0.4.3"; sha256="0wsn5bfg10wq4dnrgpyraz2bzx9p19c7hf1pwj3h4zmpqfgsdbpw"; depends=[ggplot2 gridExtra gtable knitr lattice plyr scales]; }; lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; }; lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; }; - lessR = derive2 { name="lessR"; version="3.8.1"; sha256="096i37ccgi0lq90w65rbf3cnzgh5cxh76kb1nvcqchvpmh41iksm"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png randomcoloR robustbase sas7bdat triangle viridisLite wesanderson]; }; + lessR = derive2 { name="lessR"; version="3.8.2"; sha256="1mqpjhwrxvvn1bxv2zww6cjlnyj9srban512mrnmd0vgv29bx46z"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png randomcoloR rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; lest = derive2 { name="lest"; version="1.0.0"; sha256="06ng0dpj37bhhwc34ilpks2ics97m9yjdpj4q993h3s2fn8kdgxw"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; }; - lexRankr = derive2 { name="lexRankr"; version="0.5.0"; sha256="1l0p4qg6lcpp1f2n6mh1glvxzy3bis0c1ra8x9z5v26x31wmwq68"; depends=[igraph Rcpp SnowballC]; }; - lexicon = derive2 { name="lexicon"; version="1.1.3"; sha256="085s7k1ywzmsadwmsp1gc2yspv8hp3pp3cjvpq1s39cnwpgi0h0w"; depends=[data_table syuzhet]; }; + 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.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; }; - lfe = derive2 { name="lfe"; version="2.8-2"; sha256="1j06mnp3jii427dqbdy5hqw6f254nr5is91y24vacmxwk2m44pzd"; depends=[Formula Matrix sandwich xtable]; }; + lfe = derive2 { name="lfe"; version="2.8-3"; sha256="0hpgk0k0xq47p71002xvl9p9xhw5yv9vsh0c4xyg1sjd5mdvhvy4"; depends=[Formula Matrix sandwich xtable]; }; lfl = derive2 { name="lfl"; version="1.4.2"; sha256="0lr7r04jpsrp54g4flpwihymvwa3idxhzfjxfbx4ah16rd47nk5x"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; 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.3.0"; sha256="1kbsfkv8py627l2zm96l05r19d2yx7zajf3nqy67rclcj869jg1n"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; }; lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; lgcp = derive2 { name="lgcp"; version="1.5"; sha256="1n1f87qg0y9r22p3q1qjnfrs7xarvsidgqgg6v2bsb55viwy11g3"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; - lgr = derive2 { name="lgr"; version="0.1.1"; sha256="00pi5glzbjn9zcwa7g5n2945knswnk5namy11gfllab92605fq5k"; depends=[R6]; }; + lgr = derive2 { name="lgr"; version="0.2.1"; sha256="0cib91mya8zr0q0mi5hsirq6na2jpwdqza45w5gydkp814blhjp8"; depends=[R6]; }; 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.1"; sha256="0lzaqr7xi3ckln5nglv5xf5njm359slpz1jc6s02hpsqdw6armd4"; depends=[Rcpp]; }; liayson = derive2 { name="liayson"; version="1.0.1"; sha256="1l3zxpjis8k8ks59wsx1lvg4pmsy69094jh0h2zqvi4nnjphfqqm"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; }; libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; }; libcoin = derive2 { name="libcoin"; version="1.0-4"; sha256="1i893ij9vkmc4y721npw1s3prmmcs2da5vf3ajm0j8ccmfhbmp4i"; depends=[mvtnorm]; }; - librarian = derive2 { name="librarian"; version="1.6.0"; sha256="0japqjdh4pa0kjaiyj287x40bi6gv0zdq36gy4lpxds9f1l0b67d"; depends=[BiocManager remotes]; }; + 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.6.4"; sha256="1hdnqgnvzm5116gphxa55k2bc3ksr607px2s2yg1ilmmxdghdccw"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; }; @@ -8714,7 +8832,7 @@ in with self; { linbin = derive2 { name="linbin"; version="0.1.2"; sha256="0shw976nlryjvmvnyyiycchqs7zcg5flalywm1ymnv62nw3n55xs"; depends=[]; }; lindia = derive2 { name="lindia"; version="0.9"; sha256="1qma8wr0fkwx03x971crkh8cfc8z4374py1r1wvszj9wzi4vfp5r"; depends=[ggplot2 gridExtra MASS]; }; linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; }; - linearQ = derive2 { name="linearQ"; version="1.0"; sha256="0c6ccllv4zf8zgs3957zjvnkdwbv2ryrs0f5lzk1clc233vm7acm"; depends=[Rcpp stepR]; }; + linearQ = derive2 { name="linearQ"; version="2.0"; sha256="0sx7bx0x1k193day5w1dbmc09kn5741pcilxijjn2y5aijhd5wk9"; depends=[Rcpp stepR]; }; linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; }; lineqGPR = derive2 { name="lineqGPR"; version="0.0.3"; sha256="0adrjsfqwy9wrw4hf48p7jgn985bbpv6jyhhkab19fabc84iy1jg"; depends=[broom ggplot2 MASS Matrix mvtnorm nloptr quadprog restrictedMVN tmg TruncatedNormal]; }; lineup = derive2 { name="lineup"; version="0.37-11"; sha256="0lk2wm8wsaaxw3j7yvmg6qif0r0s1jlwqyg73d3xjnjhxgy03zp4"; depends=[class qtl]; }; @@ -8734,29 +8852,31 @@ in with self; { liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; }; liquidSVM = derive2 { name="liquidSVM"; version="1.2.2.1"; sha256="1s7wgj767x06c4sv0jy9n8amcma0qn0699cf748886snl47n5rcm"; depends=[]; }; lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; }; + lisa = derive2 { name="lisa"; version="0.1.0"; sha256="042492w4gq3myqr6kpy272cxdmbr3lynja3ggrfzicvfbnrs6mzz"; depends=[]; }; 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.1"; sha256="17d8pscn56wlp6pcz2mvqjmrwv22fhphiiblrnfnd36m65nd58dm"; depends=[arm coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; }; listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; }; - listarrays = derive2 { name="listarrays"; version="0.1.0"; sha256="06siz7ph9ihjv9y97bd02xibkw4qr548cv3yqjqzqw245jzxvhv7"; depends=[]; }; + listarrays = derive2 { name="listarrays"; version="0.2.0"; sha256="0hm8b9pkrqzgs88vba0y4xd12fzjcdr3n1san7wm88wy7pkl6kx5"; depends=[]; }; listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; }; listenv = derive2 { name="listenv"; version="0.7.0"; sha256="0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"; depends=[]; }; listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; }; listviewer = derive2 { name="listviewer"; version="2.1.0"; sha256="09jkrrq4zyzgi66vkpm5n7isxpbckx5hjk39nik766hzarj5i7rs"; depends=[htmltools htmlwidgets shiny]; }; liteq = derive2 { name="liteq"; version="1.1.0"; sha256="0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi"; depends=[assertthat DBI rappdirs RSQLite]; }; - littler = derive2 { name="littler"; version="0.3.6"; sha256="0zhpqg3fcsd67hh5nzyba82bd8ymz90dsnv5xvqcyag50wlv3rl3"; depends=[]; }; + littler = derive2 { name="littler"; version="0.3.7"; sha256="1smb6jjr4knwzcgp3lqglm3hm1xwj0pzijlcn9cf7w572g42cygg"; depends=[]; }; liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; }; live = derive2 { name="live"; version="1.5.10"; sha256="17wz3cs6pjghc31965wblm3lm3x1pr5bk5j1wi84vyyl0sni3qx4"; 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]; }; ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; }; llama = derive2 { name="llama"; version="0.9.2"; sha256="0knlmfddp70ddhjb9slyibbb9qj7pfybqccv3i4f545qxmmykj2n"; 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]; }; lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; }; lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; }; - llogistic = derive2 { name="llogistic"; version="1.0.0"; sha256="1mddwcfp6c5g36japybjrlirz0q8l7am8akbiv8c6z7jka2nwi00"; depends=[]; }; + llogistic = derive2 { name="llogistic"; version="1.0.3"; sha256="0wfszgcdi0i3lsm7gsih6a411v353c2gpbg3f06n6c2n35939lsl"; depends=[]; }; lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; }; lm_br = derive2 { name="lm.br"; version="2.9.3"; sha256="1xadz0rygm58igk0ig0w45132gnsvjxvwqzca4m6v6i6lz9x55pf"; depends=[Rcpp]; }; lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; }; - lmQCM = derive2 { name="lmQCM"; version="0.2.0"; sha256="1wj7j6jivhfs34zhl7yclrmn4hfwzz9bjrx2jv65cihphq32y7l3"; depends=[Biobase genefilter nnet]; }; + lmQCM = derive2 { name="lmQCM"; version="0.2.1"; sha256="1gzd9nhdmjlq0q8gkrg8ipcl1r264mdfqms8mmk6141pfp4xih0g"; depends=[Biobase genefilter progress]; }; lmSubsets = derive2 { name="lmSubsets"; version="0.4"; sha256="1qlljv5mdy648wk0r1ac6ak62f9n4x0dwxv8ic0v0rsxaq9q0pjz"; depends=[]; }; lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; lme4 = derive2 { name="lme4"; version="1.1-21"; sha256="035j2hqkwv939xl07pm2vykvf3wlx8qj317846n9pkpqkyv58mbz"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; @@ -8769,7 +8889,7 @@ in with self; { lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; }; lmerTest = derive2 { name="lmerTest"; version="3.1-0"; sha256="1nkz8cmxa5yb8q4i65bmhnn5pd4bhwcyjplyscynb24z3f64xp9b"; depends=[ggplot2 lme4 MASS numDeriv]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; - lmfor = derive2 { name="lmfor"; version="1.2"; sha256="1lad1sfrf6lsksix4nn2c2dc5fx0rfm4kdhvbmqf9dc55f98rla8"; depends=[MASS nlme]; }; + lmfor = derive2 { name="lmfor"; version="1.3"; sha256="1c97kgzgrn0mgb6a8m4c8875qi8li1z189fa463z826x3psrr40v"; depends=[nlme spatstat]; }; lmm = derive2 { name="lmm"; version="1.2"; sha256="1xymcizqfqh2jp0rxgfgniflyqzgcwg04g9mllva5xgc1ydcg69k"; depends=[]; }; lmmen = derive2 { name="lmmen"; version="1.0"; sha256="0c1yy991bff1hp47rg89j5811l50kb9pdf76834jxh38dr3b4lsw"; depends=[glmmLasso glmnet lme4 lmmlasso mvtnorm quadprog]; }; lmmlasso = derive2 { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; }; @@ -8777,14 +8897,14 @@ in with self; { 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.6"; sha256="0wxlclzypg6dnvk09k26pdgn3nijl06xsa9rny5l03xzar01mz5s"; depends=[]; }; + lmom = derive2 { name="lmom"; version="2.8"; sha256="1lnj41gynaar5isyijg5nbll64qdxa12dnqvz7lxhaclqcjskqna"; depends=[]; }; lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; }; - lmomRFA = derive2 { name="lmomRFA"; version="3.1"; sha256="1gq5sjdywz1jbsshrh350zad7iifml2yj8an5xa63ghxiskrxscx"; depends=[lmom]; }; + lmomRFA = derive2 { name="lmomRFA"; version="3.2"; sha256="132kdxg82w1zazfvg80jnpsyaj6x0a316hh1v8mg57cw5lxgmgwr"; depends=[lmom]; }; lmomco = derive2 { name="lmomco"; version="2.3.2"; sha256="1gqwn5yjd3zcwd5nysayf88vjhj2j1qxfgqcw63q7f2ih0xk1lqp"; depends=[goftest Lmoments MASS]; }; lmreg = derive2 { name="lmreg"; version="1.1"; sha256="0q4vpjjzcpxxqbq7m4k49kl6whj4mvly5fxf0w5hdnbq1nryabp8"; depends=[MASS]; }; lmridge = derive2 { name="lmridge"; version="1.2"; sha256="091rznzh77bmsv7sw9xmsq6s9pnljyq7qyl74kgcxss718134jr3"; depends=[]; }; lmtest = derive2 { name="lmtest"; version="0.9-36"; sha256="0sym9sm1vl6bbgq01jhz1plxqmgh8hrgrn7rw0mwvsalcn6id7xy"; depends=[zoo]; }; - lmvar = derive2 { name="lmvar"; version="1.5.0"; sha256="068ib0abpvds0ibb0d6m71svv7d3l0is4kdin1wzsn633kk3zcfy"; depends=[Matrix matrixcalc maxLik]; }; + lmvar = derive2 { name="lmvar"; version="1.5.1"; sha256="1j95f6ch4g54fxpiik2nxy42jgy0648sqwh8kaakrza5j45wy8hd"; depends=[Matrix matrixcalc maxLik]; }; lmviz = derive2 { name="lmviz"; version="0.1.1"; sha256="0wgq93pr54pc4vxzqlhc1i67zf4lrn8yzpvlqsv8byh2qb0dd4sv"; depends=[lmtest mgcv shiny shinyjs]; }; loa = derive2 { name="loa"; version="0.2.44.2"; sha256="16yrkl8l4wa4i3iizncm58l75l46acfr2lf4vn53crcci9xra333"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; }; loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; }; @@ -8823,7 +8943,7 @@ in with self; { 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]; }; - lognorm = derive2 { name="lognorm"; version="0.1.4"; sha256="1jyi8j9s5rd0arg750hddkpv92a9pzhifxjivnl8v5j9mz6v7z6r"; depends=[Matrix]; }; + lognorm = derive2 { name="lognorm"; version="0.1.5"; sha256="00l7nx6brhn5z7sk59n4bjw8h2wzf3r273ma6i62zhdc2nglz479"; depends=[Matrix]; }; logspline = derive2 { name="logspline"; version="2.1.12"; sha256="1y4q2v1chc70i04idj8a67lhndsipq9ymjsa3ijrxng8a6qx7ljk"; depends=[]; }; lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; }; lolR = derive2 { name="lolR"; version="2.0"; sha256="0ygxm5qym1s64pa8a04jf44y786svrkhscda2x781jx8gpil753v"; depends=[abind ggplot2 irlba MASS pls]; }; @@ -8835,20 +8955,20 @@ in with self; { longclust = derive2 { name="longclust"; version="1.2.2"; sha256="1yxxz8apbl1vaqzrsiq7r5ss87j2li595bkvibpkwslgwzv47dcs"; depends=[]; }; longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; }; longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; - longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.1.1.1"; sha256="06yzwah04hm8psy7rk740l4gqvi1amicsp25hxhv3gyppw3p789l"; depends=[dplyr ggplot2 rlang scales survival tidyr zoo]; }; + longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.2.1.1"; sha256="0abc324sldj4krxg1jg7s5dvi776z77qw5vpqhdv7pzzxrrjfdgn"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; }; longmemo = derive2 { name="longmemo"; version="1.1-1"; sha256="0myn2xpg0mw3x5zma0y1dza2jg3x9zj9z8xv2z8l2q9pm228xn0d"; depends=[]; }; longpower = derive2 { name="longpower"; version="1.0-19"; sha256="0m5c544d6vl2zhbyi0spy7ylvr366m7vrmk3xfghcvd5anbzpjk6"; depends=[lme4 nlme]; }; longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; }; - loo = derive2 { name="loo"; version="2.0.0"; sha256="1k2qhma7gm4l3h9wf5gh1gm09map2jqcdzz3pba4gf039n8h3gsl"; depends=[matrixStats]; }; + loo = derive2 { name="loo"; version="2.1.0"; sha256="0zg8a11qhifg1p3hisxin1q47wlykjig4k3dz5zmflfihpps3x0v"; depends=[checkmate matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; - loon = derive2 { name="loon"; version="1.2.1"; sha256="10yw83qaddfb6pb43dxsmlg9ix177l8msyvjpn09wajna1vwm6z8"; depends=[gridExtra]; }; + loon = derive2 { name="loon"; version="1.2.2"; sha256="1mb6jys2pipac31x8a7rm265zvx1l11w1gl2b82afl8as2v7s90j"; depends=[gridExtra]; }; 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.9"; sha256="03713ac7farwgjidnx46j6mzm6if10b33lrpzban9lis713s8qqm"; depends=[biomaRt digest dplyr futile_options ggfortify ggplot2 MASS reshape2 rlang]; }; 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-1"; sha256="0iq98vjs0qkhqlf7asijy8pb63jadb9l94hg0jj8nahc7z0c0hv9"; depends=[emulator magrittr tensor]; }; - lori = derive2 { name="lori"; version="2.1.2"; sha256="067qi3rrim8s8ijh5gvqqg591nfa6kgfak0kfmbgiv7bxrvffxz8"; depends=[corpcor data_table doParallel FactoMineR foreach glmnet rARPACK svd]; }; + lorentz = derive2 { name="lorentz"; version="1.0-2"; sha256="0napn1j6gwilskjnv2hjrxzrbcbh7cvfj578h0la9bpkm1xhi7di"; depends=[emulator magrittr tensor]; }; + lori = derive2 { name="lori"; version="2.1.3"; sha256="09wk6pfrfazh8s4zc7v1x5gsra9klh7whc3jnpasvhgnna5515ys"; depends=[data_table FactoMineR rARPACK svd]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; lpSolve = derive2 { name="lpSolve"; version="5.6.13"; sha256="13a9ry8xf5j1f2j6imqrxdgxqz3nqp9sj9b4ivyx9sid459irm6m"; depends=[]; }; lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; }; @@ -8912,7 +9032,7 @@ in with self; { m2r = derive2 { name="m2r"; version="1.0.0"; sha256="07zrqhva00jsp9da9ryzi8pjdrwri2mw0mqgg91r3rnl7id8safq"; depends=[gmp memoise mpoly pryr stringr]; }; mAr = derive2 { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; }; mBvs = derive2 { name="mBvs"; version="1.3"; sha256="0vxwdi45pd79c3lz507wlw2alvf501q27lwvd34j6y68p3vyv1vj"; depends=[]; }; - mDAG = derive2 { name="mDAG"; version="1.1"; sha256="11x51gcammjndivwjphh5m315w58n1hma4y39flw7qi97ij8lfrf"; depends=[bnlearn logistf mgm nnet pcalg Rcpp RcppArmadillo]; }; + mDAG = derive2 { name="mDAG"; version="1.2"; sha256="03f60k4705jcm147jpz7srqjxrn8v0li7w0rp9ryp44mccg9qjrl"; depends=[bnlearn logistf mgm nnet pcalg Rcpp RcppArmadillo]; }; mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; }; mFilter = derive2 { name="mFilter"; version="0.1-4"; sha256="0zfsa301f1sh1wqg9ap63n5p3952y6b37c4whi2sijinfkx4q2vv"; depends=[]; }; mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; }; @@ -8921,6 +9041,7 @@ in with self; { mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; }; mRMRe = derive2 { name="mRMRe"; version="2.0.9"; sha256="1zk09w9s8sc11j5cl0v93i09yn83f11diqib27rrph37aix2vs3p"; depends=[igraph survival]; }; mRm = derive2 { name="mRm"; version="1.1.6"; sha256="1d897c5xflbkkj25hw15rd62nggv000cv2j481x0lhdgmgldjhrh"; depends=[]; }; + maGUI = derive2 { name="maGUI"; version="2.3"; sha256="0dr0f90ldisqxklhysipbca6di7j6ks6an5k44g65h57b85z4n3q"; depends=[affy amap annotate beadarray Biobase BiocManager Biostrings Category convert genefilter GEOmetadb GEOquery globaltest GO_db GOstats graph gWidgets gWidgetsRGtk2 impute KEGGgraph KEGGREST limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; }; maSAE = derive2 { name="maSAE"; version="0.1-5"; sha256="0v0vlj41j3ddyxv8lld39k1ryrdjin7r6bj13x2agbklb1fd4an1"; depends=[]; }; mable = derive2 { name="mable"; version="1.0"; sha256="1ny8nfnyqj9c1n4b0m34kadpmnb4k2d81nd66cqxnz8dm9129vqj"; depends=[]; }; maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; }; @@ -8943,6 +9064,7 @@ in with self; { magicaxis = derive2 { name="magicaxis"; version="2.0.7"; sha256="121z8rgdfp24r8lbhharmb6cdpdkiz3v65qfvns4k9alx2lxb1vj"; depends=[celestial mapproj MASS plotrix sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; magick = derive2 { name="magick"; version="2.0"; sha256="18y465325mhf48x2jn3jz9khwq1z2aj13wfbdkv8k3hln1sd572m"; depends=[curl magrittr Rcpp]; }; + magickGUI = derive2 { name="magickGUI"; version="0.1.0"; sha256="0apbxwb0q3pza6scj82djmsm8qi2lp3wfqqrvd00pd88b4m90yb1"; depends=[magick]; }; magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; }; magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; }; @@ -8968,7 +9090,7 @@ in with self; { mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; }; mapdeck = derive2 { name="mapdeck"; version="0.2.1"; sha256="1slj4yrw7qir3cz70yqawbsz521n4614h6gjn0qpj75rj12wnxlk"; depends=[BH colourvalues geojsonsf googlePolylines htmltools htmlwidgets jsonify magrittr rapidjsonr Rcpp shiny spatialwidget]; }; - mapedit = derive2 { name="mapedit"; version="0.4.3"; sha256="0ybd9vbdpr3i3wfpcn36dqj3n9i885xycris2nwgxzc9dxb5ad7a"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; }; + mapedit = derive2 { name="mapedit"; version="0.5.0"; sha256="16rdksnkx6s7w92as896scfdnl1smp00fdnxmlz4ayym2a26wagb"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras leafpm mapview miniUI sf shiny]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; mapi = derive2 { name="mapi"; version="1.0.0-62"; sha256="1czg2lqrlmp7fsm7908bwd4f9klq8d90z79zb1g80w2dlh5hb0nc"; depends=[data_table pbapply Rcpp sf]; }; mapmisc = derive2 { name="mapmisc"; version="1.7.2"; sha256="0w0yvdnxk6gjcc86b6imq764va9f9hjan3ayw7qrbjpqx16fs7dx"; depends=[raster sp]; }; @@ -8977,7 +9099,7 @@ in with self; { mapr = derive2 { name="mapr"; version="0.4.0"; sha256="169ah9v7cpw3hmaj6n575gi1zwazf4vh59n46zghb1x68nc2gqs0"; depends=[data_table ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; }; maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; }; mapsRinteractive = derive2 { name="mapsRinteractive"; version="0.1.0"; sha256="1qjc5hffrk2bjw6ihlna1h0k3q9s9i19l0q0mgvcm9wpjy4c8gra"; depends=[gstat raster rgdal rgeos sp]; }; - mapsapi = derive2 { name="mapsapi"; version="0.3.9"; sha256="0jxwfw644d33xnj9jblcpw49qh8m4x5k4330nmz5rdd4hjnnzmsw"; depends=[bitops magrittr plyr sf xml2]; }; + mapsapi = derive2 { name="mapsapi"; version="0.4.0"; sha256="0yrcqqqbk5in4cvj3xvrybqarfxdzwbsays0p2gr7fm8d5kx9sih"; depends=[bitops magrittr plyr sf xml2]; }; maptools = derive2 { name="maptools"; version="0.9-5"; sha256="1pbvcn9xfx0hxq1ppbfg9xm5j04q4c15nj983yjmg7dlkzq135ax"; depends=[foreign lattice sp]; }; maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; @@ -8993,7 +9115,7 @@ in with self; { markdown = derive2 { name="markdown"; version="0.9"; sha256="08xzs4bcf12jxp0276m6xqvq8kcgg5qp6fxrvsz6r9x73jjccs1h"; depends=[mime]; }; marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; markmyassignment = derive2 { name="markmyassignment"; version="0.8.1"; sha256="1y388s73b1zs482d1d7z40kg4hizp46lc3279xspm2ryx4m49mzj"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; }; - markophylo = derive2 { name="markophylo"; version="1.0.6"; sha256="1gyj3ykwh4ljrb5s80hihy7wl89y3p4xkckspvv4ynl9lnsbm7cs"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; + markophylo = derive2 { name="markophylo"; version="1.0.7"; sha256="09rg5rwm0dm881fpm9yzygd6d3dyrxjsrvl0yhfpkzbpdihfympn"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; markovchain = derive2 { name="markovchain"; version="0.6.9.14"; sha256="0szv913zi34yv58kj6cic8fkrfyrl60m1ym11sgsjha0pjlv3hlw"; 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.2"; sha256="03xmp7jz2jja7m92yczc2nlcyv4qlcy7lnj3nk5wb3alh1vxlyga"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; @@ -9018,7 +9140,7 @@ in with self; { matrixNormal = derive2 { name="matrixNormal"; version="0.0.0"; sha256="1m3qvvw02fqisjjsvlpz4dpy71cmn0ds6pajdmzj2shfvyyh6q4d"; depends=[mvtnorm]; }; matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; }; matrixStats = derive2 { name="matrixStats"; version="0.54.0"; sha256="0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg"; depends=[]; }; - matrixTests = derive2 { name="matrixTests"; version="0.1.0"; sha256="0784wfp14z7lh6ylzgh9kvzs5gwapfs7ksx63jf3qwb95zfwyixx"; depends=[matrixStats]; }; + matrixTests = derive2 { name="matrixTests"; version="0.1.2"; sha256="05ccgd1ffh6hkr5y3ysb3a1w9cnlkvcr9jcrr9hn8xbhhbjiz9l1"; depends=[matrixStats]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; }; matrixsampling = derive2 { name="matrixsampling"; version="1.1.0"; sha256="1q0vcail34iwxc0wnwg2nw9n710fsjg5lgil5hib74vwrww1x1h7"; depends=[keep]; }; @@ -9039,7 +9161,6 @@ in with self; { mbbefd = derive2 { name="mbbefd"; version="0.8.8.5"; sha256="1bnbavhii2wm9944l4j5x21y9b3kp0sdshz32r1k7cy1y569zd6r"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; }; mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; }; - mbgraphic = derive2 { name="mbgraphic"; version="1.0.0"; sha256="0b4xr2ycx8v56fp40lnxv69qfp0yzai2hdwk3kw4wsmir91d2a91"; depends=[diptest dplyr extracat GGally ggplot2 gridExtra hexbin magrittr mgcv Rcpp scagnostics scales seriation shiny]; }; mbir = derive2 { name="mbir"; version="1.3.5"; sha256="10sd5gk2k94cmi49nbpywqvh9bxj9q3psa3d00zmw1a7d6c0jjpd"; depends=[effsize psych]; }; mblm = derive2 { name="mblm"; version="0.12.1"; sha256="1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b"; depends=[]; }; mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; @@ -9047,6 +9168,7 @@ in with self; { mboxr = derive2 { name="mboxr"; version="0.1.4"; sha256="1k0idfbj6l4lqaqksz0x8s88pwk9iqb5p1wfb51pvnc8rqaqf8n1"; depends=[dplyr lubridate magrittr purrr reticulate tibble]; }; mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; }; 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]; }; @@ -9065,9 +9187,9 @@ in with self; { 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.6.1"; sha256="1flq3g5jbp8nnx066wz35bg8wzlnnp9jp731w87vba483amakcds"; depends=[Matrix memisc]; }; - mclust = derive2 { name="mclust"; version="5.4.2"; sha256="09152swfpa3fzhmrq5cwb5kxgvrxvigv1m4v6rhcibrdhfd1x8x4"; depends=[]; }; + mclust = derive2 { name="mclust"; version="5.4.3"; sha256="18x5ych9zi3y87rxi4pf6f23sl2918dp9xxpw1pqa7p7drw817p6"; depends=[]; }; mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; }; - mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; }; + mcmc = derive2 { name="mcmc"; version="0.9-6"; sha256="1fc6a6asn53lx7x7pnlb5mb716nv4pcmbp99f1i30y4hzygihfj4"; depends=[]; }; mcmcabn = derive2 { name="mcmcabn"; version="0.1"; sha256="0cyqgkz55vc3hihls7krci4d83d48cqc0x355qkzxijwj5xd7bgg"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; }; mcmcr = derive2 { name="mcmcr"; version="0.0.3"; sha256="1pcf303wkxx8621nwlzrcx5m6z1wjbgnfbfk4dk24nddf82fyjgr"; depends=[abind checkr coda err]; }; @@ -9105,9 +9227,9 @@ in with self; { measures = derive2 { name="measures"; version="0.2"; sha256="1pp6nz30fbsqsvznim9j4vvz3z57sq5r234807flxfy0w7knydbd"; depends=[]; }; meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; - medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; }; + medfate = derive2 { name="medfate"; version="0.7.4"; sha256="0w2z4v2yvr1zr591kqkr8mipdz65c1540g00syd81hhmjlc8isvm"; depends=[GSIF meteoland Rcpp sp spdep]; }; medflex = derive2 { name="medflex"; version="0.6-6"; sha256="04cjqhyihxf1imbl9y9s58qpy6lmxsh2gwy4bras03hx52slzl5r"; depends=[boot car Matrix multcomp sandwich]; }; - mediation = derive2 { name="mediation"; version="4.4.6"; sha256="0prhpy9y26s388p9gv5sv4h5airixwy6ffjphhxmyp9h07088xxi"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; + mediation = derive2 { name="mediation"; version="4.4.7"; sha256="0nd4nli1qsvhgf404v1y16bc8q7axmpzyhbn38vncranb6lc235l"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; }; medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; }; meditations = derive2 { name="meditations"; version="1.0.1"; sha256="0wnx3zadpngfch0sb0ifqvsmzl613639f1yazwsgvhk29mycx4ss"; depends=[]; }; @@ -9124,7 +9246,7 @@ in with self; { meme = derive2 { name="meme"; version="0.2.1"; sha256="0ddrm82190f8yahnann1l5fwn55msfhhcizbr0vkb098x6m2l251"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; }; memery = derive2 { name="memery"; version="0.5.0"; sha256="0bin1rmna5z0y568jbnga7pcrkgjy04av3bzcyf3fpvqqmn36r8f"; 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.14.12"; sha256="0n8gl031n33r4iymlp3mnfilm9qwahxssrk4wlxfyp08w4mjlhjl"; depends=[lattice MASS repr]; }; + memisc = derive2 { name="memisc"; version="0.99.17.1"; sha256="1v5ixfpan8aisx7iipnv6rd754nlqfnl136ny5d4m3nkamalb81n"; depends=[lattice MASS repr]; }; memnet = derive2 { name="memnet"; version="0.1.0"; sha256="1lhpij3dm4whsawy6cxcfcwn9q881i8jbjpkrwvdsn63ibxrm55s"; depends=[BH igraph Rcpp]; }; memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; }; memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; }; @@ -9137,7 +9259,7 @@ in with self; { merlin = derive2 { name="merlin"; version="0.0.1"; sha256="14k8kz8icj3wgd3li83v0wfl61pdc97r7qjcsmmc5srp36kbw1i9"; depends=[MASS randtoolbox statmod survival]; }; 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]; }; - metR = derive2 { name="metR"; version="0.2.0"; sha256="0lp8462izsy0jhgm2kak85sdnnz75r6h0rjxkpx852lls6g3ibgl"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr RCurl scales sp stringr]; }; + metR = derive2 { name="metR"; version="0.3.0"; sha256="0dkmfrqdkl2f92kp94l10n0y9d29gn7ralgnpiry32w5c7ala1yy"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr 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.2"; sha256="07j9y54z039gnrp8w6xi0xj4xzl8x2qjlzgf4nh9frmwqd6cld2i"; depends=[geosphere leaflet matlab plyr RCurl]; }; meta = derive2 { name="meta"; version="4.9-4"; sha256="1g5zxd4l8lkyhrvm9w1kwym6gxi8slpgmhgj79ihbhvwi0bzy4gp"; depends=[]; }; @@ -9156,7 +9278,7 @@ in with self; { metacoder = derive2 { name="metacoder"; version="0.3.1"; sha256="1pp1y6s9hbzscbksbjvnhs0p6qb31hs4nlyk67wjsbbh4zcsasdn"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phyloseq phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize traits vegan viridisLite zoo]; }; metacom = derive2 { name="metacom"; version="1.5.1"; sha256="18n3mbmjna3db44gscsdgv1j8f11jhikiw7yg3vbw2a9v5w3ypkv"; depends=[vegan]; }; metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; }; - metadynminer = derive2 { name="metadynminer"; version="0.1.3"; sha256="1i3m8a9f97ypgfrych4180q1qqx0ld4icypiq019gppdwpfny5b9"; depends=[Rcpp]; }; + metadynminer = derive2 { name="metadynminer"; version="0.1.4"; sha256="06aricb1cp4sm56fr5skrxrs8ckccgq80rwbap7b0cp9y3sdgpcl"; depends=[Rcpp]; }; metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; }; metafor = derive2 { name="metafor"; version="2.0-0"; sha256="0h14wd7hr1d40p5r70f2jgdgj24jwpnr4nrj6yp5qjr466v81z96"; depends=[Matrix nlme]; }; metaforest = derive2 { name="metaforest"; version="0.1.2"; sha256="0ppv9vdwxggccn2202snl13vid3v2kx5ps81cadghg2kcd8axfbs"; depends=[ggplot2 gtable metafor mmpf ranger]; }; @@ -9197,12 +9319,12 @@ in with self; { mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; mgc = derive2 { name="mgc"; version="1.0.1"; sha256="0bdj890v2rinsddny8kwa48cgqh9qlzfd7k5s4i9mg40ajr0f291"; depends=[MASS SDMTools]; }; mgcViz = derive2 { name="mgcViz"; version="0.1.3"; sha256="0s1macn91lvzhb5hkccnr3vx9iv63w8fp4iipl7vd1m37zqais33"; depends=[GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; }; - mgcv = derive2 { name="mgcv"; version="1.8-27"; sha256="06vx1z52gcdmji0phmphfa0sg62gwxkw590prplxgv4da7xrk2y8"; depends=[Matrix nlme]; }; + mgcv = derive2 { name="mgcv"; version="1.8-28"; sha256="1snkpnkkigwrj9zm31j1nlivv9ls56imz263cv167hnmghiahpmm"; depends=[Matrix nlme]; }; mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; - mgm = derive2 { name="mgm"; version="1.2-5"; sha256="1f2b3qm6aqkpqqj6ls4zvrd8x4m22jc3j63p29dvz8gfpkifkcma"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; }; + mgm = derive2 { name="mgm"; version="1.2-6"; sha256="1pgw9gfrq1md8cpm8wf39f0n26hrynil1hc4px0vvilzal5yj3bc"; 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.0"; sha256="075rwsqaw2qmj5a42p3miv3nxyx3lvfj538vnmchfx221hslrhzq"; depends=[]; }; + mgsub = derive2 { name="mgsub"; version="1.7.1"; sha256="0v3386a7i71ixqidqfqakl428rnq0z9pjz08lgmyvray0ls5vmvi"; depends=[]; }; mgwrsar = derive2 { name="mgwrsar"; version="0.1"; sha256="13h56fgq3fs28fqh19hwbcza622xd921qnjwcgw2rjwaabqz70w5"; depends=[doParallel foreach htmltools leaflet Matrix nabor Rcpp RcppEigen sp spgwr]; }; mhde = derive2 { name="mhde"; version="1.0-1"; sha256="1q7lbj2is024f5rmfpdn3a0hsb78bf62ddal3chhnh3bi1z3jrjk"; depends=[]; }; mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; }; @@ -9226,7 +9348,7 @@ in with self; { miceExt = derive2 { name="miceExt"; version="1.1.0"; sha256="07xj9f5w0kh4d1yj8mx1jydvhd0vwpvvrb6h67xz5gb1ban4k6c6"; depends=[mice RANN RANN_L1]; }; miceFast = derive2 { name="miceFast"; version="0.2.3"; sha256="0ngb2qs71x0i8ffyb1qlbz2wk6c87m1r74l547c5pc9agnc227m0"; depends=[Rcpp RcppArmadillo]; }; miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; }; - miceadds = derive2 { name="miceadds"; version="3.0-16"; sha256="01zd9x1n2x452han2z59gg3yrrqrhldbwad9xkjsgzlcvjxly3ky"; depends=[CDM coda lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; }; + miceadds = derive2 { name="miceadds"; version="3.1-37"; sha256="1bkwik0r983a7p6w952874lszp7r8mnh5w2pamfqphl8rrxxi2cl"; depends=[CDM coda lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; }; micemd = derive2 { name="micemd"; version="1.5.0"; sha256="1bzy9lxgdvfrq3mhhx734aykpcr3klnwns70whz54y6afmcz7ghp"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; }; microPop = derive2 { name="microPop"; version="1.4"; sha256="0dfqn7g445w4nydklvsq5vlkiin6kcz8kkazj7jfbm98ikdywzm8"; depends=[deSolve]; }; @@ -9239,7 +9361,7 @@ in with self; { micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; }; micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; }; microplot = derive2 { name="microplot"; version="1.0-42"; sha256="062dd4k6ryyl44lwbc2qgdsfcs1fiv9j2n6lx9driw6vng533b6q"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; }; - microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.5"; sha256="0dybi3l1cyndn72h7dic2n8ll8xnkd837pyvmqkcivckhsl43p9w"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; }; + microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.6"; sha256="093rldfx3b45j4qn0r42d7fmqzx4h43s6vq4zlysdimq4ncxdm3v"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; }; microseq = derive2 { name="microseq"; version="1.2.2"; sha256="1h828iviraqrm43lhd0s3r7rdlakc6yfc6ngrcrkacpflfcmx3c7"; depends=[Rcpp]; }; microsynth = derive2 { name="microsynth"; version="1.0.9"; sha256="06k7lag0vlzhrq5x6h7m8q9n209hfal3dzzmpjgxb6i9xdigkr6h"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; }; midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; @@ -9253,6 +9375,7 @@ in with self; { milr = derive2 { name="milr"; version="0.3.0"; sha256="0z4d22fd6gd3zbi973vws9jqyh4c4m4i4ajcpxv934vxmbj0cma9"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; }; mime = derive2 { name="mime"; version="0.6"; sha256="00f4gw4sg1kn03s67gficxgb7a7fb6pwhlvrxrml05q1mc2vcxa7"; 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.4.2"; sha256="0f2yy5s9dxl8k12lrnc0w5d8vl0c9by0zc7gv05a2sq5jl7zrr8j"; depends=[dplyr lubridate magrittr openxlsx]; }; mindr = derive2 { name="mindr"; version="1.2.1"; sha256="00nl2f5kswl1xa3zprhy2ilsmb092dg6696wj0q28hq4myxfakdc"; depends=[data_tree htmlwidgets jsonlite knitr]; }; mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; }; mined = derive2 { name="mined"; version="1.0-1"; sha256="09jcyzirc4f69g4n5490pwrjqbdd40fwn8liy0xarlf7cnqqnzzk"; depends=[Rcpp RcppEigen]; }; @@ -9304,7 +9427,7 @@ in with self; { mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; mixRaschTools = derive2 { name="mixRaschTools"; version="1.1"; sha256="17idr4gyc2pv4zdwk6rgm15z32cn4271lf4hf64n8dgi0rbjlpxh"; depends=[]; }; mixchar = derive2 { name="mixchar"; version="0.1.0"; sha256="1az2gggwipkzg86pvn9w2csgfgrpdc88kca51f5qcw0zk4wx5hlx"; depends=[minpack_lm nloptr tmvtnorm zoo]; }; - mixdir = derive2 { name="mixdir"; version="0.1.0"; sha256="0kr82g7s9vp3i1vyqfpn30avdxg86xh0hgngbqmm5l2brd5sa4wx"; depends=[extraDistr Rcpp]; }; + mixdir = derive2 { name="mixdir"; version="0.2.0"; sha256="0z6scpvayfr2j1577s80pf9qh69f6qdczh488xvsm1rmf595s699"; depends=[extraDistr Rcpp]; }; mixdist = derive2 { name="mixdist"; version="0.5-5"; sha256="1wchhysd33xz395hq4wgd3zv1qc92pbiqxqd7g2v6m1pb0j8ma9g"; depends=[]; }; mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; }; mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; }; @@ -9332,7 +9455,7 @@ in with self; { mlVAR = derive2 { name="mlVAR"; version="0.4.2"; sha256="18a2nlpm3c7j9wr6winf8ymvw8jr7flxlmr99r6ngvbir97fq41g"; depends=[abind arm clusterGeneration corpcor dplyr graphicalVAR lme4 MplusAutomation mvtnorm plyr qgraph]; }; mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; }; mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; }; - mlbgameday = derive2 { name="mlbgameday"; version="0.1.4"; sha256="1zban8m2bqb4n12a20rgb44y7xmxg3r55nnxl03ikygi3xm3p8ir"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr tidyr xml2]; }; + mlbgameday = derive2 { name="mlbgameday"; version="0.2.0"; sha256="05b8jdrcfrh6rli9inkgizkmmj9jw0cypc5r4ckqqbrfj00zfi3q"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr tidyr xml2]; }; mlbstats = derive2 { name="mlbstats"; version="0.1.0"; sha256="1pfsc1pc5986gykx8l6afahszhaj4940l8g33fdxyy7194kbcz70"; depends=[]; }; mldr = derive2 { name="mldr"; version="0.4.2"; sha256="07d5zcid7bh8axkzi2x6mwj5zny5xfydzjdygjl3b0mz2qqrak1n"; depends=[circlize shiny XML]; }; mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.2"; sha256="0zyfv8xy5yik0k3j0kf9r43xrvj528qzdb1v74sfi24vim6k6503"; depends=[]; }; @@ -9343,7 +9466,7 @@ in with self; { mlergm = derive2 { name="mlergm"; version="0.1"; sha256="09wmgiirjky7kyli51bi2i7h8iazwmpcsjvmr3pc7v1larkkqyp4"; depends=[cowplot ergm GGally ggplot2 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="0.8.0"; sha256="1phy1q0v54mwmmip3z3kpwzi9zr21qs7kaa7c8mfp7s722mzj0aa"; depends=[aws_s3 forge fs git2r httpuv httr jsonlite openssl packrat processx pryr purrr reticulate rlang swagger withr xml2 yaml]; }; + mlflow = derive2 { name="mlflow"; version="0.9.0"; sha256="0dicdjzm2pwmhy8qns5yy75b6z3zwgjw0i62xl282mn760zlj6xh"; depends=[base64enc forge fs git2r httpuv httr ini jsonlite openssl packrat processx pryr purrr reticulate rlang swagger withr xml2 yaml]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; mljar = derive2 { name="mljar"; version="0.1.1"; sha256="1mw45aqjwklsnrfwf8656jf30miyrlxpz87z97nkv9i135yhwfx3"; depends=[httr jsonlite readr]; }; @@ -9362,9 +9485,9 @@ in with self; { 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="3.3.0"; sha256="0qbhmxmsyqfc2csk96qwizpjj7yk35r85rr5xaqkyr72mjn2m3gh"; depends=[ggplot2 Rcpp XML]; }; - mma = derive2 { name="mma"; version="7.0-0"; sha256="0g0nln1sdv0rmvgasmvs8xq28inq6h50h6xdpw0zhxk8s946k4d9"; depends=[car doParallel foreach gbm gplots plotrix survival]; }; - mmabig = derive2 { name="mmabig"; version="1.0-0"; sha256="1srrfk6dqqfc504w8rhrfag3lzsc55sw3ckkmgph6k8ss99zn285"; depends=[car glmnet gplots mma survival]; }; - mmand = derive2 { name="mmand"; version="1.5.3"; sha256="1n0h7nia9jjc11g8417nfd3wsg4m3bmblm9bsjd0b52vqxhpxmzh"; depends=[Rcpp]; }; + mma = derive2 { name="mma"; version="8.0-0"; sha256="14vhs97sfhhm3x5pl346b8azmyv1s6ffc7i50zy2amrxg4wkpmqc"; depends=[car doParallel foreach gbm gplots lattice plotrix survival]; }; + mmabig = derive2 { name="mmabig"; version="2.0-0"; sha256="1kp7q2xvkbwa8syk82dsynzizjmhh9z3p7r5hnnvp169as0yvgwl"; depends=[car glmnet gplots mma survival]; }; + mmand = derive2 { name="mmand"; version="1.5.4"; sha256="04kqxdbj54nflgx9lb80xxp121ligdzjkym850z3kbw60ashxybh"; depends=[Rcpp]; }; mmap = derive2 { name="mmap"; version="0.6-17"; sha256="1dh1i2v2pzhag8brc9c0z8vfs858rpbkg1xqqi4fi866w7g4lhxy"; depends=[]; }; mmapcharr = derive2 { name="mmapcharr"; version="0.3.0"; sha256="175qb6ay6zlcdcxzc86lmlddfzjc8j8i1b8cvi2q0j6nbl2kl50r"; depends=[Rcpp rmio]; }; mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; }; @@ -9384,6 +9507,7 @@ in with self; { mmtfa = derive2 { name="mmtfa"; version="0.3"; sha256="0qfszr6f10v27w1pfns78dyarznqryl4m1ppyqap7l8fc12sliky"; depends=[matrixStats mvnfast]; }; mmtsne = derive2 { name="mmtsne"; version="0.1.0"; sha256="1by0hrggla6idc1isnq072i1wfpw4x7id3hkg8l65gy8iycccd12"; depends=[]; }; mnis = derive2 { name="mnis"; version="0.2.7"; sha256="1yhhgrhsk3ww93vd29ipw16bkn16w0b2i7d46cb5bb5xs4s7vivd"; depends=[dplyr httr jsonlite Rcpp stringi tibble]; }; + mnlfa = derive2 { name="mnlfa"; version="0.1-53"; sha256="1hw4m6zpb2322041aizam1l71zxz3i7siawid8npig8v9dhkaqrf"; depends=[CDM Rcpp RcppArmadillo]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; }; mnreadR = derive2 { name="mnreadR"; version="2.1.2"; sha256="1kc55rwq1lg6ngmia0hjim5ki7aif71754whvh4nz252qq0j8w3b"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; @@ -9400,7 +9524,7 @@ in with self; { modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; modTurPoint = derive2 { name="modTurPoint"; version="0.1.0"; sha256="1m24vsi80ln1r7sr40pipaaanyc60yfxmjzf8l7nfy3yvyr8zqpn"; depends=[]; }; modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; }; - modeest = derive2 { name="modeest"; version="2.3.2"; sha256="0l8g23da8fwcsv314h33ny938657kr6bw0c4kx6v938xr92hfar7"; depends=[bazar fBasics genefilter stable stabledist statip]; }; + modeest = derive2 { name="modeest"; version="2.3.3"; sha256="1y9kzi0hhpm97a38z8c6dkma1wyhx15sfmqmlxcbs8dmlyibbjin"; depends=[bazar fBasics genefilter stable stabledist statip]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; model4you = derive2 { name="model4you"; version="0.9-3"; sha256="03s87dklil69znflny9vcl934yisfb13d0gdk94279cb4hb693c0"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; }; @@ -9415,7 +9539,7 @@ in with self; { modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; }; modesto = derive2 { name="modesto"; version="0.1.2"; sha256="0vmdj8wcy0vv9jaihxrj0m5sr7favz18ngfqc8pd8rd4ipcnxkjf"; depends=[markovchain]; }; modi = derive2 { name="modi"; version="0.1.0"; sha256="0v78vzb22v2h2qlfhsyi0d2j3c2gj3wgv67p6gv74269kiaglf92"; depends=[MASS norm]; }; - modifiedmk = derive2 { name="modifiedmk"; version="1.3.0"; sha256="09105n5x8lq726n4fglhz2cmqacb8xhmzq07wamq8sj3svjpm7yh"; depends=[boot]; }; + modifiedmk = derive2 { name="modifiedmk"; version="1.3.1"; sha256="0p2p6ckrvwpfypmiwajvgi8q9i2sa725nxajzb5klignpkpp40qq"; depends=[boot]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; }; modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; }; @@ -9464,8 +9588,8 @@ in with self; { movMF = derive2 { name="movMF"; version="0.2-4"; sha256="0j5gp1l374479lsijw1hz00pxs09zzh7hapljv80lsvr24vfscpa"; depends=[clue skmeans slam]; }; move = derive2 { name="move"; version="3.1.0"; sha256="0f5h5apwhp2z4ya8mkiflqfp46kmhfdr4zssi3rpkyl615d3dz9z"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; }; moveHMM = derive2 { name="moveHMM"; version="1.6"; sha256="1wz8yg87rxkq70hnahv1jd027938vl9g4wr9zvnq24vwc7hzdafz"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; }; - moveVis = derive2 { name="moveVis"; version="0.9.9"; sha256="1kq42swcm3gb7aiyw8j1rfk2mbgwiz5c44rcz2mbxgs6mac1fj1f"; depends=[geosphere ggplot2 gridExtra lubridate maptools move pbapply plyr raster rasterVis rosm RStoolbox simecol sp zoo]; }; - moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.2"; sha256="0dlq8l76j69h41sns3xvs6r8xyp9sqlk62n5lwh020m6dl66z9y3"; depends=[move Rcpp]; }; + moveVis = derive2 { name="moveVis"; version="0.10.0"; sha256="0v70xlh1q4rd1svdhqb99wccxfrhf2w998fjj7j899fpgvqsd18j"; depends=[av cowplot curl dplyr geosphere ggplot2 gifski lubridate magick move pbapply plyr raster rlang RStoolbox sf slippymath sp zoo]; }; + moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.3"; sha256="14a2iymn4j831xlh42z5qxmhnh7xpp5bxasgpkhnb3v0b5ldyilh"; depends=[move Rcpp]; }; movecost = derive2 { name="movecost"; version="0.1"; sha256="0h1xc5985r696lvwqncxd6blvzxzrgsw27wcw8cllg92yfzjnwks"; 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]; }; @@ -9518,9 +9642,9 @@ in with self; { msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; msgps = derive2 { name="msgps"; version="1.3.1"; sha256="0r8i0sw412jr148bid8sfpjcfbkf5589dqcqyvf5cm84cj7axnpz"; depends=[]; }; msigdbr = derive2 { name="msigdbr"; version="6.2.1"; sha256="1264j1hs74kq7hyh68vfynadfi6mdpq46qm1hnwzkzzhmbzpb9cg"; depends=[dplyr magrittr rlang tibble]; }; - msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; }; + msir = derive2 { name="msir"; version="1.3.2"; sha256="0pvc3q162vqq3k39nni732x05zzfz4y9y2zf56d83185ypszv9kb"; 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.6"; sha256="06m7fflb6lgjfnj9v4wjc63x2as8jvc24qmz6jvgm9fw7hnm24px"; depends=[expm mvtnorm survival]; }; + msm = derive2 { name="msm"; version="1.6.7"; sha256="0fp2s8jbj75wf4mk03rp5pzjkrmwd1rp4m5dxz83w0qn37vc00vm"; depends=[expm mvtnorm survival]; }; msma = derive2 { name="msma"; version="1.1"; sha256="15678v3vabafd22yh16ly90ll3r02lb93dsv0vm77j4if9626qbg"; 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]; }; @@ -9538,9 +9662,10 @@ in with self; { mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; }; muHVT = derive2 { name="muHVT"; version="0.2.1"; sha256="0qndbg9m3267s8h7gphcm4rkchfgkyzd1301wr6iajv0shrc98rv"; depends=[conf_design deldir dplyr ggplot2 Hmisc magrittr MASS purrr sp splancs]; }; muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; }; + muRty = derive2 { name="muRty"; version="0.1.2"; sha256="0r4i3z18259pzcv34vfylm09d8sfk2iybvikvw6kkk2jvc81id9x"; depends=[lpSolve]; }; muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; }; - mudata2 = derive2 { name="mudata2"; version="1.0.5"; sha256="1zr53bj8irimjnp4qnair331mcsb5jxyy7l9vz3ikigvwdgrxyv7"; depends=[dplyr fs ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; }; + mudata2 = derive2 { name="mudata2"; version="1.0.6"; sha256="0crknwlnnr1x6hvlmfny8b5x7d2wp5v4y20kbqc2n8linrc63s97"; depends=[dplyr fs ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; }; mudens = derive2 { name="mudens"; version="1.3.2"; sha256="18kv8xfmmmk0dyw64lwrlrks0gana0s7gaff6nxs59ndgb1pj6yp"; depends=[Rcpp survival]; }; mudfold = derive2 { name="mudfold"; version="1.1.1"; sha256="1lxlzzjvjqyivc8g8z6f8s0zkxf0k6mi76y5zm36r1kalhxyhkdy"; depends=[boot ggplot2 gtools reshape2 zoo]; }; mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; }; @@ -9565,7 +9690,7 @@ in with self; { multicastR = derive2 { name="multicastR"; version="1.0.1"; sha256="1sf5mn5hgz34ildga00462j92cr6v19132ns0sf9klwcrir8fqfb"; depends=[data_table stringi xml2]; }; multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; }; multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; }; - multicolor = derive2 { name="multicolor"; version="0.1.1"; sha256="1n7mxjkpd54y41lr3kwn3gwlka9p812jgazhlm9m6s9bc34sw3y9"; depends=[cowsay crayon dplyr glue magrittr purrr stringr tibble tidyr]; }; + multicolor = derive2 { name="multicolor"; version="0.1.2"; sha256="15md6si4bw6khb6k7l0jgbmbwda3zx4bgq23zc8apwdk81h20hhc"; 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]; }; multicool = derive2 { name="multicool"; version="0.1-10"; sha256="1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v"; depends=[Rcpp]; }; multifluo = derive2 { name="multifluo"; version="1.1"; sha256="1hnh1gj6lfnh2fn0v064bszydgsr6p9f7p8yxyw5rdxfrxymiw09"; depends=[agricolae ellipse imager]; }; @@ -9578,7 +9703,7 @@ in with self; { multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; }; multimode = derive2 { name="multimode"; version="1.4"; sha256="142k2jbi6y9aaqz9cwl4wk2m1y1n1fgvk873nk3psdv2h6r77slx"; depends=[diptest ks rootSolve]; }; multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; - multinet = derive2 { name="multinet"; version="3.0.0"; sha256="1hfxrgsjwk2v601pk84v24la8m8v1i0r08ylj5xzg299v8y8mm7k"; depends=[igraph RColorBrewer Rcpp]; }; + multinet = derive2 { name="multinet"; version="3.0.1"; sha256="0ag33gphazra9yj6fjq41zl6pc1n9mnl947m84m6gimasbj7zqb2"; depends=[igraph RColorBrewer Rcpp]; }; multinets = derive2 { name="multinets"; version="0.2.1"; sha256="00h1nqi49mix5rxp39i46pimmr3rl0c2869g7ss8cy0kl8hl41hz"; depends=[igraph igraphdata Rcpp]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; multipanelfigure = derive2 { name="multipanelfigure"; version="2.0.2"; sha256="0f24b0msx6y9ccdi65d8rxf589vw5rz6pxwa55bivq8cy5s4gc27"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; }; @@ -9593,11 +9718,11 @@ in with self; { multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; }; multistateutils = derive2 { name="multistateutils"; version="1.2.2"; sha256="135rjk16k85g3j3dw5pzz98waw7g3ixjdbkl7gqmngndyc3mlii9"; depends=[data_table dplyr magrittr networkD3 Rcpp tidyr webshot]; }; multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; }; - multivariance = derive2 { name="multivariance"; version="2.0.0"; sha256="0nd0mf0pj3xipy0kj9v25h9qr7i3fvyd9f93w6fhipi5can81fwg"; depends=[igraph microbenchmark Rcpp]; }; + multivariance = derive2 { name="multivariance"; version="2.1.0"; sha256="1lz9xh75bfij08rnsq9w3sdjcg826ri2bk544i70h65bvdwy5nw1"; depends=[igraph microbenchmark Rcpp]; }; multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; }; multiviewtest = derive2 { name="multiviewtest"; version="1.0"; sha256="03m64cqwlx8fyridkms2rz4xwvql2lfijck5wisvd3ggv4bp9cgh"; depends=[matrixStats mclust]; }; multiwave = derive2 { name="multiwave"; version="1.2"; sha256="1bw071izjxrsk5gx8s49nrlryabpgpg7k2z1ghmk8p6i9m5apnl8"; depends=[]; }; - multiway = derive2 { name="multiway"; version="1.0-5"; sha256="0ni38h16nddwib9nvcby59rsn9913qwhrlkpdkz99fwz8cnl8rw2"; depends=[CMLS]; }; + multiway = derive2 { name="multiway"; version="1.0-6"; sha256="1y9cykarr2aysdrnyab5aklsrc5id5b58881q03lcb5kc385v3gv"; depends=[CMLS]; }; multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.3"; sha256="1znsmca16jac8s5z0j64cck27pvf88anm1mfblabqchqqcz1ykfc"; depends=[boot sandwich]; }; multxpert = derive2 { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; }; muma = derive2 { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; }; @@ -9620,7 +9745,7 @@ in with self; { mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; }; mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; - mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.0.2"; sha256="1qgscjpbb9pymfrgc7ympgqz9j2fkq96ap2cwxj4k2z8v0pgp1ri"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase]; }; + mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.0.3"; sha256="058l58ngfy9clrv9qxv98bbysgfrlgaby17mzdia793fvdfl3jbs"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; mvabund = derive2 { name="mvabund"; version="4.0.1"; sha256="0la935gsiryfc0zixxr1dqj0av271x96pqxbi3bp6dksbw5gm68k"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; mvbutils = derive2 { name="mvbutils"; version="2.8.232"; sha256="0awd0jy492ha321c20kmmgl20kqphdmrmswakc0rq6h8z9d55kdg"; depends=[]; }; @@ -9652,10 +9777,10 @@ in with self; { mvtnorm = derive2 { name="mvtnorm"; version="1.0-10"; sha256="04md0wmqgif24g0a4hx19ifn4kk8nx10986vf2d9vascig6ikpri"; depends=[]; }; mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; }; - mwaved = derive2 { name="mwaved"; version="1.1.5"; sha256="1hb7y42fy26pv6cf235g4xx1vyvwx7chwryi7phjd2aavxffj18z"; depends=[Rcpp shiny]; }; + mwaved = derive2 { name="mwaved"; version="1.1.6"; sha256="12anv9f1mgb4p6f497zax3hzdc2wfjmi2sjha27qsfp7bfglikjn"; depends=[Rcpp shiny]; }; mwshiny = derive2 { name="mwshiny"; version="0.1.0"; sha256="0w4810p02x4iajma7wkvjvfqm567ca4rjfvcz8z4dpxbiax191dk"; depends=[shiny]; }; mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; - myTAI = derive2 { name="myTAI"; version="0.9.0"; sha256="0c9avdv9j26ykrcj1gxiqmmp8qffa66mlhfvvrwdffws5yi3nv8d"; depends=[biomartr doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp RcppArmadillo readr reshape2 scales taxize tibble]; }; + myTAI = derive2 { name="myTAI"; version="0.9.1"; sha256="0pbyxbrbbaadi5k2yp79lr6r56gjq65hmin3ssr032xipgw0d97l"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp RcppArmadillo readr reshape2 scales taxize tibble]; }; mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; }; myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; }; @@ -9671,14 +9796,15 @@ in with self; { na_tools = derive2 { name="na.tools"; version="0.3.1"; sha256="1lbzsckfg297n85kzbin65x1l6qgg9l50hd3xi2gflxc7n2xb8bw"; depends=[]; }; nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; }; nadiv = derive2 { name="nadiv"; version="2.16.0.0"; sha256="0pfg9hbhcjgbfmakl1jqqaf9i07i5z5jk7sh2x7x7p4354z30z9y"; depends=[Matrix]; }; - naivebayes = derive2 { name="naivebayes"; version="0.9.3"; sha256="15fq757djvsyz4j07m2y0zkfhr61y5brizqmk3g1f0l4lrbw4rpm"; depends=[]; }; + naivebayes = derive2 { name="naivebayes"; version="0.9.5"; sha256="1r49wby0k8rfc5nwfwnikykzcahqw0f8znjrvsqd8g4xz2s1w754"; depends=[]; }; naivereg = derive2 { name="naivereg"; version="1.0.1"; sha256="0wvyv54q3r4jz03jdbsmnxsinzpqcac6xjvzcrjjdzbkqfxicxal"; depends=[gmm grpreg]; }; namedCapture = derive2 { name="namedCapture"; version="2019.02.25"; sha256="0frlrbbpg2kvrggjv9z1qkizaw3vih3jwlngvaqaqrm7rwi04sc3"; depends=[]; }; - namer = derive2 { name="namer"; version="0.1.3"; sha256="1wsv5g50vamcz5fnbycmsjak64iyy62wl3cx8b1fjlxzlmczxfcn"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; }; + namer = derive2 { name="namer"; version="0.1.4"; sha256="0ika1imdrslfycbsg6zrssgghsc729ah4yvgjpv9kykppw098qwd"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; nandb = derive2 { name="nandb"; version="2.0.0"; sha256="0kdgljdgy84hhzrn8vab8bga2k5yg7fsy669sw5dhnsz4yjs8c0f"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr MASS purrr Rcpp reshape2 rlang stringr viridis]; }; naniar = derive2 { name="naniar"; version="0.4.2"; sha256="0qy3wgb4wixn01yyhbjf0dmx5xq42m4c3d46y2ysfj59181p39lm"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; + nanostringr = derive2 { name="nanostringr"; version="0.1.2"; sha256="1jdqfbnqpd1ppx506qmrjkjb2lliz7nhd49jr0iq9m8hqibjyv0j"; depends=[assertthat ccaPP dplyr magrittr purrr readr rlang tibble]; }; nanotime = derive2 { name="nanotime"; version="0.2.3"; sha256="0pcz49rm9l97xj5s7pvff2mf9373xhj0wr8bc57ibbi38adgcvbx"; depends=[bit64 RcppCCTZ 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]; }; @@ -9700,10 +9826,10 @@ in with self; { ncar = derive2 { name="ncar"; version="0.4.1"; sha256="0nqc3ari3ghxygqvb3vfzdqclh77mbhyh3pki86wwx6ym62b1bx0"; depends=[NonCompart rtf]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; }; - ncdf4 = derive2 { name="ncdf4"; version="1.16"; sha256="0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd"; depends=[]; }; + ncdf4 = derive2 { name="ncdf4"; version="1.16.1"; sha256="083sb24anyd4sw0il3x07pqn9rbx5y5ayqass6mz8x443rnjvphd"; depends=[]; }; ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; }; ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; }; - ncf = derive2 { name="ncf"; version="1.2-6"; sha256="1ac1jc7f6ywngbf9h9vb4rfm10cakljn1i48ga815h3m71cagmak"; depends=[]; }; + ncf = derive2 { name="ncf"; version="1.2-8"; sha256="1j2q1dqhr8xk9fhzjkpnx8ff427d1m8qr07l2zj5lwyh9wbr1jzn"; depends=[]; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; ncmeta = derive2 { name="ncmeta"; version="0.0.3"; sha256="14gbl7ln5ylplj12rsksyw0wlimh1gjnjm1c26mc8yg2h1cv3667"; depends=[dplyr rlang RNetCDF tibble]; }; ncodeR = derive2 { name="ncodeR"; version="0.1.2"; sha256="1wa87shdcngf6x22gcysylkxvj8h2k6f88r867wiagz0c01mq9bf"; depends=[cli R6 rhoR]; }; @@ -9713,14 +9839,14 @@ in with self; { ndl = derive2 { name="ndl"; version="0.2.18"; sha256="0b235v6jf98rrqp5aqw3jkk7mq8dbqmhb758zbzza1mavh4n2k7s"; depends=[Hmisc MASS Rcpp]; }; ndtv = derive2 { name="ndtv"; version="0.12.3"; sha256="08bvkfraj2sl879fywsl5k403xfhxfg55yd72nms2z8d3fqgcvj8"; 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"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; + neariso = derive2 { name="neariso"; version="1.0.1"; sha256="1b2gnws75kkqsi8mg9n0zzdaawx57a6zz47cswabj5m6nb09ikh8"; depends=[]; }; neat = derive2 { name="neat"; version="1.1.3"; sha256="0d8igx576jhi7f666nwn0wpdyvin974k5cfm7wdszzbnpng5961k"; depends=[igraph]; }; - neatmaps = derive2 { name="neatmaps"; version="1.1.0"; sha256="0qsc0jwnyadbm45qrskpmw12i980q11i988mga8ky3x4fa4jp82d"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; }; + neatmaps = derive2 { name="neatmaps"; version="2.0.0"; sha256="0wfbpyazlxbk1gyd1r9s0pb3iv8dkaib9zjbd1klrrsrjv7fxc5p"; 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=[]; }; needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive2 { name="negenes"; version="1.0-8"; sha256="0qyhypryp3p8c876jffg1syg05b370mw24clwlx733yx86qhmb1v"; depends=[]; }; - neighbr = derive2 { name="neighbr"; version="1.0"; sha256="0612nzpryj4xp0ncpvpn56x5n9ammzjp3ysq1rj1fc84h0p7nml3"; depends=[]; }; + neighbr = derive2 { name="neighbr"; version="1.0.2"; sha256="1l85x3p4h2z2npj1xqggviyd3kvkgni5cnx5p3g52s9jwqrj43kb"; depends=[]; }; neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; }; 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.2.1"; sha256="035nmv8iwpbwlq62khj9ra7c59g4r8jlkjrk6dkjvv6xiiznd3yb"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate readr tidyr]; }; @@ -9736,19 +9862,19 @@ in with self; { netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; }; netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; }; netdep = derive2 { name="netdep"; version="0.1.0"; sha256="0mrbqn5d8iqvs98a0kski0vya135z7l902xafya96s2h288jchx7"; depends=[igraph igraphdata MASS mvrtn]; }; - netdiffuseR = derive2 { name="netdiffuseR"; version="1.20.0"; sha256="0z7k62dipksc8gfppicbknh5sig7jdlr80h15q89bbk26jg5lqsr"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridis]; }; + netdiffuseR = derive2 { name="netdiffuseR"; version="1.20.2"; sha256="0fscbpn8dvaflnk06rpnxydvq1292l233rlxw14nkmm7d0508g9x"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; }; netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; }; - netgsa = derive2 { name="netgsa"; version="3.0"; sha256="0cqyiilpxhdi6zmibn85y1aqwpcs1aialz34klakmllzn6kvdsng"; depends=[corpcor glasso glmnet igraph Matrix]; }; - netgwas = derive2 { name="netgwas"; version="1.8.1"; sha256="19fd5j6vl0slhvvnrz87cln21pixzh2jkd4jw4xxzpdfyjbz067w"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; + 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.9"; sha256="18rdkchh56pn1an34ql9nsjzzd0ca599ygxhbp5c3hk1dwca04yf"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; netjack = derive2 { name="netjack"; version="1.1.1"; sha256="0pb9phfdjfp8yxlv5p0qb6vxhh8vb9iviffzrbj8x8dy3y3c9vp5"; depends=[brainGraph ggplot2 igraph Rdpack]; }; netmeta = derive2 { name="netmeta"; version="1.0-1"; sha256="1fsm41xz1dv6gwc354nxx4bj0xfmvamqhnhlbp5pn2g4y66wqm7s"; depends=[magic MASS meta]; }; netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; 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]; }; - network = derive2 { name="network"; version="1.14-377"; sha256="0iiy5n17kysrdfs20zr7qald4lwkvws0axi1qkr8f7vzv7w04g01"; depends=[magrittr tibble]; }; + network = derive2 { name="network"; version="1.15"; sha256="1cscw5978fyixhkicf06c4b2g1yf6gyi8vx86cz3dy75d41mrgjw"; depends=[magrittr tibble]; }; networkABC = derive2 { name="networkABC"; version="0.5-3"; sha256="0f3wbm76i8m9f52b0zvb2fvziqh43xy67llnv4lm54yj5szxvjr0"; depends=[network RColorBrewer sna]; }; networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; }; - networkDynamic = derive2 { name="networkDynamic"; version="0.9.0"; sha256="1949fbcw0gq8lsm6rx5d5mpj1y9k4rk2v0pmm1kxi5igi6yd8lg9"; depends=[network statnet_common]; }; + networkDynamic = derive2 { name="networkDynamic"; version="0.10.0"; sha256="1dgk3lj1fx0x6ccyp6h6rkzbjqqd8nflilqs4dfi8sm0fcndfcgb"; depends=[network statnet_common]; }; networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; }; networkGen = derive2 { name="networkGen"; version="0.1.1"; sha256="1vnh5dajiaf47kx1sxyp744mlk3yvl4sxj380i3b3ic1wlgyd2h1"; depends=[igraph mgcv]; }; networkR = derive2 { name="networkR"; version="0.1.0-0"; sha256="1apgvnny2ynhnyn1a2kjiyvxrdqgkqar2w543wph4lnavsi4i0cp"; depends=[data_table fastmatch Matrix Rcpp RcppArmadillo]; }; @@ -9776,12 +9902,13 @@ in with self; { ngstk = derive2 { name="ngstk"; version="0.2.3"; sha256="0196hnbqw9bji3bl2phjs9z5n84x5fs7iiirfd6gjyqv9xlfwd2p"; depends=[configr data_table future optparse stringi stringr]; }; nhanesA = derive2 { name="nhanesA"; version="0.6.5"; sha256="0bb53s379qrm8xqp4bsi5vgk6v6hvwadzjv09pvdp1n45z7rqj86"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; nhdR = derive2 { name="nhdR"; version="0.5.1"; sha256="071m7935k0n30c54sqh5gva9aih91c2yf3s1adfb5952pxpx0v65"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; }; + nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; }; nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nilde = derive2 { name="nilde"; version="1.1-2"; sha256="07m52c4gw0vcyb6pya5z7m4y1kiy2zvh0gnhp80hxc7nhyx0rnqd"; depends=[]; }; nima = derive2 { name="nima"; version="0.5.0"; sha256="1xpzq1mg2l9hnh83hbmxcqz3v0ai62ii7k688i8lpj0xnpsm25pl"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; }; - nimble = derive2 { name="nimble"; version="0.7.0.1"; sha256="12vgn29sxrk5dml4hlkz8l79gjswadj7jfnk69frvmkrlcbffvri"; depends=[coda igraph R6]; }; + nimble = derive2 { name="nimble"; version="0.7.1"; sha256="16yzkc171l5yki5ayp1fygjz68w4hz9nrrmji237y815q9hdv45l"; depends=[coda igraph R6]; }; nipals = derive2 { name="nipals"; version="0.5"; sha256="1zrn1ykl9scd988wj3mm0j6g5q6lq04iwn2ibgap1lrsd0rw1zbf"; depends=[]; }; 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]; }; @@ -9801,6 +9928,7 @@ in with self; { nlr = derive2 { name="nlr"; version="0.1-1"; sha256="12j2hp5fgpdz7pvlpykhf9zp1sw1f6vzhh5ykk9b2diaf3l55zsl"; depends=[GA MASS nlme quantreg robcor TSA tseries]; }; 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.2.0"; sha256="0ahgw0lmfpfb03fzhvp8a4rhvn0r84s90aiada4slss47g63iclq"; depends=[dplyr furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; nls_multstart = derive2 { name="nls.multstart"; version="1.0.0"; sha256="08zdyx5hp1xbqjspk0f89fca5gc0b5j87hsccvn9dxn2lrnwk8nb"; 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]; }; @@ -9816,7 +9944,7 @@ in with self; { nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; }; nmaINLA = derive2 { name="nmaINLA"; version="0.1.2"; sha256="0layk1pqry2g3xiwmasrnsvmw91sgg7iz15d6iz6hbq4za61hr0k"; depends=[]; }; nmathresh = derive2 { name="nmathresh"; version="0.1.4"; sha256="0nsywahzph06c7grk3ch65fvll4ninqz97y007d6qdqgmym9vxjq"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; - nmfem = derive2 { name="nmfem"; version="1.0.3"; sha256="1v808k25g0ph1wvx1j89izfxy9szn0m4sf965d8nkygrk184i9gj"; depends=[d3heatmap dplyr mixtools plyr tidyr]; }; + nmfem = derive2 { name="nmfem"; version="1.0.4"; sha256="0qn3p244i8mkmqhsjnyas2r2hcb21npn2jykf6dg7w2f1ddhbfbx"; depends=[d3heatmap dplyr mixtools plyr tidyr]; }; 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.3"; sha256="1m3bq0vg774kqragdx1ydm4q2if3yn9llbd6ybv3c8bmbdb9h405"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; @@ -9826,11 +9954,10 @@ in with self; { nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; 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.2.4"; sha256="0yfspirrrcz50ry0k66a6icmvsv07rdgxz8s8cp9zsxxqj0jad6g"; depends=[lwgeom RANN Rcpp sf sp units]; }; + nngeo = derive2 { name="nngeo"; version="0.2.7"; sha256="017rimcqf9k31qfraq5kg9jc266xmnss4s0yzj5jrz8zahbwann6"; depends=[DBI lwgeom RANN Rcpp RPostgreSQL sf sp units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; noaaoceans = derive2 { name="noaaoceans"; version="0.1.0"; sha256="15spkivnc6kv3w2z5m8gvlqpa6pfqxmggjchnsd3r0v61nz64ab3"; depends=[httr jsonlite rvest xml2]; }; - noaastormevents = derive2 { name="noaastormevents"; version="0.1.0"; sha256="1pkfmvp20f6xi2iy7l6c67zspp9f4wkrh7s308hlklms2difhp6m"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer stringr tidyr viridis XML]; }; nodbi = derive2 { name="nodbi"; version="0.1.0"; sha256="0i82713yhasl5n5zdncpsfplvfm77dvxjvhb4vvlsnfwk364gadf"; depends=[data_table jsonlite]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; nodiv = derive2 { name="nodiv"; version="1.3.0"; sha256="1z0xqdfplg5rz94qcnks435md3q7jpd5f32jfm0pqnyr3536gs03"; depends=[ape picante raster sp vegan]; }; @@ -9887,7 +10014,7 @@ in with self; { nparsurv = derive2 { name="nparsurv"; version="0.1.0"; sha256="1qy9qkkpqrk49vjxbyvl25i4kfk0py6v64izd8lmaw38dynybpy2"; depends=[survival TH_data]; }; npbr = derive2 { name="npbr"; version="1.6"; sha256="1jvq4snwrwjhhjgm8n8yxd5y94ks5zzi0xwdn931yp300qnikyzc"; depends=[Benchmarking np quadprog Rglpk]; }; npcopTest = derive2 { name="npcopTest"; version="1.03"; sha256="1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr"; depends=[]; }; - npcp = derive2 { name="npcp"; version="0.1-9"; sha256="16vzl3psa806ns387d5mhlp369r45ljcqlhl0lzdjpc1niv572nc"; depends=[]; }; + npcp = derive2 { name="npcp"; version="0.1-11"; sha256="0zkf01rv065x6sg8b8yal6125wbvjzaris5l9ghn2279q1fwdqz3"; depends=[]; }; nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; }; npmlda = derive2 { name="npmlda"; version="1.0.0"; sha256="1dr25an7cac89jyb8zhmj3ry6lq7sh7zxci1injplnk4gzy17mc5"; depends=[]; }; @@ -9938,6 +10065,7 @@ in with self; { nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; }; nycflights13 = derive2 { name="nycflights13"; version="1.0.0"; sha256="10b05cxpiysvlif59lriprxcyhgk59d3qmcpwwzk88wy6bicl9hn"; depends=[tibble]; }; nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; }; + nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="0.1-2"; sha256="1bq4ian9rxbrrm016mb9faqvdf5fg4ns36mp21zy9aycgdpaxlhm"; depends=[httr jsonlite stringr]; }; nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; }; oXim = derive2 { name="oXim"; version="1.2.2"; sha256="1hi4ps36amvgqgj64yc3cvy4sx32z1az6lk5yy1sciy6074k5byb"; depends=[gstat imagine R_matlab sp]; }; oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; }; @@ -9953,7 +10081,7 @@ in with self; { objectremover = derive2 { name="objectremover"; version="0.6.4"; sha256="1l21pva5rbwkfcy3sxhbz2qqp7lf4xjbmxhn0z5sn7gm4csjmf1l"; depends=[miniUI rstudioapi shiny]; }; obliclus = derive2 { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; }; obliqueRF = derive2 { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[e1071 mda pls ROCR]; }; - obliqueRSF = derive2 { name="obliqueRSF"; version="0.1.0"; sha256="0i19xg13py9h9dpj74c5l4kz38x0cjni577al4x3w689nsddya44"; depends=[data_table dplyr ggplot2 ggthemes glmnet missForest pec prodlim purrr Rcpp RcppArmadillo rlang scales survival tidyr]; }; + obliqueRSF = derive2 { name="obliqueRSF"; version="0.1.1"; sha256="1picy19mrgycfxpng5qqk7q5im3m2apx8w4jxmkslpmgg1c5q2ly"; depends=[data_table dplyr ggplot2 ggthemes glmnet missForest pec prodlim purrr Rcpp RcppArmadillo rlang scales survival tidyr]; }; obs_agree = derive2 { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; }; obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; }; @@ -9971,14 +10099,14 @@ in with self; { oddsratio = derive2 { name="oddsratio"; version="1.0.3"; sha256="1kdqnai8hbhxg9gjn9j7zgm8mw4bd765jkdrwrk9q65fpvc62f5k"; depends=[cowplot ggplot2 MASS mgcv]; }; odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; - odpc = derive2 { name="odpc"; version="2.0.0"; sha256="1lpd7x2vq8qdgf0nag0sqzf1jpbig52zr3glk17n7cl50v2m19ii"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; }; + odpc = derive2 { name="odpc"; version="2.0.1"; sha256="06d574sj7p5qlf7s3lbrwd56mcs4lq3pn9bkzwxhpybibgrfzn5q"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; }; odr = derive2 { name="odr"; version="1.0.0"; sha256="0niadinljx5pph329dgixivdc9s1l27ik9755fbfhmplhj92ihi2"; depends=[]; }; oec = derive2 { name="oec"; version="2.7.8"; sha256="0qi5xkyh5xgwcivihnc9wv96lzhdzlcz4zv08pvpxf7dx1qhafrj"; depends=[curl dplyr jsonlite magrittr purrr readr rlang stringr]; }; oem = derive2 { name="oem"; version="2.0.9"; sha256="1ffv71cwf58wrba3zhyp443kfl0j3z451mgxsxl8ig5fn9y9i9ca"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; officer = derive2 { name="officer"; version="0.3.3"; sha256="1ggdp8pbspn24sjshx1h48klivrx401vwk2df49j4wpwxh6dx26y"; depends=[base64enc digest htmltools magrittr R6 Rcpp rlang uuid xml2 zip]; }; oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; }; - ohtadstats = derive2 { name="ohtadstats"; version="2.0.0"; sha256="0vi0hi90l8p80kf0769iidlaq9j11myhxrj41lvxr70q4h4slr8j"; depends=[lattice]; }; + ohtadstats = derive2 { name="ohtadstats"; version="2.1.0"; sha256="17fpfqpvmyh2ykyb56g2zc72f8d8x7d85wmdm63n7b9kr53lscj3"; depends=[lattice]; }; oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; }; okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; @@ -9992,7 +10120,7 @@ in with self; { oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; }; onemap = derive2 { name="onemap"; version="2.1.1"; sha256="0j9c0ynwpzyr548n72wzmmk8gi52qvxlxgzqzn8g6n4v5zmzlkhy"; depends=[fields ggplot2 maps Rcpp reshape2 tkrplot]; }; - onewaytests = derive2 { name="onewaytests"; version="2.0"; sha256="0q3njwqdp33bdj9shr1jyrzrz6dqvg4dj90qxgyvj6iifsjrvpdl"; depends=[car ggplot2 moments nortest]; }; + onewaytests = derive2 { name="onewaytests"; version="2.1"; sha256="1s8p40ggxi3zswm9myhhs9xk0spxglwaplkqv6hhwvwchssl1vc3"; depends=[car ggplot2 moments nortest]; }; onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; }; onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; }; onlineVAR = derive2 { name="onlineVAR"; version="0.1-0"; sha256="1hqriwrlxhbi5v5wpqxfvvcb6np1iaarb3zf84ykfzi4llqqgz24"; depends=[lattice]; }; @@ -10003,25 +10131,28 @@ in with self; { ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; }; oompaBase = derive2 { name="oompaBase"; version="3.2.6"; sha256="0lighs2546nyhpgbjsn4k53c7jw6xyla5b82v8jp3l1sqxj68a3s"; depends=[cluster]; }; oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; }; - opalr = derive2 { name="opalr"; version="1.0.1"; sha256="1apw9bdm2hgfpplpg44sffc9cxfph981h12hlbssj650hraphffs"; depends=[httr jsonlite mime xml2]; }; - openCR = derive2 { name="openCR"; version="1.3.4"; sha256="1mllnmq47g43zchvf663dbhzj7pqzx687hbl4n0891m5jqbigbaj"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; }; + opalr = derive2 { name="opalr"; version="1.0.3"; sha256="0yhapqxpflk1p5vmj0hhwdi0sqfx3cw6b5207i5hg18qn6i2yshj"; depends=[httr jsonlite mime xml2]; }; + openCR = derive2 { name="openCR"; version="1.3.5"; sha256="01qmbmaisgaanw4sqxfhfcv2xv1iq5sfjrfd9crhmgwj1ki69vlw"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; }; openEBGM = derive2 { name="openEBGM"; version="0.8.1"; sha256="1mkv0ijrjxxazzrnpnshkla38mprhhqzsw7p4dnwk5xd90k4rvfw"; depends=[data_table ggplot2]; }; openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; openSTARS = derive2 { name="openSTARS"; version="1.1.0"; sha256="1cjws49r22cmdax136zcy3k35yzbajkm6pyfibgcw2iqdxy1vcxg"; depends=[data_table progress raster rgdal rgrass7 sf sp SSN]; }; openVA = derive2 { name="openVA"; version="1.0.8"; sha256="17nqh43gmhlb383ack1pbjkdfdb2g0k527zprdp1xkyxbp92v7xa"; 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.6-1"; sha256="0axym9jssh3fdb83mny54ry76z778sjmyvi851g3pg346fpfcxql"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; }; + openair = derive2 { name="openair"; version="2.6-4"; sha256="0r1gvpqq4rg7l70b4zzfydfsaqdj07plwmry8i62vwkyfsx38cby"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; }; opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; }; opencpu = derive2 { name="opencpu"; version="2.1.1"; sha256="0xg7d450334mbix2ms531982p03ayws4xwj3xpn0sln4dzpsyqjd"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sendmailR sys webutils zip]; }; + opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; }; - openssl = derive2 { name="openssl"; version="1.2.2"; sha256="0jfkna9zzhy2m5qd8501ija5jnpxzjn8wi3wjw0kr2fm4sl7qynz"; depends=[askpass]; }; + opensensmapr = derive2 { name="opensensmapr"; version="0.5.1"; sha256="1bdwvgx92mlvvxg2ki5d25zvg5n5g6caik0c77ldl7qig98qwr00"; depends=[digest dplyr httr lazyeval magrittr purrr readr]; }; + openssl = derive2 { name="openssl"; version="1.3"; sha256="1gx4mk7js1irzkql5rgk48ja9c6mm28ccxz483ngbhdd57az90qw"; depends=[askpass]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; openxlsx = derive2 { name="openxlsx"; version="4.1.0"; sha256="1n7z22pm78xa77fvn77kdn68az6xzxk36y11sqf0w6h6adri4yxb"; depends=[Rcpp zip]; }; opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; }; + oppr = derive2 { name="oppr"; version="0.0.2"; sha256="14ak4rfgp8anw58b0wlx4pny4f2rric32bj93kb7pxsl6q8c37zy"; depends=[ape assertthat cli ggplot2 lpSolveAPI magrittr Matrix proto Rcpp RcppArmadillo RcppProgress tibble tidytree uuid viridisLite]; }; ops = derive2 { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; }; optAUC = derive2 { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; }; optBiomarker = derive2 { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; }; @@ -10039,7 +10170,7 @@ in with self; { optigrab = derive2 { name="optigrab"; version="0.9.2.1"; sha256="1c3q4kx8rkgpjsy0hy2w2dd9kv51avnw1ab82hzmjgngfnvaig0n"; depends=[magrittr stringi]; }; optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; }; optimParallel = derive2 { name="optimParallel"; version="0.8"; sha256="1g7sgpm953lxq8yrxvqv7c4zqj6p0f7k0frcxjp3gv3yf9631q1n"; depends=[]; }; - optimStrat = derive2 { name="optimStrat"; version="1.1"; sha256="0wlkk0wmhzkxkam0d6lzr5s6hyb51fnvvd64syffgr084ivxymra"; depends=[shiny]; }; + optimStrat = derive2 { name="optimStrat"; version="2.0"; sha256="0n9igrxyasl2h2xjsx044ma3nqbd8258psc2h6za2pw6jjwwlz4g"; depends=[cubature mvtnorm shiny]; }; 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]; }; optimos_prime = derive2 { name="optimos.prime"; version="0.1.0"; sha256="0y2i5phpb0w35mzpvd9llxar5naq4c0cqkacwz8wy5mkgxw2hff4"; depends=[ggplot2 plotly tidyverse]; }; @@ -10052,7 +10183,7 @@ in with self; { optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; }; optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; }; optmatch = derive2 { name="optmatch"; version="0.9-10"; sha256="1jnvk9r7jc8w5rg8xvhbhj0wmy0l1hhjm8iwyf703939p4xc5z71"; depends=[digest Rcpp RItools survival]; }; - optparse = derive2 { name="optparse"; version="1.6.1"; sha256="04vyb6dhcga30mvghsg1p052jmf69xqxkvh3hzqz7dscyppy76w1"; depends=[getopt]; }; + optparse = derive2 { name="optparse"; version="1.6.2"; sha256="0zrp6jakjhawrwfri270ym83vj5a7nvjk0w6b41z41ahw2da99dm"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; }; optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; }; optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; }; @@ -10071,7 +10202,7 @@ in with self; { orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; }; orderedLasso = derive2 { name="orderedLasso"; version="1.7.1"; sha256="1qywvvdbxjqq886i1gd1hsxx92zm7lbalm0acylabap5m2nf9q53"; depends=[ggplot2 Iso Matrix quadprog reshape2]; }; ordering = derive2 { name="ordering"; version="0.7.0"; sha256="0sgwgcjg6sazmi11c9qvxfrzg671kcp18i2q20xbmbj4v3yqhwbh"; depends=[]; }; - orders = derive2 { name="orders"; version="0.1.1"; sha256="0px70ph46303nnmjaz5a10mhivp8ipg449cdmwrffj3hrly4j3fs"; depends=[Newdistns]; }; + orders = derive2 { name="orders"; version="0.1.2"; sha256="0g0gjwr38avg9b5k5sdffq071biakdjmwfwgpfz015iissj77h9v"; depends=[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.3-9"; sha256="0xsr2715ghh1q5hjnx7d8lyavzfvpi370blm1xdljn3p4kar8ldi"; depends=[MASS Matrix numDeriv ucminf]; }; @@ -10081,16 +10212,16 @@ in with self; { ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; }; ordinalNet = derive2 { name="ordinalNet"; version="2.6"; sha256="0mapkhhv5bpmfxw2dhg9lrw7lj8ha7s7yhamihga2l977ja0ma34"; depends=[]; }; ordinalRR = derive2 { name="ordinalRR"; version="1.0"; sha256="07gihg8hppxa7bp5wxcshqawj3vkzicmdsrnjyrasr3glv08b9lj"; depends=[rjags]; }; - ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.5"; sha256="0i66i0qwsc52yj4hpfzk4d8v2nwdd4zr7zgqlxvsk3n8vi65lnqf"; depends=[survival]; }; + ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.6"; sha256="0axpndyyns649mwifq8f16l8n8x9nic8cv8l71ljyr2gwlm0nqz0"; depends=[survival]; }; ore = derive2 { name="ore"; version="1.6.2"; sha256="1l1ziljgm5gwjhvjq42wi5vcwbxlaj5dl9w8bhz0wh8vx4ajj07m"; depends=[]; }; ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; }; - org = derive2 { name="org"; version="2019.2.21"; sha256="1izj1aq58z1bmfj359g4ij2ag5sz84nh70wqzyvymb8fghwm3asr"; depends=[lubridate stringr]; }; + 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]; }; orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; }; orientlib = derive2 { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; origami = derive2 { name="origami"; version="1.0.0"; sha256="0692n4javr0lwxcd0b83sbbhxbmxxs41sjvlsq5bc5l7n140qaca"; depends=[abind data_table future future_apply listenv]; }; originr = derive2 { name="originr"; version="0.3.0"; sha256="1r4w8gilr25gdqm3slviwas3s7qkpiyv4ifzp7qkby6vrdswnngb"; depends=[crul data_table jsonlite taxize xml2]; }; - orloca = derive2 { name="orloca"; version="4.6"; sha256="1mhm4m0qmhhb1kca2s5z630f52h3a5ms16aqxrq9a8j9nyd65xh4"; depends=[knitr png ucminf]; }; + orloca = derive2 { name="orloca"; version="4.8"; sha256="01fq3sas2xlp56f6s8jn5079pchszg2pbvzy8d5psxpb5jz59mwc"; depends=[knitr png rmarkdown ucminf]; }; orloca_es = derive2 { name="orloca.es"; version="4.6"; sha256="1yfsvihm8p4ggdfam50i2xg7dy7khww5qqk6g4lry3m1icwx6vsy"; depends=[orloca]; }; oro_dicom = derive2 { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; }; oro_nifti = derive2 { name="oro.nifti"; version="0.9.1"; sha256="19w9dzyfmfgxgxb5i0l06b6gzqksx879iwicfs76fwmb1q2ph540"; depends=[abind bitops RNifti]; }; @@ -10101,18 +10232,20 @@ in with self; { 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=[]; }; - osc = derive2 { name="osc"; version="1.0.0"; sha256="08ac64xqq3diw9xkialvxjvqk5khd3kjdxdi3zic2if05i3rb4ns"; depends=[raster]; }; + osc = derive2 { name="osc"; version="1.0.4"; sha256="0vy7kvm2l7z6jm8y44vxbmzmkh1i10m0gzk754i2xk92ijjb75w2"; depends=[raster]; }; osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; }; oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; }; osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; }; - osmdata = derive2 { name="osmdata"; version="0.0.9"; sha256="1zksgh9pm78454j7hlip6a4xq371izv33v5lygw0bdapd1kxsnwc"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; + osmdata = derive2 { name="osmdata"; version="0.0.10"; sha256="0anbfa7ixj3xr2pcm8k4vzrg36925gqxmnr53kykdj2xdgwcdhsh"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist 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.5.0"; sha256="12gm5mhmnzvfmziiln0lnqs173gan10ihwkcj07dcjii4nvkg4p9"; depends=[Matrix R6 Rcpp]; }; osrm = derive2 { name="osrm"; version="3.2.0"; sha256="17c880x4d81wzrs867icbhwvm7y48ljy99yqjjm37a2ihz61vhw4"; depends=[gepaf jsonlite raster RCurl rgeos sp]; }; osrmr = derive2 { name="osrmr"; version="0.1.35"; sha256="1pmsybyqkgpqz0yhfmwrsa2smgmclxzk9mlzcqmm8ph6dcd1x0s8"; depends=[assertthat bitops R_utils rjson stringr]; }; otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; }; + otpr = derive2 { name="otpr"; version="0.1.0"; sha256="1g2wy64fad67yqvq6mj1hy05vp6kjdm9b6nj0ba395c7hfxvkc7f"; depends=[checkmate curl httr jsonlite]; }; otrimle = derive2 { name="otrimle"; version="1.1"; sha256="0c3wlj6cxpikrfr0knldd1z2kfihpfsppnyb9n3rflnxhk7pwij2"; depends=[doParallel foreach mclust]; }; + otsad = derive2 { name="otsad"; version="0.1.0"; sha256="1cg73p2fqa8wpmx5wimq5bch7g7a2pyqpqm7cw8lplf2l3yyl74f"; depends=[ggplot2 plotly reticulate sigmoid]; }; otuSummary = derive2 { name="otuSummary"; version="0.1.0"; sha256="15sjjkivh37kjcj02s2l8xabn3x1kg348i69kyhbvsbqawh2s9y0"; depends=[fossil reldist 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.11-1"; sha256="0xkwwi62vdahlcg3k32zb1nfwsx87zdssk79mvcxgfsw9bw4gahx"; depends=[subplex]; }; @@ -10125,7 +10258,7 @@ in with self; { overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; }; overlapping = derive2 { name="overlapping"; version="1.5.2"; sha256="1scdbs9xz9xbnavg4by5zcbxrd9ckhn9dv35szr8phx10604a60n"; depends=[ggplot2 testthat]; }; overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; }; - overture = derive2 { name="overture"; version="0.1-0"; sha256="0iczf2dfxm1jn9k8ywdinhh42rbjva8f73rxz3w2xmspwqyg6f08"; depends=[bigmemory]; }; + overture = derive2 { name="overture"; version="0.2-0"; sha256="1cn268mjq64h5hsxllbgbrg80mdfnfrzcdx93rg292jd7issnbng"; depends=[bigmemory]; }; owmr = derive2 { name="owmr"; version="0.8.1"; sha256="11krzrkr1ga41nv9c2fb8cb2mgy3ias7qx85d4cdv4k68lsksv18"; depends=[httr jsonlite magrittr plyr tibble tidyr]; }; ows4R = derive2 { name="ows4R"; version="0.1-0"; sha256="1a27h63spy46ms7fgh2vl659znp5g55d1hsk6py6lgfa6hc2f1dx"; depends=[geometa httr openssl R6 rgdal sf XML]; }; oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; }; @@ -10141,7 +10274,7 @@ in with self; { 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.13.0"; sha256="0ain17clympkx09ym7gydylcd93096dxzqx1qzci310yq2l7fknm"; depends=[ggplot2 plyr Rcpp]; }; + pROC = derive2 { name="pROC"; version="1.14.0"; sha256="0ki1pvj5iaki81crapvwqllg5avn5qlvv62axnsdkdcmv9xc3wg0"; 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]; }; @@ -10151,13 +10284,13 @@ in with self; { packHV = derive2 { name="packHV"; version="2.2"; sha256="0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81"; depends=[survival WriteXLS]; }; packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; }; packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; }; - packagefinder = derive2 { name="packagefinder"; version="0.0.7"; sha256="030s8r2k0q3vls6vndmdz8a45kqrqx9whqvrcbh3f6xgy1vhs1hs"; depends=[formattable httr jsonlite pander stringr]; }; + packagefinder = derive2 { name="packagefinder"; version="0.1.0"; sha256="0h3j4q66idg0hqb2ar8y0k8s8c9px2zh49zwqrfc5gxdfsh8ayn9"; depends=[crayon formattable httr jsonlite lubridate pander stringr tidyr]; }; 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]; }; packrat = derive2 { name="packrat"; version="0.5.0"; sha256="1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n"; depends=[]; }; - pacman = derive2 { name="pacman"; version="0.5.0"; sha256="0gb0fsm8rm81j22q93fqx8q6zgjq3w1pv791ac0smc1a45blfab1"; depends=[remotes]; }; + pacman = derive2 { name="pacman"; version="0.5.1"; sha256="0z7gngd6h83cpjhq1vg75wvzhdjbgjh7gj5d4zvvi9gd2lmagjcy"; depends=[remotes]; }; paco = derive2 { name="paco"; version="0.3.2"; sha256="0qf692fqlq0d7hh9yllywaswmj5spy6q1r67nzkhgyh311nhjh6c"; depends=[plyr vegan]; }; - pacotest = derive2 { name="pacotest"; version="0.3"; sha256="135637bidfx71xay6c69lfjvr4i0v3ckgkg0fi838p24is6icbix"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; + pacotest = derive2 { name="pacotest"; version="0.3.1"; sha256="0mpdgd8pr7clh5ickz245kqlhh197cnmm8kzxp84fddjb3i1m011"; 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.4.1"; sha256="0nxclaxg31hddl2yhhm5886g7fc4j7g294ibv6hxb1cm5mrfgngy"; depends=[dplyr lubridate Rcpp rlang]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; @@ -10171,12 +10304,11 @@ in with self; { 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.4-5.1"; sha256="0j15qbpym0y9ipc4l3z95f0bzc0pgzayspyqv81p7xakksnj2y02"; depends=[]; }; - pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-26"; sha256="0dislkyvzckkxl2ccdpalyfbp4pfs6yvzwr175h2xcbzm5jjf35j"; depends=[boot coin MASS MCPAN mcprofile]; }; + pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; 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]; }; - palaeoSig = derive2 { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; }; palasso = derive2 { name="palasso"; version="0.0.4"; sha256="04xq7ax5hdppvz37kqasmcsqwnfxjcfjxsrzbhsvlkm06n5z7ccq"; depends=[glmnet Matrix survival]; }; paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; }; - paleoTS = derive2 { name="paleoTS"; version="0.5-1"; sha256="18f5lkgzvndc8s7w7d7dfdlqf37adrmzabpwkavjw1zkpb1dga8c"; depends=[doParallel foreach iterators mnormt]; }; + paleoTS = derive2 { name="paleoTS"; version="0.5.2"; sha256="1hd143xw16n8xhicfr6nfyfm6kyr56gyiq5vqnfzhmndjrvkpkx7"; depends=[doParallel foreach iterators mnormt]; }; paleobioDB = derive2 { name="paleobioDB"; version="0.6.0"; sha256="00bx59gv59hsdlg5x7n6n68av0m4brw2d02caifzgy79cfln5rha"; depends=[gtools maps plyr raster RCurl rjson scales]; }; paleofire = derive2 { name="paleofire"; version="1.2.3"; sha256="0psmkcfyr71dzb0ja0ir5ppy74dw2gladhisammsn4cb1zsarpl8"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; }; paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; }; @@ -10191,14 +10323,14 @@ in with self; { pals = derive2 { name="pals"; version="1.5"; sha256="0zc4dw8ipvhdm2qvy71k16vf8fmjs08nqbvvdi1k8h4fs648ddhi"; depends=[colorspace dichromat mapproj maps rgl]; }; pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; }; pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; }; - pammtools = derive2 { name="pammtools"; version="0.1.8"; sha256="1lh8z956wayl2hkvpvwqnm156zw7bqph0hpafgm5wz5xcwaqrgj0"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv msm mvtnorm purrr rlang survival tibble tidyr]; }; + pammtools = derive2 { name="pammtools"; version="0.1.9"; sha256="011156sdy5764021nvdz1zvg6slxij1494v5y18i110575j4ia16"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv msm mvtnorm purrr rlang survival tibble tidyr]; }; pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; }; pamr = derive2 { name="pamr"; version="1.56"; sha256="03h1m5fkw76jjln1psdb7x913a499ghf7n48rcd8damr5vdyf961"; depends=[cluster survival]; }; pan = derive2 { name="pan"; version="1.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; }; pander = derive2 { name="pander"; version="0.6.3"; sha256="1bd9sdghlsppmff18k5fg3i0visq9f4wc82rlhwq5m82bmgdgnyi"; depends=[digest Rcpp]; }; pandocfilters = derive2 { name="pandocfilters"; version="0.1-1"; sha256="18n155rkbr3gq5lsb0bh1v1v0z0r6xr2ald3nh7xh3v9qwxpmsz1"; depends=[jsonlite]; }; panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; }; - panelView = derive2 { name="panelView"; version="1.0.5"; sha256="1hmb311qimm60l9zvk0nkgh4qy2givm8a8rdmmpfb9bfbbg6clks"; depends=[ggplot2 gridExtra]; }; + panelView = derive2 { name="panelView"; version="1.1.2"; sha256="0kbh2g8yynv2mvvndy89lkm5yhy2hr04z52i2ccv9yfrkyignlfp"; depends=[ggplot2 gridExtra]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; }; panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; }; pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png rappdirs tibble xml2]; }; @@ -10221,16 +10353,16 @@ in with self; { parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; }; parfm = derive2 { name="parfm"; version="2.7.6"; sha256="1n548gaf62m56n8rlcz1mhpqxikd33vydjwl4wps441drp1dbvs0"; depends=[msm optimx sn survival]; }; parfossil = derive2 { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; }; - parglm = derive2 { name="parglm"; version="0.1.1"; sha256="0l9spr0cdiamkrvf4kzf2sgimm3ksralb70960vn1jw7ggh16wfz"; depends=[Matrix Rcpp RcppArmadillo]; }; - parlitools = derive2 { name="parlitools"; version="0.3.0"; sha256="1ziid1lrm7bhnaaq6k8dy9dpqdv89mq1j8lj015c2xwwjx6v76bx"; depends=[dplyr hansard mnis readr sf snakecase stringi]; }; + parglm = derive2 { name="parglm"; version="0.1.3"; sha256="1d6s2fjggx5mkcvqb40k5vkh53j1c6v0rjdl1yqs968b547468jh"; depends=[Matrix Rcpp RcppArmadillo]; }; + parlitools = derive2 { name="parlitools"; version="0.3.1"; sha256="0hjk0c39vv51bhzzbqf7dpna6iai53jwlv0m6m9kazsfkc6g4dan"; depends=[dplyr hansard mnis readr sf snakecase stringi]; }; parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; }; parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; parmsurvfit = derive2 { name="parmsurvfit"; version="0.1.0"; sha256="0d3614q76dw3f7y9p8378hdny7bz5fymma5l0zpygr1cfnacdhh6"; depends=[fitdistrplus flexsurv ggplot2]; }; - parsec = derive2 { name="parsec"; version="1.2.1"; sha256="0bdhpq5xx0318yyk1c0a5bi32ylvq7wr0d7gdf0z0czl2060r0na"; depends=[igraph]; }; + parsec = derive2 { name="parsec"; version="1.2.2"; sha256="1qvf6rxg02y3lm2lfaa2vgc4ki4grf34sr5rbax2nh0gy5z09dlx"; depends=[igraph netrankr]; }; parsedate = derive2 { name="parsedate"; version="1.1.3"; sha256="0mg7hbm3903iwvmpn51gjpaaq03rsp72hjb1g8h5g84r81iha002"; depends=[]; }; 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.0"; sha256="19mf92qjhqcdhmf3affwm8zk965xnay848csm9glcb2a6lh0nhqq"; depends=[]; }; - parsnip = derive2 { name="parsnip"; version="0.0.1"; sha256="00ddfv5lqkk5klb7p0xxna0l02rc4ibir5z82i0b6n6n9smv8f3h"; depends=[dplyr generics globals glue magrittr purrr rlang tibble tidyr]; }; + parsnip = derive2 { name="parsnip"; version="0.0.2"; sha256="0q0ygm0j1wdjlgzzc4cvi43is7jxkzf7vcky3yf2cny923rgbj22"; depends=[dplyr generics globals glue magrittr purrr rlang tibble tidyr]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; 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]; }; @@ -10268,11 +10400,12 @@ in with self; { pavo = derive2 { name="pavo"; version="2.1.0"; sha256="1r6mbxfyalffm75qbxilkjcp7vsm4r1f9k7mkvj6q1j4rd0s0zij"; depends=[geometry pbmcapply plot3D rcdd readbitmap sp viridisLite]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; }; + paws_common = derive2 { name="paws.common"; version="0.1.1"; sha256="02cxcgpjla9cfnkfh1pllr9x58whsnnl81rwqq9xj7mficrbl2vj"; depends=[base64enc digest httr ini jsonlite xml2]; }; pbapply = derive2 { name="pbapply"; version="1.4-0"; sha256="0bn7a9ni36xy5acnrl9ky3gd1k8jr5kxgazzh3pzd1q6bri1nx7k"; depends=[]; }; pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; }; pbdBASE = derive2 { name="pbdBASE"; version="0.5-0"; sha256="11jlfr0pswldd5h06swfrc8bm785dv09iqgg3kfnc53yvrs0d7qv"; depends=[pbdMPI pbdSLAP]; }; pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; }; - pbdDMAT = derive2 { name="pbdDMAT"; version="0.5-0"; sha256="1wpl0incn6w6pz9ryfz7cldid2mw2rgn7xi3112iz5c2g5yjnv8z"; depends=[pbdBASE pbdMPI]; }; + pbdDMAT = derive2 { name="pbdDMAT"; version="0.5-1"; sha256="0vg362f3wj5bmla5h85lqy5vs3q0sffcxbmbs9s0m378ahjcjqh3"; depends=[pbdBASE pbdMPI]; }; pbdMPI = derive2 { name="pbdMPI"; version="0.3-8"; sha256="0yxzldgvjzzw4adsdv6sh3m3n6xlwfh2rmzn6pgppk8s1brbbjli"; depends=[rlecuyer]; }; pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; pbdPROF = derive2 { name="pbdPROF"; version="0.3-1"; sha256="0a7c31605si062vbwcwngv770axlwyhh00cvdfqw3hv421p61sj8"; depends=[]; }; @@ -10282,7 +10415,7 @@ in with self; { pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; }; pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; }; - pbmcapply = derive2 { name="pbmcapply"; version="1.3.1"; sha256="00ampsksphhi0l8mxyksadvvzjdpg42gmgq74bizka1hscvp0g3m"; depends=[future]; }; + pbmcapply = derive2 { name="pbmcapply"; version="1.4.1"; sha256="063kgrdj2lmcgfdhplk8b05lpqay2qfgfmw7r3flq87mb2sfw6da"; 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.2-16"; sha256="1jr0xvk56d7qqpj7azw64lidwc3604iw87k7cccswv4yvbihvzzk"; depends=[Rcpp RcppArmadillo]; }; @@ -10291,7 +10424,6 @@ in with self; { pca3d = derive2 { name="pca3d"; version="0.10"; sha256="1bpm4sbj7h2fd0h5ybjhq8g61l8v2fbc92yiiascdgfili85zsf3"; depends=[ellipse rgl]; }; pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; pcaL1 = derive2 { name="pcaL1"; version="1.5.2"; sha256="1f7481wn2c935llb9visfdlv958ixxqybp5r2dy7nm18jacf2a0l"; depends=[]; }; - pcaPA = derive2 { name="pcaPA"; version="2.0.2"; sha256="14hi09qksr1z54l268yv4g2x5hlikir7zir4ccd9yi5z1918ksj5"; depends=[ggplot2 ltm mc2d polycor sfsmisc]; }; pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; }; pcadapt = derive2 { name="pcadapt"; version="4.1.0"; sha256="0631qx37ffz21bgwvjq2y5xn4dvz6kpmwg3rlmkxa93kwsx2b7rb"; depends=[data_table ggplot2 magrittr mmapcharr plotly Rcpp rmio robust RSpectra vcfR]; }; pcalg = derive2 { name="pcalg"; version="2.6-0"; sha256="1xdcgihaz6xl33nb8yxj0dz0d2dmfjvlwl4rlizyxgf5l2c7dn9f"; depends=[abind bdsmatrix BH clue corpcor dagitty fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; @@ -10302,13 +10434,14 @@ 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.3"; sha256="13pfrvp539fz4hxp08yil93caw3cjdna7xnky5fqd0lhc84fwq76"; depends=[survival]; }; - pcmabc = derive2 { name="pcmabc"; version="1.0.2"; sha256="189i38r6ylpbxk66mjvdqrp0iawdb346g7g3gzzi0w2z21kzj619"; depends=[ape distory geiger mvSLOUCH phangorn TreeSim treespace yuima]; }; + pcmabc = derive2 { name="pcmabc"; version="1.0.4"; sha256="1s6j9353azn0561is4dlisi6lnam9ng2rlwdnrj7hpbhr3hskpxl"; depends=[ape distory geiger mvSLOUCH phangorn TreeSim yuima]; }; pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; pcr = derive2 { name="pcr"; version="1.1.2"; sha256="0sms024irkhqyb001lcicrm3dwnnyr2kw9kx10q3v9j6p7rxzhz2"; depends=[devtools dplyr ggplot2 magrittr purrr readr tidyr]; }; pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; }; pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; }; pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; }; + pct = derive2 { name="pct"; version="0.1.1"; sha256="0l1w8nl3m5pqhvmqwwlxnq3y42v0j986jcjmz9dygpixzd8pf3q3"; depends=[boot readr sf stplanr]; }; pdR = derive2 { name="pdR"; version="1.6"; sha256="0rdsffbi9fnrrm0vf5mms19rsfxfv177mp1fql0nmmcqjpjn39z8"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.3"; sha256="0kqph8134g1fyzc9b06nighkqsh6jjpckvwxhpslihj5sj3kapdd"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; @@ -10317,7 +10450,7 @@ in with self; { pdfetch = derive2 { name="pdfetch"; version="0.2.3"; sha256="1fcjhq79dcbnghmkfpy1h29gcywr1hq91xij5f21wgp4xx465sha"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; }; 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.1"; sha256="0w6flmg8xblpj407calzc7i5bq3bhw0fdvf1s9ahky1pgyn2p2av"; depends=[Rcpp]; }; + pdftools = derive2 { name="pdftools"; version="2.2"; sha256="1cvmr33jx09r7d76q0g8bd0ik4xa304n42b7psw1lj8a3a4wrk0l"; depends=[qpdf Rcpp]; }; 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]; }; @@ -10336,6 +10469,7 @@ in with self; { pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; }; pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; }; + pedquant = derive2 { name="pedquant"; version="0.1.0"; sha256="149kf77qg9dsn74jg3bb96blb84g478jibg22q6mj4pgf92ihkfj"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; }; pegas = derive2 { name="pegas"; version="0.11"; sha256="0l21bapzbjcvblbvks3jh9rpy9hng1ccd7f0glhqw695lc737bpx"; 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]; }; @@ -10346,7 +10480,6 @@ in with self; { penaltyLearning = derive2 { name="penaltyLearning"; version="2018.09.04"; sha256="07ddsq6bwbz0c9pixlw8gj1km6zqhqsqn1a19pgmjrr5mq1iix9p"; depends=[data_table geometry ggplot2]; }; pencopula = derive2 { name="pencopula"; version="0.3.5.1"; sha256="1ivnqfq70gvnzc19brkvdlq0ks5dd954dj46j3pqpg6crvdrzh9r"; depends=[fda lattice latticeExtra quadprog]; }; pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; }; - pense = derive2 { name="pense"; version="1.2.1"; sha256="1hgc20rabc26hzsgga05ys56kksf9gxqgl0zjv5v1arcfln97k4d"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; }; peperr = derive2 { name="peperr"; version="1.1-7.1"; sha256="12k9crhsv3p4zrcbyr85cfwp68z3r1w2kb62g7jb7h311c7zykjx"; depends=[snowfall survival]; }; peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; }; @@ -10365,7 +10498,7 @@ in with self; { permubiome = derive2 { name="permubiome"; version="1.2"; sha256="0np10qhj5rl2gjmq5sfnpaqymmr0wag2b8fwyzndjflvypfmcsyp"; depends=[ggplot2]; }; permuco = derive2 { name="permuco"; version="1.0.2"; sha256="0mms11j2x3rw7c9pq2pb2wvcvx0a14p20clysa2b081xgmzx3971"; depends=[Matrix permute]; }; permutations = derive2 { name="permutations"; version="1.0-2"; sha256="04lak21x0z1cskgm5w4xdyq59kmyrz64bwfpf332vfka54aiv8lk"; depends=[magic numbers partitions]; }; - permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; }; + permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; }; permutes = derive2 { name="permutes"; version="0.1"; sha256="1m5596l80nyyzassiwb6zd2fnp2jglj5vkp9xsbp28swd0q2wd90"; 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=[]; }; @@ -10381,7 +10514,7 @@ in with self; { pez = derive2 { name="pez"; version="1.2-0"; sha256="0rar132szi9idr99aaz3rs4r62b515pl91q0yxahg30ixnym7fjm"; depends=[ade4 animation ape apTreeshape caper FD Matrix mvtnorm phytools picante quantreg vegan]; }; pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; }; pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; }; - pgbart = derive2 { name="pgbart"; version="0.6.15"; sha256="0nvj541kyj2qdaxjim47ic1bj1xk056cg68bjf3q74qlwvj78rqx"; depends=[BayesTree]; }; + pgbart = derive2 { name="pgbart"; version="0.6.16"; sha256="09mrx375xny47yx6ybmyr66z9p96jjk98z8l1gd0l9s3kffj42n8"; depends=[BayesTree]; }; 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]; }; pgirmess = derive2 { name="pgirmess"; version="1.6.9"; sha256="1i1qn68isaz2lbpqyydjgj9kri09aknza5qjn6m1wa1alyl7f611"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; @@ -10394,7 +10527,7 @@ in with self; { ph2bye = derive2 { name="ph2bye"; version="0.1.4"; sha256="0h5d8d4bagkp6g0nb67cb225ki5p1amnclnfj6afgdcsli5clr67"; depends=[animation nleqslv Rcpp VGAM]; }; ph2hetero = derive2 { name="ph2hetero"; version="1.0.2"; sha256="0aphkdb0ka8lk9q3r4ivkv4hrn7xz62rgqdbpkcwh9s455n38nyi"; depends=[clinfun mvtnorm]; }; ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; }; - phangorn = derive2 { name="phangorn"; version="2.4.0"; sha256="0xc8k552nxczy19jr0xjjagrzc8x6lafasgk2c099ls8bc1yml1i"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; }; + phangorn = derive2 { name="phangorn"; version="2.5.3"; sha256="1bv86yfk5r015s7ij6v4zz7bagwrw9m13yfs5853drxb19d5h1m3"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; }; phantom = derive2 { name="phantom"; version="0.1.3"; sha256="0kgw65jziw5s03isq5ywmqijhkbik5i84k30hx5gbi0zzgj8y0h1"; depends=[gplots MASS NMF qusage RColorBrewer Rcpp RcppArmadillo]; }; phase1PRMD = derive2 { name="phase1PRMD"; version="1.0.1"; sha256="1gg11rvs5zqza66f7r7sw7g3w8nzi3il1883wpwzqhp58hsphjdw"; depends=[arrayhelpers coda dplyr ggplot2 gridExtra kableExtra knitr MASS phase1RMD plyr RColorBrewer reshape2 rjags]; }; phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; }; @@ -10407,7 +10540,7 @@ in with self; { pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; }; pheno2geno = derive2 { name="pheno2geno"; version="1.4.0"; sha256="0fy8z6x1y0sakp07jb6zs0w0f86pbbllicj4qylxzfd5rpn1rqr0"; depends=[mixtools qtl VGAM]; }; phenoCDM = derive2 { name="phenoCDM"; version="0.1.3"; sha256="1cyqwc36zwa2a4ljy0xnqz0hhw0r98qk2an5y002lrchkqydplwp"; depends=[rjags]; }; - phenocamapi = derive2 { name="phenocamapi"; version="0.1.3"; sha256="1ps0v3jcyzm91c0850gs3df7xdds0cjqs62gsr0nsknw5f7kq30b"; depends=[data_table RCurl rjson]; }; + phenocamapi = derive2 { name="phenocamapi"; version="0.1.4"; sha256="1aijslxmnyi73nsxhn0j9aj6j0zbhc8q16f00h452fp629h5imhb"; depends=[data_table RCurl rjson]; }; phenocamr = derive2 { name="phenocamr"; version="1.1.3"; sha256="1wfrzs0sdhp7ivj9n6c2i8dr35gl6dp2rai69ylh5xxlk643a2ck"; depends=[changepoint daymetr httr jsonlite memoise shiny zoo]; }; phenofit = derive2 { name="phenofit"; version="0.2.0"; sha256="1iw52ibw4n45bqny376zlid0j11v935qc7y942zg5w8nrm02a7rz"; depends=[data_table dplyr DT ggplot2 gridExtra lubridate magrittr numDeriv optimx plyr purrr Rcpp RcppArmadillo reshape2 spam stringr tibble tidyr ucminf zoo]; }; phenology = derive2 { name="phenology"; version="7.3"; sha256="0hklk5k0i6vv733dm3npphg0zrhlb14ps6j6wwvsx50sqr3xl9jg"; depends=[HelpersMG lmf numDeriv optimx]; }; @@ -10428,17 +10561,17 @@ in with self; { photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.2"; sha256="0fcin04xc2k39qdipslqd3w3bsd8yl3xlvg7mlgm3aphfwg4hnmj"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.1"; sha256="0mpb5sv4wkvqzbhf193zkhap44yzlhxrnjx1p3j9iyjdg4bb1kka"; depends=[photobiology photobiologyWavebands]; }; photobiologySensors = derive2 { name="photobiologySensors"; version="0.4.0"; sha256="1d0rphlx6k2hqvmhndbw143djsfr4fmwjih3s37bhksc2dn7nh2v"; depends=[photobiology]; }; - photobiologySun = derive2 { name="photobiologySun"; version="0.4.0"; sha256="0aczf1ki623pflsnn08z0nrsx7wwn67b8ql08ar08rpk1bj93nfy"; depends=[photobiology]; }; - photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.2"; sha256="0l1784xi9hzsxmiqipv0zkb4lq1xd9f890rzsgsjb0km6js5x3q7"; depends=[photobiology]; }; + photobiologySun = derive2 { name="photobiologySun"; version="0.4.1"; sha256="15wp8q29m5c4qplind9098ikxmm1r60lw8cm0pa48lmh33638ia3"; depends=[photobiology]; }; + photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.3"; sha256="04nc3yhd97k2pb1jv2bgda8mii4y4ph1884wagw8y3lc0g4dkicv"; depends=[photobiology]; }; phrasemachine = derive2 { name="phrasemachine"; version="1.1.2"; sha256="1145c8ymarhbza8253rw4ybnq0k5pcckqxpdcr8s2y23pj182r1p"; depends=[NLP openNLP stringr]; }; phreeqc = derive2 { name="phreeqc"; version="3.4.10"; sha256="1gmi81dical39ph1yf7n0pkhgbaf7p5xhv2cg3n15j1vpr8gwikl"; depends=[]; }; phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; }; phuse = derive2 { name="phuse"; version="0.1.7"; sha256="1khrz6jag3d0himbqxylxpx7iyx8nbk3r23q6257a4fy55wakavd"; depends=[git2r httr RCurl rlist 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-23"; sha256="0q6jl7nmp6k73j979isbs8b3bcxx17mqcz0gcqlkfwmw1babw79r"; depends=[ape]; }; + phyclust = derive2 { name="phyclust"; version="0.1-24"; sha256="1gsl0zzr4m1vxbixlsd80bl05kyxvbawca8qk65b935v67z6c6hb"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; - phylin = derive2 { name="phylin"; version="1.1.1"; sha256="1hxmh5jgcz41bhmi8kvimw0b6m4p3yq85bh79hl7xbx2kshxmvzq"; depends=[]; }; + phylin = derive2 { name="phylin"; version="2.0"; sha256="1j7v79ga6d4ysfmsh8na4s6mgs04wi4c89l5kxvwaqvj8ic0jlpn"; depends=[]; }; phyloTop = derive2 { name="phyloTop"; version="2.1.1"; sha256="1n44kr3a9yg8yvy3m493zi04x6aiqm424fp2ls9yzyx1cga2h9nk"; depends=[ape igraph NHPoisson phylobase]; }; phylobase = derive2 { name="phylobase"; version="0.8.6"; sha256="1n9g69llrh8xfmrnxh78rr09cxy5qbc99dr3amg121pl1qhpn4g7"; depends=[ade4 ape Rcpp rncl RNeXML]; }; phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; }; @@ -10460,7 +10593,7 @@ in with self; { physiology = derive2 { name="physiology"; version="1.2.1"; sha256="1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb"; depends=[Rcpp]; }; phytools = derive2 { name="phytools"; version="0.6-60"; sha256="0xxk2r2x81nxsvyggk44fpw3ppfsmmna8lrsy2xpw90da5cxgjjm"; depends=[animation ape clusterGeneration coda combinat expm maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; }; - picante = derive2 { name="picante"; version="1.7"; sha256="0qhaxxmab3c3qw06kx4swfyiqiiqail5h79aarvffryvh0qdgr3m"; depends=[ape nlme vegan]; }; + picante = derive2 { name="picante"; version="1.8"; sha256="1bcq2j7fs89c2jib68qq6la67rxyg9raryf162mwvjakpf6k19l1"; 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]; }; piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.0.2"; sha256="07vz90cghkbmcar9ps94wydvg4r7mj32pa7vjdmgm5j8dhxq8max"; depends=[car lme4 MASS nlme pbkrtest]; }; @@ -10468,7 +10601,7 @@ in with self; { piggyback = derive2 { name="piggyback"; version="0.0.10"; sha256="08d7jxw7mvfyhjbr8zy95p952j2p94ii6zq38b8xw96g6k1380bz"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; }; pillar = derive2 { name="pillar"; version="1.3.1"; sha256="1xnbb9sr5wn9dmp6m7cr4z7i6pmjvyabnfcx6x7i7mvdjmgvaf5k"; depends=[cli crayon fansi rlang utf8]; }; pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; }; - pimeta = derive2 { name="pimeta"; version="1.1.1"; sha256="0ylna31x8491q6hppz827ngri0did0bfwy3nlifpagccb2m4psi3"; depends=[Rcpp RcppEigen]; }; + pimeta = derive2 { name="pimeta"; version="1.1.2"; sha256="06x22l3x0l4qg4b4mkj069mqw2ylkb6sqad7s613fp2xhry5crbr"; depends=[ggplot2 Rcpp RcppEigen]; }; pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; }; pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; }; pingers = derive2 { name="pingers"; version="0.1.1"; sha256="09np6aph6rhvdh6mwky8a57i38bi2amwi7x91p9kfb2mzkql8k8w"; depends=[data_table dplyr lubridate plotly reshape2 stringr tibble tictoc tidyselect]; }; @@ -10488,12 +10621,12 @@ in with self; { pivmet = derive2 { name="pivmet"; version="0.1.1"; sha256="1r410209fr60dmry6g4mwbww0f9wrmc8iqlbq3kf0yz0fwghb15p"; depends=[bayesmix cluster MASS mclust mvtnorm RcmdrMisc rjags runjags]; }; pivot = derive2 { name="pivot"; version="18.4.17"; sha256="0nhf76f2g35cx5f1m00wsy29n6xm2x5wajs5myaasks7hbkk0w3y"; depends=[assertthat colorspace DBI dbplyr dplyr lubridate magrittr purrr rlang tidyr tidyselect]; }; pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; }; - pivottabler = derive2 { name="pivottabler"; version="1.1.0"; sha256="065kwpv5l7rwjayfv4zks2bx56bsw2ivvziqd4p7x631ciz1qabp"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; }; + pivottabler = derive2 { name="pivottabler"; version="1.2.0"; sha256="07d69r367h7dzyfd8gg9d63xjnanrkw7qdgpmhcpngxnqpmir79i"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; }; pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; }; pixiedust = derive2 { name="pixiedust"; version="0.8.6"; sha256="1dajiblpm51szndz026lmwh6swx8f9f03s6md26d84awcx0q1dpc"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; }; pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; }; - pkgbuild = derive2 { name="pkgbuild"; version="1.0.2"; sha256="1i1rrax7x7r2bplig5cfc50lx85jc4n9a3qmvbdviaj22wr2lghs"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; + pkgbuild = derive2 { name="pkgbuild"; version="1.0.3"; sha256="0k8zwa66rm1ncx19ld5mbaxcjxkswiczpdqyssy44vl8k6scwfn9"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; pkgcache = derive2 { name="pkgcache"; version="1.0.3"; sha256="0f1025d9mz6nza0537d274k2vg8jmd2nqdbs18vdr6dypq5sy50y"; depends=[assertthat cli cliapp crayon curl digest filelock glue prettyunits R6 rappdirs rematch2 rlang tibble uuid withr]; }; pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.2"; sha256="1jk9ip549xphb3anfixqv1yx5kidnndqgy9v3qjpmgmds5a7g695"; depends=[]; }; @@ -10502,7 +10635,7 @@ in with self; { 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.0.2"; sha256="0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; }; pkgmaker = derive2 { name="pkgmaker"; version="0.27"; sha256="0spcamjncj78kzjps2rw4v1a4494yazv6xvhn0vmdflnypc8k8hp"; depends=[bibtex codetools digest magrittr registry stringi stringr withr xtable]; }; - pkgnet = derive2 { name="pkgnet"; version="0.3.2"; sha256="1l118jkncg5s1zvb6bp6kd5rbjfqpyfhr1d12qwx5p71q47vrr21"; depends=[assertthat covr data_table DT futile_logger igraph knitr magrittr R6 rmarkdown visNetwork]; }; + pkgnet = derive2 { name="pkgnet"; version="0.4.0"; sha256="0da139p57xvy2v5ld3mnddgak59zjr58ndnbgg3y8msni80g52gq"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; }; pkgsearch = derive2 { name="pkgsearch"; version="2.0.1"; sha256="00wi4lym0zjb29qdalgwlbcdxi4k39pxxm6a2qhllfcbgc099mlb"; depends=[httr jsonlite magrittr parsedate prettyunits]; }; pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; }; pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; }; @@ -10512,10 +10645,11 @@ in with self; { plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; }; pla = derive2 { name="pla"; version="0.2"; sha256="1qb71zjcxvs3zbfy0sryyxizwix0nw530zsfw661a8vm8sk054kw"; depends=[]; }; plac = derive2 { name="plac"; version="0.1.1"; sha256="08kqnjzbfygnbqvqg5wyw148kfhjqxy46y4vaiq9zzwzj58w8vzn"; depends=[Rcpp RcppEigen survival]; }; + plainview = derive2 { name="plainview"; version="0.1.0"; sha256="0yvw357p1hwrlj4c2sjr4klmy6j98a3kbdfwg0snaiv0drdyhznk"; depends=[gdalUtils htmltools htmlwidgets lattice png raster viridisLite]; }; plan = derive2 { name="plan"; version="0.4-3"; sha256="0j3mvcy97r7adcs7q6z0w9ng74jcfwii1xp8kcl2cwbzs2fd425r"; depends=[]; }; planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; }; planor = derive2 { name="planor"; version="1.4-1"; sha256="1ci4wp18jjc8pjdn89vsz0nfdjif7fz6l5f6x6blqh9cz4hkkrlf"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; - plantecophys = derive2 { name="plantecophys"; version="1.3-2"; sha256="1jj9rkhdmcnmp6fzbxmkfwmsdx2w7v923rv0xn5c5iv7wys7vwfm"; depends=[]; }; + plantecophys = derive2 { name="plantecophys"; version="1.4-4"; sha256="005js9r7xg4jf2aqgsqddkkxhcdnhsiyzc1cqa7j59r4g5xbmh1j"; depends=[]; }; plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; }; plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; }; platetools = derive2 { name="platetools"; version="0.1.1"; sha256="0k2b13izcpr638hkfar2b09r49gyll71dmbvl1sffqw80pnz2wx0"; depends=[dplyr ggplot2 plyr RColorBrewer]; }; @@ -10548,14 +10682,14 @@ in with self; { plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; plotly = derive2 { name="plotly"; version="4.8.0"; sha256="19p8pa03q9mw5vaan7r56xgd13d90ssiz0flbrkvpfrir2105ybq"; 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=[]; }; - plotmo = derive2 { name="plotmo"; version="3.5.2"; sha256="1ihyn94mp61pbv9ncl2h5ihkq1fb6vhhcmjdzsncb9lz7hi1b7a6"; depends=[plotrix TeachingDemos]; }; + plotmo = derive2 { name="plotmo"; version="3.5.4"; sha256="08f3jnmjnj7ag50g0ppy08iggvfppj3lix7jmvjqfp511wb5lim4"; 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-4"; sha256="1hs0zwaqs34559girinvysjfbvznyn8znp9cwvkqx6k2cqvcjinj"; depends=[]; }; plotrr = derive2 { name="plotrr"; version="1.0.0"; sha256="07ilqpa3ypqb2gpnq23r9v4kkfxz06mcak9si9adr9sf6c7gqwxz"; depends=[dplyr ggplot2]; }; plotscale = derive2 { name="plotscale"; version="0.1.6"; sha256="0h2g0rv1lh70nqmqydgg5swwnwmy08wbjajxyb1c2a716rad765j"; depends=[]; }; plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; }; - pls = derive2 { name="pls"; version="2.7-0"; sha256="0xaqqgmdvfh7g7v1m4bcwjqzph68b9cq3bn4kjisfsadl54i5p2x"; depends=[]; }; + pls = derive2 { name="pls"; version="2.7-1"; sha256="0jw3zl5z06023zxr74phnvwax8m3i4a4i6lsqiq6j15aq9zq3zgq"; depends=[]; }; plsRbeta = derive2 { name="plsRbeta"; version="0.2.5"; sha256="1p6vj9sw3hm6nax3vahmr6z58bgc8wl787949dszckn03pxhgvpb"; depends=[betareg boot Formula MASS mvtnorm plsRglm]; }; plsRcox = derive2 { name="plsRcox"; version="1.7.4"; sha256="1cpbhz85c8zpxcwi7ads981dynf83r5ka2zqy6i2swbi83jb5p4x"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; }; plsRglm = derive2 { name="plsRglm"; version="1.2.5"; sha256="004x934c34rgggwb25pcfm3vlj6gc1nfnigjxnxycxjqlx8g567b"; depends=[bipartite boot car MASS mvtnorm]; }; @@ -10574,29 +10708,31 @@ in with self; { pluscode = derive2 { name="pluscode"; version="0.1.0"; sha256="1j9yr5j6mb346a5dn7v9bsppgnxdj1ryimlla4a08rv7bjyq5i6q"; depends=[httr jsonlite]; }; plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; }; plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; }; + pm4py = derive2 { name="pm4py"; version="1.0.1"; sha256="144v0nn71rhkifghf3qws72x6gsckvdzr81kpdr97kqm1q1wxdy0"; depends=[bupaR petrinetR purrr reticulate stringr]; }; pmc = derive2 { name="pmc"; version="1.0.3"; sha256="06bsab09i9ydgsjx5i50kdb22ldp4g1v83a01kz3mswybi4lv9w2"; depends=[dplyr geiger ggplot2 ouch tidyr]; }; pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; }; pmd = derive2 { name="pmd"; version="0.1.1"; sha256="07s5b2izsqzryrcasdpa9z7cva03afl2zkb7cpxqgs4bjrd6vprw"; depends=[RColorBrewer rmarkdown shiny]; }; - pmhtutorial = derive2 { name="pmhtutorial"; version="1.4"; sha256="02yk19sd3qy5f5lif74rqs2xlpffdkqd45zdz2fg8rkv3m6alal3"; depends=[mvtnorm Quandl]; }; + pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; }; pmml = derive2 { name="pmml"; version="1.5.7"; sha256="1p189c1728vs2qqhkqajn8c1dpgvs0cs9lh4jmhx4sg7r8awyf08"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.2"; sha256="1s222r0zj630gjsvi28wb5mbz9fky967m9jnpaj8nsqv3k9sgkcc"; depends=[]; }; pmpp = derive2 { name="pmpp"; version="0.1.0"; sha256="1vmv7aav0rvp7kd5f16ym422ygw1wpnwrhmmp2w1c2fl8i263zh9"; 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.0"; sha256="10qps352524k0xkmssv3qxf1jvkvm7zf4pshki7xywcgp1318n57"; depends=[]; }; pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; }; + pmxTools = derive2 { name="pmxTools"; version="0.1.1"; sha256="0ryvbrk0f5x6b8rx479ifhk651wzg32zb4kn75dbjgh9q2qnsqhl"; depends=[GGally ggplot2 magrittr MASS PKNCA plyr stringr XML]; }; 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]; }; - pocrm = derive2 { name="pocrm"; version="0.11"; sha256="04snn7k8baf2ymjzr3zkxd425r5dq9h6abr5dm10mhfjqj1njpq0"; depends=[dfcrm nnet]; }; + pocrm = derive2 { name="pocrm"; version="0.12"; sha256="0ilh19vqy3lqnb4j6jw61az39swmca8za3ig3k1cjc9gwdyn1f8r"; depends=[dfcrm nnet]; }; pogit = derive2 { name="pogit"; version="1.2.0"; sha256="1kap1cpfp0k2vm7w4kjfja37n9z3j7ppiwvsdxl6bgpkf7kcnkp2"; depends=[ggplot2 logistf plyr]; }; poibin = derive2 { name="poibin"; version="1.3"; sha256="0lkqxpk5f27ghjia2akzi1c51hk9p9qkw8vysa0qwkbsgasq86p3"; 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.2.0"; sha256="102ra763wwz0445wlvsr975ynrf4ywgggjw8hvwrqkjcvrk4rq8x"; depends=[commonmark DBI dplyr glue httr magrittr purrr readr rlang rmarkdown RMySQL RPostgreSQL stringr tibble tidyr]; }; pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; }; - pointdexter = derive2 { name="pointdexter"; version="0.1.0"; sha256="1004m3fdl139rvmzs62xja1fiy87vh63wjqgjna2k5bkspjg82r0"; depends=[sp splancs]; }; + pointdexter = derive2 { name="pointdexter"; version="0.1.1"; sha256="058iv9pk3byyvddbkm8g1vc7kmrkbwglbw0v2ns6w066fwiysv70"; depends=[sp splancs]; }; poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; poisFErobust = derive2 { name="poisFErobust"; version="1.0.1"; sha256="0qgwl5gb2rw043zb0h1rrv038ymsd72r8h9gqdr2xkfbi3mnr24r"; depends=[data_table glmmML]; }; @@ -10609,7 +10745,7 @@ in with self; { polidata = derive2 { name="polidata"; version="0.1.0.1"; sha256="0mfjcjhv2prc2xdg9672z1cjxd2wp541hb7lz497cqlig2p6qgb4"; depends=[jsonlite RCurl]; }; poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; }; politeness = derive2 { name="politeness"; version="0.2.6"; sha256="0rkh3bpq5a84gqlby8csi9a7c3vlc09clhng883q875jffnsbn2n"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; }; - politicaldata = derive2 { name="politicaldata"; version="0.1.1"; sha256="0dsgl2n9paggszx90rnwsnnn31956d842xm2xf8c0v2gykripfdd"; depends=[dplyr ggplot2 magrittr tidyr]; }; + politicaldata = derive2 { name="politicaldata"; version="0.1.2"; sha256="084la080nx4xbiihgi182wbpgiadqvshxpkjbbyszya7g889l7vd"; depends=[]; }; pollen = derive2 { name="pollen"; version="0.71.0"; sha256="0g0g6n8y87jyk7l4s6xpdk60dz4lkg2xp5c5agakkrah8a233920"; 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]; }; @@ -10622,13 +10758,13 @@ in with self; { polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-4"; sha256="162xj52566kaxgfk7c14170xx07isyjmqb9skvhrdg7sz20lc3l1"; depends=[coda gtools lattice polySegratio]; }; polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; polyapost = derive2 { name="polyapost"; version="1.5"; sha256="0r2h51l2y0sj0xahdzfy1lyq4kh166crh2j02sk85q577q9d883y"; depends=[boot rcdd]; }; - polyclip = derive2 { name="polyclip"; version="1.9-1"; sha256="0r5izja3ns39as40al04vl4jz17d6cgbsb4sj16c9z9l3fzpimf5"; depends=[]; }; + polyclip = derive2 { name="polyclip"; version="1.10-0"; sha256="0jyk4maqiblvj095jd59dr76kbniyli3v3xvy0a72ljszq6vrnkl"; depends=[]; }; polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; }; polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; }; polyglot = derive2 { name="polyglot"; version="0.2.1"; sha256="1w52vhix5pynx2gz9f71yi9x5cdkp4sbs98zz2d5z993qbbf1wyq"; depends=[magick]; }; polylabelr = derive2 { name="polylabelr"; version="0.1.0"; sha256="1bki35p6a8bgmdwll9sczdicdkvmxcl55vbx5xiabkz58imvcmym"; depends=[Rcpp]; }; polymapR = derive2 { name="polymapR"; version="1.0.19"; sha256="11mv16ixcsi0n8hkmm8vfsdk53i7gfixmbfyzhlhndlnakw0l5hj"; depends=[combinat doParallel foreach igraph knitr MDSMap]; }; - polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; }; + 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]; }; 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]; }; @@ -10643,7 +10779,7 @@ in with self; { pooling = derive2 { name="pooling"; version="1.1.1"; sha256="0011w80pxz01scj2sa69m1bcfq797hq3ihpw46fdlxsxavz8prwy"; depends=[cubature dplyr dvmisc ggplot2 ggrepel mvtnorm pracma]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; }; - popEpi = derive2 { name="popEpi"; version="0.4.6"; sha256="0xn5s8sbdzijpjqwz6kcrv06fr7ppyp8hmg1pqv50b0pwgxr74yf"; depends=[data_table Epi survival]; }; + popEpi = derive2 { name="popEpi"; version="0.4.7"; sha256="0215r779141b8a2wnbxgsapn13k4p5cx1mr30c0ka7szv6bsgnqm"; depends=[data_table Epi survival]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; }; popReconstruct = derive2 { name="popReconstruct"; version="1.0-5"; sha256="0fvrjb3b3bahi5da0ikzv164p49zvgm43mskqd7p9dgadbg1xpi2"; depends=[coda]; }; @@ -10651,7 +10787,7 @@ in with self; { popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; }; popkin = derive2 { name="popkin"; version="1.1.2"; sha256="191fs03y1g5cf05phx1id7z2vsjadl55p42vh3glnymdn925xm2y"; depends=[RColorBrewer Rcpp RcppEigen]; }; poplite = derive2 { name="poplite"; version="0.99.21"; sha256="13fxqq50hfxj5l6zqia54sh1312nf58nk7rkbxailzsg3hdgappb"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; }; - poppr = derive2 { name="poppr"; version="2.8.1"; sha256="1pl6lqbcrqrzz28cs70ki8bp749af4b8a9dk1bcdwg290vxzqywp"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; }; + poppr = derive2 { name="poppr"; version="2.8.2"; sha256="18d9wxwknjzarblq7ihnfphpw2ribc4985swlprazm3nw3zmk3kh"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; }; popprxl = derive2 { name="popprxl"; version="0.1.4"; sha256="076aia4qbq5yw2nxafq2ys5n5c7wv77i8k1nmzb3all193vjf203"; depends=[poppr readxl]; }; popsom = derive2 { name="popsom"; version="4.2"; sha256="11d6z3qsq94k0557pnwa0h4pc718360lvg9jkblp8abnj52lcvvv"; depends=[class fields ggplot2 som]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; @@ -10667,7 +10803,7 @@ in with self; { postal = derive2 { name="postal"; version="0.1.1"; sha256="1b0i3rk01cwmiq6ai025slspbni5jmg2rqcvrcw01x4f8gx3bkjw"; depends=[curl dplyr glue janitor jsonlite lubridate magrittr purrr readr stringr tibble tidyr]; }; postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; postlogic = derive2 { name="postlogic"; version="0.1.0"; sha256="1m4z92y9kjjgz5xh0x74i1sgsybm8gv36l25fbbcwlg1jazwgrwn"; depends=[]; }; - potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; }; + potts = derive2 { name="potts"; version="0.5-8"; sha256="0j3c7sh50r1lqd8gl0rq7pq8j9v33wcz46gv7lm0n7y89qj6f45x"; depends=[]; }; powdR = derive2 { name="powdR"; version="0.2.0"; sha256="13jaq3hzj0nfzwrdwilazr7xcp41ahc9i2ysm5irwn356z3xf2xd"; depends=[baseline ggplot2 ggpubr nnls plotly reshape shiny shinyWidgets]; }; powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; }; poweRlaw = derive2 { name="poweRlaw"; version="0.70.2"; sha256="1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4"; depends=[VGAM]; }; @@ -10697,7 +10833,7 @@ in with self; { prabclus = derive2 { name="prabclus"; version="2.2-7"; sha256="0h2nml8ri27mhfs2p6ngb6kfd6lyq30sc6813yybpskkrb6gs1pb"; depends=[MASS mclust]; }; pracma = derive2 { name="pracma"; version="2.2.2"; sha256="18zhni05gwnxbphl6bmjjxmsgg5wwnnkwlb4g971cqyw3dsd83ki"; depends=[]; }; pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; - prais = derive2 { name="prais"; version="1.1.0"; sha256="0x39ga8gd2xx3xnd2233ygcrgh1jwfnb631dl07s60i5zb3fs080"; depends=[]; }; + prais = derive2 { name="prais"; version="1.1.1"; sha256="027qsa1nc680bcs61dlyz0wwap5pgxdfzasg9ny37a55hnikxid5"; depends=[lmtest sandwich]; }; 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="5.0.0"; sha256="01xbhcgvq6mf89ryh2gif7aa9956kpka3j4mqaxlglxs53vdrfnk"; depends=[]; }; @@ -10705,7 +10841,7 @@ in with self; { prcbench = derive2 { name="prcbench"; version="0.8"; sha256="0bidf7268c130xj4c2pxljgkrppvjg8bmivj9zq0cm9nwhm0fdf5"; 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.1.5"; sha256="1hfr0jijnj5nd25rh16i81bsz8kwz0q9vmn7bqgy467cwvypg9k2"; depends=[class dplyr ggplot2 irr lpSolve purrr tibble tidyr]; }; - pre = derive2 { name="pre"; version="0.6.0"; sha256="19dxm2khdw9cizxm06z41ywl2imrc9nw42ldcpjm30qfa0xqldjn"; depends=[earth Formula glmnet partykit rpart stringr survival]; }; + pre = derive2 { name="pre"; version="0.7.0"; sha256="1p5alzvbrm0xz1sanr9d3r5h4hhgcc57xl79gc5whsqvy63rh6nw"; depends=[earth Formula glmnet Matrix MatrixModels partykit rpart stringr survival]; }; preText = derive2 { name="preText"; version="0.6.2"; sha256="0pcnqssv542cfajzrqfsbq0jf628nnmcb3nryvd7d5wk4wdkji4q"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; }; precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; }; precrec = derive2 { name="precrec"; version="0.10"; sha256="0r4z69x326lb9gi4kmarna1nwy262s1pvanpk4zz84zk50x1hirm"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; }; @@ -10737,6 +10873,8 @@ in with self; { prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; }; prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; + prevtoinc = derive2 { name="prevtoinc"; version="0.11.0"; sha256="0590lka3pr1siykf908qczidf6pcrx7fq4bhlx4q9nkyhsgfxa3p"; depends=[dplyr rlang tibble]; }; + priceR = derive2 { name="priceR"; version="0.1.0"; sha256="09jlf8c1lfiqmpm2vdgkacsracwcjgi6xgvlakny2c4iyir45sh5"; depends=[dplyr gsubfn stringr]; }; pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="0.4.1"; sha256="1mk6i4rjcm938rpwd3b80y9x4vj45jsddzprzrig91dmmjp6b11i"; depends=[]; }; prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; }; primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; }; @@ -10769,7 +10907,7 @@ in with self; { processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; }; processmapR = derive2 { name="processmapR"; version="0.3.3"; sha256="0skiavjays0qp9yvxfdzhp7iagz3zirq90m08lcl6sa83n5dj8rr"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer 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.2.1"; sha256="1skjyi767avc3safajlj3ikk9lf11zzyjybdcmx8m9y59rf319ql"; depends=[ps R6]; }; + processx = derive2 { name="processx"; version="3.3.0"; sha256="0ipdcl4080z92jdnd1w4hm4w484spxcrp6j5x9p76ksb401qdca1"; depends=[ps R6]; }; prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; }; prodigenr = derive2 { name="prodigenr"; version="0.4.0"; sha256="1rbfg3jzspw51lbhjbdy0wy5fgl3k3cnb324i73nbgjn7ycmpfqx"; depends=[clipr clisymbols crayon desc devtools fs git2r rmarkdown rprojroot usethis withr]; }; prodlim = derive2 { name="prodlim"; version="2018.04.18"; sha256="1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb"; depends=[KernSmooth lava Rcpp survival]; }; @@ -10779,7 +10917,7 @@ in with self; { profExtrema = derive2 { name="profExtrema"; version="0.2.0"; sha256="13fn32v4jryyw2sc6g76fmf2ivbwql0z39wqpl6ggmiwnj95sfm7"; depends=[DiceKriging KrigInv lhs MASS microbenchmark pGPx quantreg rcdd RColorBrewer]; }; profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; profile = derive2 { name="profile"; version="1.0"; sha256="0m7fm490gqkbmnbdq3lac87zqb9qyx6546rlpa130rq1jnlgxfp6"; depends=[rlang tibble withr]; }; - profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; }; + 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]; }; profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; }; profmem = derive2 { name="profmem"; version="0.5.0"; sha256="152dka39p9i17ydlhc92y6x6i8girn3wab1ycbqb9kva07j9d2h8"; depends=[]; }; @@ -10793,7 +10931,7 @@ in with self; { projections = derive2 { name="projections"; version="0.3.1"; sha256="12vskql6x04jzik72a0vx83amfj01w9f7mxn052vsv7aaljbi124"; depends=[distcrete ggplot2 incidence]; }; projector = derive2 { name="projector"; version="0.0.2"; sha256="15n5b2xgs0zj87pc3svlmnkjrxgkjkx941g8bs3ms90fg7nh2drc"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; }; projects = derive2 { name="projects"; version="0.1.0"; sha256="064l9dq3k56jiqf1p5yg7pmbz8kx95gpkdn7i2sqxghl3zpv1gsi"; depends=[checkmate dplyr fs magrittr purrr readr rlang rstudioapi stringr tibble]; }; - projpred = derive2 { name="projpred"; version="1.1.0"; sha256="03lfzlhrch7l87vmpfvyiggq12bzj45kkqp0dy307jnrvfzx9lb1"; depends=[ggplot2 loo Rcpp RcppArmadillo rngtools]; }; + projpred = derive2 { name="projpred"; version="1.1.1"; sha256="1i3vawfbm9nsqv209b7v2mymx4n1xzkhjic7mgarnanjqi4dsyi4"; depends=[ggplot2 loo Rcpp RcppArmadillo rngtools]; }; promises = derive2 { name="promises"; version="1.0.1"; sha256="0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2"; depends=[later magrittr R6 Rcpp rlang]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; }; @@ -10830,8 +10968,8 @@ in with self; { psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; }; pscl = derive2 { name="pscl"; version="1.5.2"; sha256="1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc"; depends=[MASS]; }; pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; }; - psd = derive2 { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; }; - psda = derive2 { name="psda"; version="1.2.0"; sha256="1d31d79yz2f0z5b1ik3c8sbn1j1wfmzbd14y223na8g71qaw4m1c"; depends=[ggplot2 plyr raster rgeos sp]; }; + psd = derive2 { name="psd"; version="1.2.0"; sha256="017iqz6awc7k3kv74jdc8wak62zzgnxvakl0qp774kx1kpv6hgji"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; }; + psda = derive2 { name="psda"; version="1.3.1"; sha256="1pbsqpnsyhbvn1wjz7iq6mi9d6j9ccykvdlzypv79bafimv10jlc"; 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]; }; @@ -10850,12 +10988,12 @@ in with self; { psych = derive2 { name="psych"; version="1.8.12"; sha256="0hvp0dkkkn0szaf5rkirr3kb8qmr4bxwl775m5wmpvn1kc25w5vf"; depends=[foreign lattice mnormt nlme]; }; psychReport = derive2 { name="psychReport"; version="0.4"; sha256="0025m39gxjv63p230xg6vmyndni8bqx5nfs6dzz7xlc8qys56jqs"; depends=[cli crayon dplyr ez testthat xtable]; }; psychmeta = derive2 { name="psychmeta"; version="2.3.2"; sha256="03j8bp9qrmdxgkgy7gp1iniryv5id9d8rsi1fb52z21vgk5r1cgm"; depends=[boot cli crayon data_table dplyr ggplot2 MASS metafor nor1mix progress purrr RCurl reshape2 rlang stringi stringr tibble tidyr tmvtnorm xml2]; }; - psycho = derive2 { name="psycho"; version="0.4.0"; sha256="1n6r3bh3r24pifaawvasg4slbywky9bnz3zd9z9s9vrb2aq339nx"; depends=[BayesFactor blavaan broom DescTools dplyr emmeans ggcorrplot ggplot2 lavaan lme4 lmerTest loo MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm rstantools scales stringr tibble tidyr]; }; + psycho = derive2 { name="psycho"; version="0.4.9"; sha256="0lngl61cgxbxqkp4kmng9bj89r2j135c3kg9kadz4l0jckbyz77b"; depends=[BayesFactor blavaan broom DescTools dplyr emmeans ggcorrplot ggplot2 lavaan lme4 lmerTest loo MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm rstantools scales stringr tibble tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; - psychomix = derive2 { name="psychomix"; version="1.1-5"; sha256="0majai4ivs140x2bq2sk61widyadmv2l64sjyy0g8kcpm8gbgh7b"; depends=[flexmix Formula lattice modeltools psychotools]; }; + psychomix = derive2 { name="psychomix"; version="1.1-6"; sha256="0242vxnzs4341pycbbq41x1sbnqrssy2fs64v89wb0m2lkbypv92"; depends=[flexmix Formula lattice modeltools psychotools]; }; psychotools = derive2 { name="psychotools"; version="0.5-0"; sha256="145x1zdjvasdyf72hp6wdsw0m1r5c97gzzlbnnmdbcrjqh5zyglb"; depends=[]; }; psychotree = derive2 { name="psychotree"; version="0.15-2"; sha256="0svb3i3d9r3hvqh17lfzyzj2rnf2wm1wy6sspx67ngdrfy6d1p91"; depends=[Formula partykit psychotools]; }; - psymonitor = derive2 { name="psymonitor"; version="0.0.1"; sha256="1iw0sllxqnyb69pnryx72080g2cpl9x8k1gpm4hr75czxp6dzwq1"; depends=[doParallel foreach magrittr]; }; + psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; }; psyosphere = derive2 { name="psyosphere"; version="0.1.4"; sha256="0z3qnbybpf5zk07zny2mq8ax8lr0m4n7gwp899km0lixb10z4ysf"; depends=[geosphere ggmap ggplot2 lubridate plyr rgdal RgoogleMaps SDMTools sp]; }; psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; }; @@ -10863,20 +11001,23 @@ in with self; { ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; ptmixed = derive2 { name="ptmixed"; version="0.0.1"; sha256="0jxjjddl66sbasalhq5zxf37wmn42fgkc1gmq8pixz2dncpz2mfj"; depends=[GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; ptstem = derive2 { name="ptstem"; version="0.0.4"; sha256="0dx677c7qh7rbalsys1n3xv4hjdhd6qypjd1mrggfwz1bd4vig4j"; depends=[dplyr hunspell magrittr rslp SnowballC stringr tidyr tokenizers]; }; + ptsuite = derive2 { name="ptsuite"; version="1.0.0"; sha256="1df273p8v6zvhy2jj6imhjigwj77grx6sxqmg0sidxwqny5d1d9c"; depends=[Rcpp]; }; ptw = derive2 { name="ptw"; version="1.9-13"; sha256="0iighsx6xn8nbw4qpzmwgi4czmr5m8yrr7fzm7mx7cvx2r5ffmbq"; 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.0"; sha256="119ihi6xi9k3p5lv2qkch2jc2fqmf8h0wi7mqh57asg7n6f0qb6r"; depends=[data_table rcrossref xml2]; }; pubh = derive2 { name="pubh"; version="0.4.3"; sha256="18n6jyidq01gxbqvfal7ipgpjvfkdy71niy7w24dvvxnvcy7hc4l"; depends=[bookdown car desctable effects Epi epiR epitools knitr latex2exp lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR sandwich survival tactile]; }; pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.14"; sha256="1jg8i4rny0vdz9vyp5pmirip7r475qh50wvc33nij198d0rz8368"; depends=[boot R2HTML RCurl XML]; }; + pubtatordb = derive2 { name="pubtatordb"; version="0.1.3"; sha256="0k16nq7fbsd07wkv6zys0jqdd35ikq3aiax3jdihk94gq46raqc1"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; }; pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; }; pulsar = derive2 { name="pulsar"; version="0.3.5"; sha256="0n16jcjxaz19gc12idj3vva9bb0ljxwimgcgil57pi9rmflv9jm1"; depends=[Matrix]; }; pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; }; puniform = derive2 { name="puniform"; version="0.1.1"; sha256="1im6sa2vhcv5yszrsrp5dy0qdnjijm153cjvb0w0v2yzhf0kfhzb"; depends=[ADGofTest metafor Rcpp]; }; 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.1"; sha256="0fw8nyrwf009fpj3457binw5s02si226yrvn96hdivwj268ck8y2"; depends=[magrittr rlang]; }; - purrrlyr = derive2 { name="purrrlyr"; version="0.0.4"; sha256="1xxw5fyz5l0qxw1s5biabj9p37b6qvzswjv8yvr2g1whji2010j7"; depends=[BH dplyr magrittr purrr Rcpp tibble]; }; + purrr = derive2 { name="purrr"; version="0.3.2"; sha256="0ccs78a2ylr60f3z0f7iywi8h1pwr8mz4ga78bs4pwgnwkclvir7"; depends=[magrittr rlang]; }; + purrrlyr = derive2 { name="purrrlyr"; version="0.0.5"; sha256="0rcamyf7d01rpd9izh8xp66j130aqarfbc24p898dqhghb6q1ryq"; 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]; }; pvar = derive2 { name="pvar"; version="2.2.5"; sha256="1a5dxhki5nd5s1d5wwnc1dkg7mdib2s8w1i0l8mdg3f1g3l00klz"; depends=[Rcpp]; }; pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; }; @@ -10923,7 +11064,7 @@ in with self; { qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; }; 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.5.1"; sha256="1xix0k62zrw6f29fb5yz97lkms669070i42nfdgz64b77axhqjcl"; depends=[dplyr ggplot2 scales]; }; + qicharts2 = derive2 { name="qicharts2"; version="0.6.0"; sha256="0310xczb8zzl8xl0l2fn1mw58cbkgs0xpsp3q061psv1achapxbr"; depends=[dplyr ggplot2 scales]; }; qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; }; qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; }; qkerntool = derive2 { name="qkerntool"; version="1.18"; sha256="0z03czmh62m740amvws8vdsha6x4zwf0cc8097sc3c894w5xn9q7"; depends=[class]; }; @@ -10972,7 +11113,7 @@ in with self; { quRan = derive2 { name="quRan"; version="0.1.0"; sha256="108d797l9ggggc5b61pl7f6avzknmnnib2ys5vrg385zfbx9srvw"; depends=[]; }; quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; quadmatrix = derive2 { name="quadmatrix"; version="0.1.0"; sha256="0nngrvvbalmrr6g9bq9f5qrllvwfq5p1b9yhs4zb098s3wga8jms"; depends=[geigen matrixcalc]; }; - quadmesh = derive2 { name="quadmesh"; version="0.3.0"; sha256="1ypjdihrd8d5hwn0h3dfv922x4dj599i7p5zicqpdfmh013408d1"; depends=[geometry gridBase png raster reproj sp viridis]; }; + quadmesh = derive2 { name="quadmesh"; version="0.4.0"; sha256="196p1qiis1hbs8yxd5570cqln0zcp3ngbajf3rsc0rwgjzqgm3wv"; depends=[geometry gridBase png raster reproj scales sp viridis]; }; quadprog = derive2 { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; }; quadprogXT = derive2 { name="quadprogXT"; version="0.0.4"; sha256="1bqjlqihb371ggds60219x474b6n4wsl6fnia8hd410iyn9wm05g"; depends=[quadprog]; }; quadrupen = derive2 { name="quadrupen"; version="0.2-6"; sha256="0din0b4iaixjfkdiy4gbl83hq6z7v7aca2xk65hzfsalp6llk91x"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; @@ -10983,11 +11124,11 @@ in with self; { qualpalr = derive2 { name="qualpalr"; version="0.4.3"; sha256="1hlssqj2129796d00gnip3ih5b705qasw0hkj25xfz7xak0vdbkm"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; }; 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]; }; - quanteda = derive2 { name="quanteda"; version="1.4.1"; sha256="0a9rqszsw77xszv4bkb7jxflxgmwbi39vkhlij8p0pzac02rgzaz"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; }; + quanteda = derive2 { name="quanteda"; version="1.4.3"; sha256="0lh32xsqrbai1jp6jgdypgz1imv4gf4x0dbwd5kss0y80sr80r3c"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; }; quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; }; quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; quantities = derive2 { name="quantities"; version="0.1.2"; sha256="01h0d2cmqqyqch98d8pgv3n2rvp3vc3sby95srahgcrrlxmmrrvj"; depends=[errors Rcpp units]; }; - quantmod = derive2 { name="quantmod"; version="0.4-13"; sha256="16aldg96z7amp5mr90nb8127yy04gxsihfr26km5p3cx3j117yv0"; depends=[curl TTR xts zoo]; }; + quantmod = derive2 { name="quantmod"; version="0.4-14"; sha256="1csljagnpkr1mmc18h70b64zbyj07kx972nip9dng39jfg7ilnyr"; 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.38"; sha256="1vvvnk291f0dccg04l3nsnk585gq75sk0b2vdbrqv3lczvv18nw1"; depends=[Matrix MatrixModels SparseM]; }; quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; }; @@ -11007,12 +11148,13 @@ in with self; { quickmatch = derive2 { name="quickmatch"; version="0.2.1"; sha256="1qfslhjlbjpzigz8n6b7w41g8pwdiwri091ivd5igp1xy5pv8a3w"; depends=[distances sandwich scclust]; }; quickpsy = derive2 { name="quickpsy"; version="0.1.5"; sha256="0r1xjcx02p0fsgfcd2h0dxcagzxxan405cjwh8sjdgi5p01jrym8"; depends=[DEoptim dplyr ggplot2 MPDiR]; }; quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; }; + quiddich = derive2 { name="quiddich"; version="1.0.0"; sha256="10kiyn1all58klyygmz6zw0w9nfl9vq19qybmkqh410rd5ryjz3p"; depends=[ape]; }; quint = derive2 { name="quint"; version="2.0.0"; sha256="10jcpabsk7bdw7cvq21z0hsrp4gnlbf35iypc2gprrbkk8sw4i8i"; depends=[Formula partykit rpart]; }; 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.2"; sha256="034fhfmfq62yf7akx2i0bim70jq9azkk2h28k79lwax7ysydsjnj"; depends=[]; }; qut = derive2 { name="qut"; version="2.1"; sha256="1wkk4c4f10a1whrspr5yalp7flcxckzxlx187ymmpnz7qcncz619"; depends=[flare glmnet lars Matrix]; }; qvcalc = derive2 { name="qvcalc"; version="0.9-1"; sha256="1ll71yww8rsbp0qa60w7vdna8yk60cq66cjn5cdk3bkdwyni28yy"; depends=[]; }; - qwraps2 = derive2 { name="qwraps2"; version="0.4.0"; sha256="1hw3m06xgw84a5hhfh2i2l5sh96ji05m3l3zx7a2sjsp41aszv2k"; depends=[dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; }; + qwraps2 = derive2 { name="qwraps2"; version="0.4.1"; sha256="0p1fc9h2c6ax3iz6dw03ljr394sbj1p9j2wsd26anc1pr047jy25"; depends=[dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; }; r_blip = derive2 { name="r.blip"; version="1.1"; sha256="1p33g6i6fq9c27d5ix9nd8prv90i4hrf91x34bldlw8041sjqxm0"; depends=[bnlearn foreign]; }; r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; }; r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; @@ -11058,7 +11200,7 @@ in with self; { rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; }; rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-10"; sha256="0a00s10yp22fkvk67dkq43sbphcqla65x9j4qpv076bmdchn7arw"; depends=[chopsticks rJava]; }; rJST = derive2 { name="rJST"; version="1.0"; sha256="143qb1iglfsjdcdr57mr3syrgxz6ksywm7m65hba92i2bd6ys7cj"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; }; - rJava = derive2 { name="rJava"; version="0.9-10"; sha256="0y7yg70i3zwbwl4g36js4dqpl51cmwss5ymrsk24d1z07bflp4y9"; depends=[]; }; + rJava = derive2 { name="rJava"; version="0.9-11"; sha256="0s9cjy1wh7snmbqwznh8f1r4ipylr7mgda4a979z963a8lqy32n2"; 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]; }; rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; }; @@ -11066,16 +11208,16 @@ in with self; { rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4"; sha256="1fvln3r2zkzhsck53jppchg795qbjbzw0rd688h89if1lkiy51w6"; 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.0.0"; sha256="1cxcf2ji2f3kkjlj6lym7zfpmgbbjw7al67dldy2kn9dk2dn087z"; depends=[]; }; + rMEA = derive2 { name="rMEA"; version="1.1.0"; sha256="1aarnik0qjxg6h55xpskx1dwkp78nfdyrwpy9r6ffyxhz9jbplnj"; depends=[]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; }; rNOMADS = derive2 { name="rNOMADS"; version="2.4.1"; sha256="0qag0riwkrzgybwfbhpkapjcf7ccqrqa4j8zqh3xx0548k8mm37l"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; }; rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; }; rPACI = derive2 { name="rPACI"; version="0.1.1"; sha256="0skpv7h91vfr8xkx0ic8yz7hcj1bbwd1f80sa9p9jn2rpfpzalv9"; depends=[]; }; - rPackedBar = derive2 { name="rPackedBar"; version="0.1.0"; sha256="12jwkch3264m6ksl8rdjirwdzm1g8b4050mm6rysw9v57k3v57ji"; depends=[data_table plotly scales]; }; + rPackedBar = derive2 { name="rPackedBar"; version="0.2.1"; sha256="1ci1b0adnh9cj6225mv5n4wqq08q5c3sjfkyg5xpzwzjisjs3z47"; depends=[data_table plotly scales shiny]; }; rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; }; - rPraat = derive2 { name="rPraat"; version="1.2.0"; sha256="1hhx7qayc69skzrb8sb18cid5y49naig7qxkk3x5x1icvk324n0x"; depends=[dplyr dygraphs readr stringr tuneR]; }; + rPraat = derive2 { name="rPraat"; version="1.2.0-2"; sha256="00qxccdbs42d9mi33af08i4la4fi500rqxvll39mffnrwlwa3bhw"; depends=[dplyr dygraphs readr stringr tuneR]; }; rPref = derive2 { name="rPref"; version="1.3"; sha256="0vlzhxhf2x6gw015sjfw2638wv6hckg068rpbzncp7wprn9msa6y"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; }; rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; }; rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; }; @@ -11094,10 +11236,9 @@ in with self; { rWishart = derive2 { name="rWishart"; version="0.1.1"; sha256="1zv35l2nvwwidx5zxfh7a4jgiaq2mqk69xf974994k1ksfvibkmi"; depends=[lazyeval MASS Matrix]; }; rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; }; rabi = derive2 { name="rabi"; version="1.0.0"; sha256="1ljs6wgdw045q1acdmci5b3p8qxhhm4d6bdj64nha76fnq2rr76x"; depends=[numbers polynom shiny stringdist]; }; - race = derive2 { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; }; radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; - radiant = derive2 { name="radiant"; version="0.9.7"; sha256="0vmiypmabimnxdh692x4f2fbv32fmb8rhn5hvf60sk5qzzp0hla3"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; + radiant = derive2 { name="radiant"; version="0.9.9"; sha256="0v71ghx0kxdv9mzjikx8ws0v8vhr5zdjgzfqhmpsgxiqrahwh2px"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; radiant_basics = derive2 { name="radiant.basics"; version="0.9.9"; sha256="132y74g3mr291jcyrbky3ky0bh4pqll0mafcxm4ykrcqr9his3rw"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; }; radiant_data = derive2 { name="radiant.data"; version="0.9.9"; sha256="17mgm0sggh4f7ihqmj9m3996p3pqc7h2cwx6ll1ha3kg5mx0znyn"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; radiant_design = derive2 { name="radiant.design"; version="0.9.9"; sha256="1d5ds24b7mp8xad5pgzvjr17akr7p8m6w0ryd5fkwylnfgnhznrb"; depends=[AlgDesign dplyr mvtnorm polycor pwr r_import radiant_data shiny]; }; @@ -11108,9 +11249,10 @@ in with self; { 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]; }; radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; - radtools = derive2 { name="radtools"; version="1.0.3"; sha256="115mz5vlhl2lamb6gp3n6ka8yr4j7r2hjb665ir88bb4wrvwiymj"; depends=[dplyr Hmisc magrittr oro_dicom oro_nifti]; }; + radsafer = derive2 { name="radsafer"; version="1.0.0"; sha256="10mn9aps1m2llliml5rpvqcsij6x48jj3sz11ykx50icn8i5qymi"; depends=[ggplot2 readr]; }; + radtools = derive2 { name="radtools"; version="1.0.4"; sha256="1v8hzjnfffhn2a677pyx4g0xbccqcv1i2hz9j31xyyrb3licabz5"; depends=[dplyr Hmisc magrittr oro_dicom oro_nifti R_utils TCIApathfinder xfun]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; - rags2ridges = derive2 { name="rags2ridges"; version="2.2"; sha256="04f9gvwpgrx54dgbjjixlxa2056aqcz2kryn4jplwf5fc0vj1lyn"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape sfsmisc snowfall]; }; + rags2ridges = derive2 { name="rags2ridges"; version="2.2.1"; sha256="0xiv4dhzxbxy9bqjpz8rfrh0pzxbsnkg5wgz61c643slidgs0h0d"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; }; ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.2"; sha256="03613amz11ixgkjhc8rg4vp3ih60g1ibhdjrldr9mazzkak46y91"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; ragtop = derive2 { name="ragtop"; version="1.0.0"; sha256="0ijzchp2w364qvvmqsddw7drwnfyrndwzc911bdlbc39af2s7dgi"; depends=[futile_logger limSolve]; }; railtrails = derive2 { name="railtrails"; version="0.1.1"; sha256="1hi55rcxmr7k3na3rpjqmd5fpgn51bymrp7yxmw45ff7mlzpa5h6"; depends=[tibble]; }; @@ -11118,7 +11260,7 @@ in with self; { raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; }; rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; - ramchoice = derive2 { name="ramchoice"; version="0.2"; sha256="0br6n6mxcz099rj3dh1sp28wy9g5rqwh0arg0s968pc5h0jfbai5"; depends=[MASS]; }; + ramchoice = derive2 { name="ramchoice"; version="1.0"; sha256="0cjj4kk05mif0blfkw86xvnx3aaq07c64ffpvbvvb32s2pqvc91r"; depends=[MASS]; }; ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; ramps = derive2 { name="ramps"; version="0.6-15"; sha256="0c7y64z0ysjy0kh234xfqhbwwn1vgscvp1n4l2fjk5s5xz8633pn"; depends=[coda fields maps Matrix nlme]; }; @@ -11148,15 +11290,16 @@ in with self; { randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive2 { name="randtoolbox"; version="1.17.1"; sha256="13akf13qi4yhj9gapym05074b1qzk03vgysy81qsd73pd8r107ls"; depends=[rngWELL]; }; rangeBuilder = derive2 { name="rangeBuilder"; version="1.4"; sha256="1jjy1d3kljysm3mqgdszdi6incbmg2di63akxswfaiqcp1m68a6y"; depends=[alphahull cleangeo pbapply raster Rcpp rgdal rgeos sp stringi]; }; - rangeMapper = derive2 { name="rangeMapper"; version="0.3-4"; sha256="0qrcxbh8saflqjmaa18fcyk5cqk6h4rz92zhqckswyqynx6m0cps"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; }; + rangeMapper = derive2 { name="rangeMapper"; version="0.3-5"; sha256="1y34b23mayx8h12lvgv4dvnv009pvs145xh1csnzvg15x4s2z6fa"; depends=[classInt data_table doFuture foreach future future_apply ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; }; rangemodelR = derive2 { name="rangemodelR"; version="1.0.4"; sha256="0y8hdqi04n3pc3iwz82gikn61h42bmfi7iccwgbglk8wkrkg4gy0"; depends=[]; }; ranger = derive2 { name="ranger"; version="0.11.2"; sha256="1sxyzxmjc6lm8wcmq15j6sscnza7aay4mr3dyri2zngx6fa8mb0k"; depends=[Matrix Rcpp RcppEigen]; }; - rankFD = derive2 { name="rankFD"; version="0.0.1"; sha256="1zb9gxvsmv46mpw5znskhfjxnwkr59hdixcly6i3r78yaqgca0dz"; depends=[coin lattice MASS Matrix]; }; + rankFD = derive2 { name="rankFD"; version="0.0.2"; sha256="16v8wdax319c3b985k2n7s7wwkjn5g2lq0jkyc6d3iaxprclrjzk"; depends=[coin lattice MASS Matrix]; }; rankdist = derive2 { name="rankdist"; version="1.1.3"; sha256="1hdafy2zzn7hwl1lx5jksgi974zjn49dwih5s2zdyv4nnmmai003"; depends=[hash optimx permute Rcpp]; }; rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; }; rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; }; rapidjsonr = derive2 { name="rapidjsonr"; version="1.1"; sha256="0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"; depends=[]; }; rapidraker = derive2 { name="rapidraker"; version="0.1.0"; sha256="17jzkzm5hvd8vcqql40bwl89sfgz8yicvi0753nzgkmbvanzjhjx"; depends=[openNLPdata rJava slowraker]; }; + rapidxmlr = derive2 { name="rapidxmlr"; version="0.1.0"; sha256="14pa08yp8xmbqk8wwinz1xsphx75xq6vg8zgzcxc5zgmcf0ja5if"; depends=[]; }; 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]; }; @@ -11183,6 +11326,7 @@ in with self; { ratios = derive2 { name="ratios"; version="1.2.0"; sha256="16q9v2lhgklvdp3hi9x3afdldznfpwg775p80m2g5074q2dzjpgg"; depends=[data_table stringr]; }; rattle = derive2 { name="rattle"; version="5.2.0"; sha256="099anyq4spb7dbikxb29aacqp4xswr66hxjgxiwcvhm9jjryb33v"; depends=[dplyr ggplot2 magrittr rpart_plot stringi stringr tidyr XML]; }; rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; }; + raustats = derive2 { name="raustats"; version="0.1.0"; sha256="0wyq45v4d5gyrn2zbn0qj7wm4a0jh0xjlp6wzzpdiy2w3c9xwx5z"; depends=[dplyr httr jsonlite lubridate readxl rvest tidyr xml2]; }; raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; }; raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; }; rayshader = derive2 { name="rayshader"; version="0.10.1"; sha256="0yjqp3fgcay12iirji27nhpck51salln5793axqkj1fwjl6h12d4"; depends=[doParallel foreach imager magrittr png progress raster Rcpp RcppArmadillo rgl scales]; }; @@ -11203,7 +11347,7 @@ in with self; { rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; 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.1.0"; sha256="12vdci4rzjvd419nxh99hpkhjlx86nsmrbjca0am5q0rkc68dgmj"; depends=[crul data_table fauxpas jsonlite tibble]; }; - rbtc = derive2 { name="rbtc"; version="0.1-5"; sha256="1yw5b8qgvznchqx0zndvkhcrl9ww4sn92x7khzwc9hlbr32j14ls"; depends=[gmp httr openssl rjson]; }; + rbtc = derive2 { name="rbtc"; version="0.1-6"; sha256="1z5p1jn5b0hzwcbdpiwj224h45x01bbsgkskllir5j13l416561p"; depends=[gmp httr openssl rjson]; }; rbtt = derive2 { name="rbtt"; version="0.1.0"; sha256="1gbsb0vmqxcl28c5nn0rz95bxrvl7i0b17lq90cj5ahbk6x9jblz"; depends=[data_table]; }; rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; }; @@ -11220,14 +11364,14 @@ in with self; { rcdk = derive2 { name="rcdk"; version="3.4.7.1"; sha256="1d08ajji631792b7fyfwzvcaswh8jlanfsxrj6c1wx7xh3qqpigg"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; }; rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; }; - rcheology = derive2 { name="rcheology"; version="3.5.2.0"; sha256="1chqija5w992056nzl9sdrzyxmiwqwndxx66vz1h4mqqb5y42c1j"; depends=[]; }; + rcheology = derive2 { name="rcheology"; version="3.5.3.0"; sha256="08jm96i9w9yk0bclfyjdaap2a1a27b8ravgpbhmicv01x11y1lsg"; 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.0"; sha256="0bn00kglfc3sm5j83r5sj94b3vj27i1zwky4xn18swjg0c2cf94y"; depends=[jsonlite V8]; }; rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; }; rcites = derive2 { name="rcites"; version="1.0.0"; sha256="0w2jzd3kwk21pbvv91zmj9z8qxszk6q3502gfg22gv24mpb7bsv7"; depends=[httr jsonlite]; }; rcitoid = derive2 { name="rcitoid"; version="0.1.0"; sha256="11iqdj1q983w28fh17rqvmhs41ks09b24p408nl7hz4iqg9c7lpi"; depends=[crul curl fauxpas jsonlite]; }; rclimateca = derive2 { name="rclimateca"; version="1.0.2"; sha256="012p6vj78m43y8n85diaf5z11h4v0p4s898jmlipvsha11q60csn"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; }; - rclipboard = derive2 { name="rclipboard"; version="0.1"; sha256="0qphr3qrp0k2gnzk27bgfiq3ff6b8564gmkrjw1kri1p7ilf71wx"; depends=[shiny]; }; + rclipboard = derive2 { name="rclipboard"; version="0.1.1"; sha256="0rgvin8nk8bbj7agwb0p2x6dg1p16s9qixjqq5rnxprdj7p6dhdm"; depends=[shiny]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.2"; sha256="0ys1nd7690mhwzslyzg8fq1wxr28nz8g6av5iykkrshb8lkxg7ly"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; }; rcompanion = derive2 { name="rcompanion"; version="2.1.1"; sha256="0vvw6vi372pynnj6c0sy9wngag2m4hrd3shc4v106qr5mdqnnkwc"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; rcongresso = derive2 { name="rcongresso"; version="0.4.6"; sha256="1xd07vlbcp3msmwvg2nk7acdx513v2wfbq64na0045rsv2v96m44"; depends=[dplyr httr jsonlite magrittr stringr tibble tidyr]; }; @@ -11238,7 +11382,7 @@ in with self; { rcrossref = derive2 { name="rcrossref"; version="0.9.0"; sha256="1h2p2rnv8kskn1wi1iy6k497rdalzid75ihmh1gfcg3cix9vdq89"; 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]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; - rcss = derive2 { name="rcss"; version="1.7"; sha256="0sl175x2l6c493b4kvcbxp6ps95d5rgydqmd6fcwwr3in5lhjdky"; depends=[nabor Rcpp RcppArmadillo]; }; + rcss = derive2 { name="rcss"; version="1.8"; sha256="0c2i1zqjgl81i91b3bv70v54iib1d7hbsd1h63nip1al6lwnya4c"; depends=[nabor Rcpp RcppArmadillo]; }; rcube = derive2 { name="rcube"; version="0.3"; sha256="0y4sw67g0ws3iywbaz56ccg5q6n2885yfl8rvb45yvwjmdmbg85r"; depends=[magrittr]; }; rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; }; rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; }; @@ -11246,22 +11390,22 @@ in with self; { rdatacite = derive2 { name="rdatacite"; version="0.4.0"; sha256="14p8albilnzf882m499zfps77jrx0zav9wpz3m047xgs2msnwxqw"; depends=[crul jsonlite oai solrium]; }; rdatamarket = derive2 { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; }; rdataretriever = derive2 { name="rdataretriever"; version="1.0.0"; sha256="1a1dbzs1jravbhidv9wcs52qbd6zf7wf26hixpqjwiq8gsq9l5gh"; depends=[]; }; - rdbnomics = derive2 { name="rdbnomics"; version="0.4.6"; sha256="0qiqcfv6bxgyrysf02f9s19l2qc60v9yy34jbnl4nkdrw7jy2f8q"; depends=[curl data_table jsonlite]; }; + rdbnomics = derive2 { name="rdbnomics"; version="0.4.7"; sha256="1qbng6hml3nafs9vv1vrpaj0755di6bcxrzvp2ng9psh2yv0plz2"; depends=[curl data_table jsonlite]; }; rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; rddapp = derive2 { name="rddapp"; version="1.1.0"; sha256="0zdm54hlxqp7r21fwdka33syjsrf6flrvwqm86hpwhg95880ixkk"; depends=[AER Formula lmtest R_utils sandwich shiny]; }; rddensity = derive2 { name="rddensity"; version="0.2.2"; sha256="10530il8fxpgcads6yvj09jwanldlpvjgjqcknl2wly4gmwcwjq9"; depends=[ggplot2 lpdensity]; }; rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; }; rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; }; - rdefra = derive2 { name="rdefra"; version="0.3.5"; sha256="0mj5xpr1xk0r2ph9fvbabmzrb9yqgdaj0bl76xrhkzisdkagf705"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; }; + rdefra = derive2 { name="rdefra"; version="0.3.6"; sha256="00c9xflk8dampk7ygr9xsaraz267z2kv6fjf32jlp0c819wz2x1m"; 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.2"; sha256="0l0bhv9z5g7js5jc39avyxa60jps9wgbrybbdx7hqgynm3ypc4mr"; depends=[dplyr jsonld readr redland stringi tidyr]; }; rdfp = derive2 { name="rdfp"; version="0.1.3"; sha256="1rwb1hhyl6dw94x2fqfmvjz2kvz071nh549kpzd24h7hnqv8ks7x"; depends=[curl dplyr httr lubridate plyr purrr readr XML xml2]; }; - rdhs = derive2 { name="rdhs"; version="0.6.2"; sha256="1xgyxysfc446xc1w8598x1rli2zlv7acfwj5mqq8ab8didwmr693"; depends=[digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr 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]; }; 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.3"; sha256="1jp3s4293h973dpz0waq9abpd8ibp4gxdyk3bwn7a32zfpk4kjza"; depends=[Rcpp RcppArmadillo]; }; rdiversity = derive2 { name="rdiversity"; version="1.2.1"; sha256="0j67b9mnq2xfbi2hrn1x9vgdv63779d0rcbzndljh37b1x5zlr22"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; }; - rdlocrand = derive2 { name="rdlocrand"; version="0.3"; sha256="1cv69iy5sx9kdplpk9hnriqzgrm5mjbmhax4cybszhsyaly6r78d"; depends=[AER sandwich]; }; + rdlocrand = derive2 { name="rdlocrand"; version="0.4"; sha256="06cm6lsb4fzw26bip6l2ggpins5wp07lw7rnpr573klbwfnw5ksm"; depends=[AER sandwich]; }; rdmulti = derive2 { name="rdmulti"; version="0.2"; sha256="1sl677kaq5qr2m9nzxfslwzai7h07mdfqjjzrak2xbpgqa44288z"; depends=[rdrobust]; }; rdnb = derive2 { name="rdnb"; version="0.1-2"; sha256="1phb86jv2caayr4p95p68jrksai9w922rl3y5hjkw3gkc3jxn09f"; depends=[brew httr xml2]; }; rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; @@ -11271,11 +11415,12 @@ in with self; { rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; }; rdryad = derive2 { name="rdryad"; version="0.4.0"; sha256="19ca618hymvpk5byrrglc6iidsgm6wn43fypspssa7b3r1c4xhdc"; depends=[crul curl data_table oai solrium tibble xml2]; }; rdtLite = derive2 { name="rdtLite"; version="1.0.2"; sha256="11l9n6y5vlhkwyc9hirjw18yzkhbbmnph7dbqy0n3l3q5r9icfac"; depends=[curl digest ggplot2 gtools jsonlite knitr sessioninfo XML]; }; - rdwd = derive2 { name="rdwd"; version="0.11.0"; sha256="02abp32kyawn5a9pfah6b9qb4l1393b8mam74g7d71cclg65zvx2"; depends=[berryFunctions pbapply]; }; + rdwd = derive2 { name="rdwd"; version="1.0.0"; sha256="0qamgv2k4rn951wnf4j5v5b511y0kw93y745dvjp9snaw1qgqww3"; depends=[berryFunctions pbapply]; }; re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; }; reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; }; reReg = derive2 { name="reReg"; version="1.1.6"; sha256="198vgf3294if9zmvl54pgx6ram63pswpjnh44fy7n60g8nza44bb"; depends=[BB dplyr ggplot2 MASS nleqslv plyr purrr SQUAREM survival tibble tidyr]; }; reactR = derive2 { name="reactR"; version="0.3.0"; sha256="1zwxzi35l764gm7nbqciki7610brad4q4j46mfng8ywvk112sgp9"; depends=[htmltools]; }; + reactlog = derive2 { name="reactlog"; version="1.0.0"; sha256="1pajxd9k208s06sava2gqip22pzwlyslnfvkbkfw47mp4wb7zmk9"; depends=[jsonlite]; }; read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; }; read_gb = derive2 { name="read.gb"; version="1.6"; sha256="17py6al9cwq4jmab7k2164f7hi8943gi8a50d8zpn1xms9l2cnld"; depends=[]; }; readABF = derive2 { name="readABF"; version="1.0.1"; sha256="0w85v8dl337lsyfad3hxwavma1gnhi4wyszdj8npaz37y12nk2gy"; depends=[]; }; @@ -11292,13 +11437,13 @@ in with self; { 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.1"; sha256="1hnmj6ydvdss7jbl3h16ip0g993wdfyfm15r8f78ihjlh84swima"; depends=[Rcpp]; }; + 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]; }; readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; }; readsdmx = derive2 { name="readsdmx"; version="0.2.2"; sha256="1ja6fpjsbx5jzv9ys12wkcn3jrj8a2gnxpbswqk6ppckryi9hnp7"; depends=[Rcpp]; }; readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; }; readtext = derive2 { name="readtext"; version="0.71"; sha256="1blcsk1d78q0s1bijsrzrfrvhgbsq3qi1r9w3i51h1r9g3v9p87f"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi tibble xml2]; }; - readxl = derive2 { name="readxl"; version="1.3.0"; sha256="1p7snd8lznyinp0nyg6bsqwn9alh3pnnj77bfg865ingdl1d2yc3"; depends=[cellranger progress Rcpp tibble]; }; + readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; }; realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive2 { name="rebird"; version="1.0.0"; sha256="0gp8afj6y3vss2b11v0fqyc3ai67kilicr4fnk5zghljfvbxsxm8"; depends=[assertthat dplyr httr jsonlite]; }; @@ -11310,13 +11455,13 @@ in with self; { rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; }; 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.4"; sha256="0bwijw4427v2k5z3qci2kyr5dyzql8b3lvf88rwy16p741jckjsn"; depends=[dplyr generics gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyr tidyselect timeDate withr]; }; + recipes = derive2 { name="recipes"; version="0.1.5"; sha256="056zv4vhayyy8q9izcdknbb9hff2gxivg21g5mkssia78vw8g3mg"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr RcppRoll 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.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; recmap = derive2 { name="recmap"; version="1.0.1"; sha256="07669rzk2ahd2vxpjg1avw0a8hdypw69frjx9xjdsir182zmnnh5"; depends=[GA Rcpp sp]; }; recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; }; recombinator = derive2 { name="recombinator"; version="1.0.1"; sha256="1dbsqig2jjp3zypcqxf9c2brb09pv6xikmh6fhz5vgxy5wkyivks"; depends=[crayon]; }; - recommenderlab = derive2 { name="recommenderlab"; version="0.2-3"; sha256="0lgfcwxy97cvi893k1dia3nng3yvclnmv95fszzmkcrf4qi9yy7q"; depends=[arules irlba Matrix proxy registry]; }; + recommenderlab = derive2 { name="recommenderlab"; version="0.2-4"; sha256="1bpnag4sizqn9r6m5p3w3p8sv1r1jb7y9hz92v3bryrbl8z93fkp"; depends=[arules irlba Matrix proxy 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]; }; reconstructr = derive2 { name="reconstructr"; version="2.0.2"; sha256="0pzpd2l1b6y1b1lnd95lpc5s8niz7p56vkmxgyi6g6b25vh9c2vi"; depends=[openssl Rcpp]; }; @@ -11353,7 +11498,7 @@ in with self; { regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; }; regrrr = derive2 { name="regrrr"; version="0.1.0"; sha256="0h9vag1ypf5ycvz5fbfvw4nh4l8dgn2kmsgzq9kmn7hw2qsjwbbl"; depends=[dplyr ggplot2 magrittr MuMIn purrr rlang robustbase scales spatstat stringr tidyr usdm]; }; regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; }; - regsem = derive2 { name="regsem"; version="1.2.3"; sha256="1if17nc3pjjm2by9ii1dyksx4r82m62h76mc05sndc3a2mpkc003"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; }; + regsem = derive2 { name="regsem"; version="1.3.3"; sha256="12hpgq4wd9a2blryjm3m9q6xl0f7qgkqhm2y6pbrxfj1ynzszrjx"; 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=[]; }; @@ -11362,7 +11507,7 @@ in with self; { 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.1.0"; sha256="025v8flr8q2p473kz760vywczhvx8b4lakm6rasr9ijgxpbd2jpn"; depends=[checkmate nnet purrr R6]; }; + reinforcelearn = derive2 { name="reinforcelearn"; version="0.2.0"; sha256="0naakmyb14d2cf7cy5ir52qh3bp51gvs6hyhfi3f72yl2jfnnpzg"; 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.3.1"; sha256="1a3gffa9jgfm92q0ba9slwdp8r1n5kycywxp0jbjkpvkdpmacnd4"; depends=[]; }; @@ -11397,7 +11542,7 @@ in with self; { repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; - replyr = derive2 { name="replyr"; version="0.9.9"; sha256="1rniihri2acjgk6dcviv4xj1fa7w7pvx0k8d8l2adi2790k63xib"; depends=[DBI dplyr rlang wrapr]; }; + replyr = derive2 { name="replyr"; version="1.0.0"; sha256="12qz31wfn4qmag1zn65f18cxg781q86hbksizdix29sbkbpjg764"; depends=[DBI dplyr rlang wrapr]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; repo = derive2 { name="repo"; version="2.1.3"; sha256="1g72zvj2mg8cxfy1w3d46lkk4hayad64ns5w1y43731whzraxk95"; depends=[digest]; }; repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; @@ -11412,16 +11557,17 @@ in with self; { represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="0.2.1"; sha256="1ws5gds453xgfili87r35rz1wn2i7jbqissq98csbiddpkgls8sx"; depends=[callr clipr fs rlang rmarkdown whisker withr]; }; reproducer = derive2 { name="reproducer"; version="0.2.1"; sha256="1jxv6j5vavncjwrhwbxiz9a4v3kixgrs08kyk6drmhcc031g1dfv"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx reshape xtable]; }; - reproducible = derive2 { name="reproducible"; version="0.2.7"; sha256="185fh183l0gbw3ncifygw7bkzswp8lwi9zcx6csk7671cswwalzs"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster Rcpp RCurl remotes rgdal rgeos rlang sf sp testthat versions]; }; + reproducible = derive2 { name="reproducible"; version="0.2.8"; sha256="0i9x4wprylhd19mcq3f5a5hh3mnmvgvp0y6qymjkz6vaw8jpp6d2"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster Rcpp RCurl remotes rgdal rgeos rlang sf sp testthat versions]; }; reproj = derive2 { name="reproj"; version="0.2.0"; sha256="108grfbhcgw5pp3alwxjfwcydw9qn0v3dhn1fn8dz24xx4wbmz2h"; depends=[proj4]; }; repurrrsive = derive2 { name="repurrrsive"; version="0.1.0"; sha256="1ffldcs30xa4wcd825bgpcmqsndfyxx70dfmbb3c86ic9kq17p01"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.2"; sha256="18ib0qbfw3sih7xs1z4szjqppr7lbj5wx0w0kx80g810m7q27wyp"; 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.5.0"; sha256="1b18jcwv794sprsp468d4salplwn13hhi1hcc7vjl02y67551dlg"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; - rerf = derive2 { name="rerf"; version="2.0.3"; sha256="1y9ar2fs329q8fxmxg8llcar4xmpibz8bwcrv88yz2nlngcbf8n0"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; }; + rerf = derive2 { name="rerf"; version="2.0.4"; sha256="0ykgxdmkqapdpk5zwi8h1cbsvjv6jpscqpr5cjmdzdan22m09l6k"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; }; resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.3.0"; sha256="09hp97zk31f016d65vq64gv413c6bx1dwqy74ai34xk00flkwady"; depends=[]; }; + resautonet = derive2 { name="resautonet"; version="1.0"; sha256="0kp6gp79j8cc5xbwr94vf6nh41msw7sqgrz9xkjzrj4asb9yjln5"; depends=[dplyr keras magrittr Rcpp RcppArmadillo rstack]; }; resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators 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]; }; @@ -11454,22 +11600,23 @@ in with self; { rexpokit = derive2 { name="rexpokit"; version="0.26.6"; sha256="06h2k1jzn9rvbgyhhgnshwdajl9psks1sx09108appyf7sqlb9bp"; depends=[Rcpp]; }; rfPermute = derive2 { name="rfPermute"; version="2.1.6"; sha256="198vvf8jdcjiv55hmlzd4f9jwr55yxk8m3s6dr9lkcq5r4h6xmrk"; depends=[abind dplyr ggplot2 gridExtra magrittr plyr randomForest reshape2 rlang scales swfscMisc tibble tidyr viridis]; }; rfUtilities = derive2 { name="rfUtilities"; version="2.1-4"; sha256="15784vhfp5sxmy58p2xgmc1v3bxx2f78i1pzc186q77zs88c5sq9"; 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="1.8.3"; sha256="1a9xj0hpbvjp70v8rim0vpqpdjf6x81jw47nzjl9iggny3c1nb1m"; depends=[bitops data_table dplyr httr jsonlite RCurl]; }; rfbCNPJ = derive2 { name="rfbCNPJ"; version="0.1.1"; sha256="0zvpazxi184ia2wql0120kw7665dn9cs8a2kv91n79pncabb4xfg"; depends=[fs glue httr magrittr progress purrr readr stringr tibble xml2]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; - rfishbase = derive2 { name="rfishbase"; version="3.0.1"; sha256="0kzhfvcn40xms2i2ppsfjp7nj5yr7k3r4kivsm5g5palywyclxsh"; depends=[dplyr magrittr memoise purrr readr rlang stringr]; }; + rfishbase = derive2 { name="rfishbase"; version="3.0.3"; sha256="0idlsg7k9ayq6fa96l3v22fpxgzrcazyfcpmgxrbl05jk8ajbsyf"; depends=[dplyr magrittr memoise purrr readr rlang stringr]; }; rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; rfm = derive2 { name="rfm"; version="0.2.0"; sha256="1d07bms5ykfkw0ynfl21fhs9s6yvs44fn570vzi2dj8h5ywbsz15"; depends=[assertthat dplyr forcats ggplot2 ggthemes lubridate magrittr purrr RColorBrewer rlang tidyr xplorerr]; }; rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; }; rfoaas = derive2 { name="rfoaas"; version="2.0.0"; sha256="04wx3d6v9zci6i5k3c4nfdycgjmng7f533b9k84kf1pa4lwp45ad"; depends=[httr]; }; - rfordummies = derive2 { name="rfordummies"; version="0.1.3"; sha256="13jqvww65wzac1c8ajkljz89vi4j76y9ga52w3ygajjzg0rn15l5"; depends=[]; }; + rfordummies = derive2 { name="rfordummies"; version="0.1.4"; sha256="03y4kzf18xwk41dm1nzqqqk0aflwh1mcgfnh0lbr0r7hnsy3a77x"; 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=[]; }; rgam = derive2 { name="rgam"; version="0.6.6"; sha256="0klf2prw5zj76az66c5hzv23yya1b45l61xdy1zbnggvwh62fqik"; depends=[Rcpp RcppArmadillo]; }; rgbif = derive2 { name="rgbif"; version="1.2.0"; sha256="1fi404r31b973hckdl3yzak1hbz9l2cirmky0cd1q544w833lw19"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; }; rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; - rgdal = derive2 { name="rgdal"; version="1.3-9"; sha256="0m163sj3pfzzk3850lmp892myjhanh04v1yqmg0f8jw9166zhi1y"; depends=[sp]; }; + rgdal = derive2 { name="rgdal"; version="1.4-3"; sha256="01a8nlis3k6mx4f1cc9ly5vicnsydmivar7r2hhlh8bjzyrirkk9"; 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=[]; }; rgenoud = derive2 { name="rgenoud"; version="5.8-3.0"; sha256="0p93wf6ghgz2nifxbscb6bhahh5jd2ba7nh1c2mb6fmbxnsi3swv"; depends=[]; }; @@ -11480,8 +11627,8 @@ in with self; { rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; }; rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; - rgl = derive2 { name="rgl"; version="0.100.18"; sha256="0g8kna9a09iy6g1p63xb1dc1gdxwbam9pqcsxsdp44djm16s4sli"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; - rglobi = derive2 { name="rglobi"; version="0.2.17"; sha256="008wn5fhwyqb3xq5jbs3b08jk770ybjhnk41nqfmg24d7c9pcgi7"; depends=[RCurl rjson]; }; + rgl = derive2 { name="rgl"; version="0.100.19"; sha256="09bhvx8aq104yzysfgd7wlnq4vrvmnd4jzgj0c32whjfal10fqsh"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; + rglobi = derive2 { name="rglobi"; version="0.2.18"; sha256="1d6dmdi3c53gqh9scwxi4hy7y6vplqpmx1l4wx8f73g9bjczdczy"; depends=[RCurl rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.1"; sha256="06i1ljrib0ap87bxlbpnvx5fr05pwzcmza48gbicvg7fwhz9hs05"; depends=[assertthat httr jsonlite R6]; }; rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; }; @@ -11494,15 +11641,15 @@ in with self; { 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.2.1.0"; sha256="1l9p407vapqk4vlnzkr655lphmsv4vjnfcsr0a0zljy5q7c2jp47"; depends=[]; }; + rhoR = derive2 { name="rhoR"; version="1.2.1.1"; sha256="0jinacyaibf4yk5dizkyxaz0bi0lx8f5av0gzqzs15870vb8ybil"; depends=[]; }; rhosp = derive2 { name="rhosp"; version="1.10"; sha256="1k0rb4fchjlzinky6ysdvyk0xjsx5986aqwn3yc6s7m3v7y9wb9m"; depends=[]; }; - rhub = derive2 { name="rhub"; version="1.0.2"; sha256="18aq28q4vggbp19l9wcw3dylnyv7sd26wg0i5w8jrva5cq1v2n5j"; depends=[assertthat callr clisymbols crayon desc httr jsonlite parsedate prettyunits R6 rappdirs rcmdcheck rematch whoami withr]; }; + rhub = derive2 { name="rhub"; version="1.1.0"; sha256="10j47g3lfss0l8nx75q5rlman39266c4f9vxh0pq1drgmacg30wm"; 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.0.0"; sha256="1k15sd5q6a1ijayl585vc54d1zs4nyrxsfck9bn4nlfdiwc5arwf"; 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]; }; 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.3"; sha256="15m9klxcxj33s8wkxyamc4awzarg2ncahgaz5cg5m926g8haz9c8"; depends=[]; }; + ridge = derive2 { name="ridge"; version="2.4"; sha256="18a16653k850sfxw9rmk4spy44hn93i97b2a0jfx41qh43hmkgqy"; 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]; }; @@ -11514,7 +11661,6 @@ in with self; { ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; }; rintrojs = derive2 { name="rintrojs"; version="0.2.0"; sha256="0qdry88f6ci5g6k0i8mycm9k5ibnmb9zjppjvqqaflw3g3nsnli2"; 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-15.2"; sha256="0ladw6s5yljky6abw1xzcmsxsb986hkz4ly4lgj5904j21yqz048"; depends=[mgcv vegan]; }; rise = derive2 { name="rise"; version="1.0.4"; sha256="12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni"; depends=[dplyr ggplot2]; }; riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.1.1"; sha256="0ndqvb0ap865x80h5x1dsd446dig5fp85dfdip5fxa0yi2y30r1v"; depends=[alabama nloptr quadprog Rcpp RcppEigen]; }; riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; }; @@ -11530,7 +11676,7 @@ in with self; { rivernet = derive2 { name="rivernet"; version="1.2"; sha256="0lvl7m1y779g7jsbbc2gh1h6giy1m293j0ky9759c0w17fm454fd"; depends=[]; }; riverplot = derive2 { name="riverplot"; version="0.6"; sha256="0q1icpny8nkxyjhawyjzwrw8qlz0ayn2xyrsqrm4vkxyv6c9xk8z"; depends=[]; }; rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; }; - rivr = derive2 { name="rivr"; version="1.2"; sha256="0ankpfixggwdv17ba8i5iln0zzmngqrhvh3dg8lis9kqg6wa89yr"; depends=[Rcpp]; }; + rivr = derive2 { name="rivr"; version="1.2-1"; sha256="17kh5kin2id8imarvwkjikrmz266x2ldja6b7xpj34s35dzap682"; depends=[Rcpp]; }; rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; rjags = derive2 { name="rjags"; version="4-8"; sha256="17xmjksj69f9wk4x71jxk4cgiqhaf2fj6bjm0mgzp4qln5x84a8m"; depends=[coda]; }; rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; }; @@ -11544,7 +11690,7 @@ in with self; { 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.3.1"; sha256="0lbi66bavca866k26dnpkxj3l106xr4a6khcsfn8i3i8w8mpnhih"; depends=[]; }; + rlang = derive2 { name="rlang"; version="0.3.3"; sha256="1pdlafnijpd2vzy8jxcxwakfi66n4qzrqxvcxi1ja389m066cvbb"; depends=[]; }; rlas = derive2 { name="rlas"; version="1.3.1"; sha256="0jpjyh04ifcf8db15x439jnx9v18lj94v0lpbh95ivmfb05z5nr2"; depends=[BH data_table Rcpp rgeos sf sp uuid]; }; rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; @@ -11552,7 +11698,7 @@ in with self; { rlfsm = derive2 { name="rlfsm"; version="0.2.0"; sha256="08fdllzk5q77fz6ii83vbmz8dnfwwr3ixs11ia2l1vrm1gdj9gf7"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; }; rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; }; rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; }; - rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.2.0"; sha256="1rf3lzxcwz4bmwk9kgribl3chbl3mzpflil4az044w6cl67j5bdl"; depends=[MASS tseries]; }; + rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.2.1"; sha256="1bvxm6hpv0mg2sikg5pv2phssmv8g43vr45nwbf0rhww639bahwd"; depends=[MASS tseries]; }; rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; }; rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; }; rly = derive2 { name="rly"; version="1.6.2"; sha256="1bb55g3rip524dccaxvahjxsi2cimxqvzc897pxplv3bb10pm0r2"; depends=[futile_logger R6]; }; @@ -11561,8 +11707,8 @@ in with self; { rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; }; rmapshaper = derive2 { name="rmapshaper"; version="0.4.1"; sha256="0kd8hppn4d3z527s3kqz0mll7qjy0pbxbif46dfqx3rci6m62a68"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; }; rmapzen = derive2 { name="rmapzen"; version="0.4.1"; sha256="1vql1cy38c4kv8pyl81877s587kq4l9sx9nslbgk3l41wvyyvphk"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; }; - rmarkdown = derive2 { name="rmarkdown"; version="1.11"; sha256="0yyjbh891mdqzpjkblz8510ng71i7mxmyiqr69x3rwlwk2vakk79"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex yaml]; }; - rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; }; + rmarkdown = derive2 { name="rmarkdown"; version="1.12"; sha256="0milpdaf4nd36kq6sci9wc5dhwswl4w9c9fychfbppgjsgfp6kfv"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex yaml]; }; + rmatio = derive2 { name="rmatio"; version="0.14.0"; sha256="072fxg81r4rsc71qrf5p6lr5s3gchbgvxhyzwlx3wxw7y2px6w7y"; depends=[Matrix]; }; rmcfs = derive2 { name="rmcfs"; version="1.2.15"; sha256="0qz8b6z1rslsay0m94y013wychajq850bffv6kg2m0jlf4m16320"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; }; rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; }; rmd = derive2 { name="rmd"; version="0.1.4"; sha256="01ib000hq6acklvysdxnyjmlypnxznsk0zymj1f6vs9vwh711f00"; 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]; }; @@ -11586,7 +11732,7 @@ in with self; { rmumps = derive2 { name="rmumps"; version="5.1.2-5"; sha256="09jw5h122mpsx4idmzadhvsc4bx74fydxmxsx9fpsfsz9k9dqyhq"; depends=[Rcpp]; }; rmutil = derive2 { name="rmutil"; version="1.1.3"; sha256="1nl20nyahnm55z41d096ni9iqhn19ab98i9c13ja1i6ik4gg9fks"; depends=[]; }; rmweather = derive2 { name="rmweather"; version="0.1.3"; sha256="1qdf511vmpffrdfcxlll54km2s0pf6pdswj8401k4ymv5iif91hl"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; }; - rmytarget = derive2 { name="rmytarget"; version="2.1.4"; sha256="03injy7h3gfix7riqj8byqckanjavdkfqhs9nac4drwiwj2yn3v2"; depends=[dplyr httr lubridate stringr]; }; + rmytarget = derive2 { name="rmytarget"; version="2.1.6"; sha256="0zfnkl9vn40wx5wg7flzqm9n37f4yggbsfvznrdf67ndgkc06cr4"; depends=[dplyr httr lubridate purrr stringr]; }; rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; 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]; }; @@ -11624,7 +11770,7 @@ in with self; { robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; }; robustX = derive2 { name="robustX"; version="1.2-4"; sha256="02476pl6gnv1sgp5qywlm79gkaxlghms2c1arj4b16r0gz0g230r"; depends=[robustbase]; }; robustarima = derive2 { name="robustarima"; version="0.2.5"; sha256="0mqlp4xmma74rgwb6rihbzs5nillcnddl6smlxmm8lq1wba27jdj"; depends=[splusTimeDate splusTimeSeries]; }; - robustbase = derive2 { name="robustbase"; version="0.93-3"; sha256="1nqh1qg1qd1qrxl1w585dqx7ql55qzjny1r4f9hqxpwd7lml07cc"; depends=[DEoptimR]; }; + robustbase = derive2 { name="robustbase"; version="0.93-4"; sha256="1q56y0iqp7qhavm4xnpzhs64q7l893y7yiq3b20fllpghka077pa"; depends=[DEoptimR]; }; robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; }; robustlmm = derive2 { name="robustlmm"; version="2.3"; sha256="1rfiz29wy20srwd24ja42fh51ng9vyqrkjbb2dzvsqf663hsf1q0"; depends=[cubature fastGHQuad ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; }; @@ -11635,6 +11781,7 @@ in with self; { robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; }; robustvarComp = derive2 { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; }; rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; }; + rocTree = derive2 { name="rocTree"; version="1.0.0"; sha256="0zq2w4jjkh6b657b92knkmnl121xiybnxq81x4xzz5nsg1sc8w1q"; depends=[data_tree DiagrammeR dplyr flexsurv ggplot2 MASS survival tibble]; }; rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; }; roccv = derive2 { name="roccv"; version="1.1"; sha256="13pwrc31w279l7j58wdz24p8j9jdh53rsavj1mymj92jpm52nfzl"; depends=[glmnet pROC]; }; rockchalk = derive2 { name="rockchalk"; version="1.8.144"; sha256="07dp1n155b9gfvk8l30h6bhjbhbylsjxfzns08mryn4mxj3nqpnb"; depends=[carData kutils lme4 MASS]; }; @@ -11666,11 +11813,11 @@ in with self; { rorcid = derive2 { name="rorcid"; version="0.4.0"; sha256="1diz14b5jzs9i4khyykq58cbgz87qraivv9lhq5nrrrfi2gryl9r"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; }; rosetta = derive2 { name="rosetta"; version="0.0.1"; sha256="0ricxia5vc6hhx82m7xlbr7f31f4djb1ycg4p66fnjmxdmj85xd4"; depends=[car ggplot2 gridExtra lme4 multcompView pander psych rio ufs userfriendlyscience]; }; - rosetteApi = derive2 { name="rosetteApi"; version="1.9.0"; sha256="0pnrfc0dcbh5r3qwfwyb0q063bzwpw4ga60965y5qyxz64cyx74r"; depends=[httr jsonlite]; }; - rosm = derive2 { name="rosm"; version="0.2.2"; sha256="0carzc8rn8997vdqgcf7a6lcpmw7dldhnh6n0rjyb09and8yca7r"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; + rosetteApi = derive2 { name="rosetteApi"; version="1.12.1"; sha256="1b3cwxg7ja7g3bdl13j23xs8lw6ip70r4bah92pqs5pzmb5hx0wz"; depends=[httr jsonlite]; }; + rosm = derive2 { name="rosm"; version="0.2.4"; sha256="00c5cj65fvi0aa07da90vcms3w4qshag2gws7jhpb3wb8nw0hmqq"; 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.5"; sha256="1nmf1asqmwkay5x7p68f1pm2rjgv22si5nxvf87g5fidr4yk3gfx"; depends=[blogdown bookdown bookdownplus devtools htmlwidgets mindr rmarkdown rstudioapi shiny tinytex]; }; + rosr = derive2 { name="rosr"; version="0.0.6"; sha256="0z3x6x64nnbhjjqr4psgyhyiq133fdpk716jxkci8ymxzq8wsl92"; depends=[blogdown bookdown bookdownplus clipr devtools htmlwidgets mindr rmarkdown rstudioapi shiny tinytex]; }; rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; }; rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; }; rotl = derive2 { name="rotl"; version="3.0.7"; sha256="15fsvr4dfqki94kkq8abxcisaqh92zf39994qzaz2y18fcd8ykf9"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; @@ -11707,18 +11854,18 @@ in with self; { 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"; sha256="0agqys52l8bb3mc3bpawym12phl5r1ymalfvgrq5w6n78lpzcxls"; depends=[httr jsonlite plyr readr]; }; rpql = derive2 { name="rpql"; version="0.7"; sha256="18llgwk1jfwf3y1dabpc508kfb1k4yh4cr4k76azkziv11arbh0c"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; - rprev = derive2 { name="rprev"; version="1.0.1"; sha256="03dbfxan43hly1s79x63nzviz6m1076ld2gan6cpwgvlik6s2bac"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; }; + rprev = derive2 { name="rprev"; version="1.0.2"; sha256="0gdragdnakq9476df116viw8nyv0iahsfm1a3insv01j8x1y5l8c"; 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]; }; rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; }; rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; }; - rpsftm = derive2 { name="rpsftm"; version="1.2.3"; sha256="1l0674jsi5ngazmbl13wm73xwxyqy4z6k7p0j46j6wcv84ljj7ss"; depends=[ggplot2 rootSolve survival]; }; + rpsftm = derive2 { name="rpsftm"; version="1.2.5"; sha256="1l8i1v4si5x6g8mn7n6vllfdywzcpmxik7mg91ig1dci9bgcd9ya"; depends=[ggplot2 rootSolve 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]; }; rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; }; rqPen = derive2 { name="rqPen"; version="2.0"; sha256="13m21v753njaramgpbhn0lb793b6946crv5v8vl127w38q0z3wyd"; depends=[quantreg regpro]; }; rqdatatable = derive2 { name="rqdatatable"; version="1.1.4"; sha256="1xcvbghn960vw8zj9191ag6mj4arlld1k4y6g8nal6dcynp9w6gy"; depends=[data_table rquery wrapr]; }; - rquery = derive2 { name="rquery"; version="1.3.1"; sha256="0gsnj8mg0kfipwnwkbgkzph5mv3fl61vxv4nr9hmdykvanamg9n7"; depends=[wrapr]; }; + rquery = derive2 { name="rquery"; version="1.3.2"; sha256="00an5j353rxygk0k6nx66xi49ac4xnfpdwskjikhgqzfxlv29w4b"; depends=[wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; rr2 = derive2 { name="rr2"; version="1.0.1"; sha256="07y0qs2x8gjvvp630vzqlsx9g0sz1qxvsayl6lqn91a7jkl08112"; depends=[ape lme4 Matrix nlme phylolm]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; }; @@ -11740,6 +11887,7 @@ in with self; { rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; }; rrpack = derive2 { name="rrpack"; version="0.1-7"; sha256="0svrw2ik59hjyfb0kag4nv8ilcaz7irmkp7ndbxxn0jg7dacb411"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; }; rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; }; + rrscale = derive2 { name="rrscale"; version="0.1.3"; sha256="0pf5pac883f1p6gidy2k1nrbrygi1va8r5h785449dhphx806bf5"; depends=[abind DEoptim doParallel foreach]; }; rrtable = derive2 { name="rrtable"; version="0.1.0"; sha256="1rvqb32fr63dkm5kz291pxzli8yi10k76v0lm1qdn28cx1l6ff3y"; depends=[devEMF editData flextable ggplot2 magrittr moonBook officer purrr readr rmarkdown rvg shiny stringr ztable]; }; rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; rsMove = derive2 { name="rsMove"; version="0.2.7"; sha256="0an5kknfap7hrg62gvdvrylx79p6fjdmbryhzlrj60i8n7cnc1c1"; depends=[caret ggplot2 lubridate plyr pryr raster Rcpp RCurl sp]; }; @@ -11758,7 +11906,7 @@ in with self; { rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; }; rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; }; rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; }; - rsimsum = derive2 { name="rsimsum"; version="0.5.0"; sha256="15aln30yq5w1vnfbrmvyp1bpmh3s46dhp44sg1v4nv65wchns9g0"; depends=[checkmate ggplot2 ggridges rlang]; }; + rsimsum = derive2 { name="rsimsum"; version="0.5.1"; sha256="1gk1zmd22jyhjn9fymax46p80y8na0gq8cr8m8lcqk2ybkmrl5mv"; depends=[checkmate ggplot2 ggridges rlang]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; }; rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; }; @@ -11780,7 +11928,7 @@ in with self; { rstiefel = derive2 { name="rstiefel"; version="1.0.0"; sha256="0g09fpp3432v78gqgn0hiva6zqr8yqn379wz4428wanmiskqr3f0"; depends=[]; }; rstpm2 = derive2 { name="rstpm2"; version="1.4.5"; sha256="0xdvv27cf3b45ahvlzbn8n0kmj4kyc7sl52xjr71757ymf154q3g"; depends=[bbmle fastGHQuad mgcv Rcpp RcppArmadillo survival]; }; rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; }; - rstudioapi = derive2 { name="rstudioapi"; version="0.9.0"; sha256="0gn1pvaxfh2gh2ikvxcr8f6k97ygcfr68iz6dhwlq4z71a1s4jai"; depends=[]; }; + rstudioapi = derive2 { name="rstudioapi"; version="0.10"; sha256="15mbw607ncdf53mgga76n3va5zzdcjqz14nb0jcn9axwccqamic0"; depends=[]; }; rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; }; rsunlight = derive2 { name="rsunlight"; version="0.7.0"; sha256="0v2wrgq8fxvkf8sf4z4wi4bbvbskw5wzcplns9imwfmm3y2pabyi"; depends=[crul data_table jsonlite plyr stringr tibble]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; @@ -11796,9 +11944,9 @@ in with self; { 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-13"; sha256="1gwvw98lnym305z9awjaximrmkl4kkki59blbwqs2js42iqcx2m3"; depends=[R_methodsS3 R_oo]; }; rtfbs = derive2 { name="rtfbs"; version="0.3.9"; sha256="02irj6c7nfgp42yb5zdmhbr5pi09xgx0z76d1ccfczjf0r1cyvfz"; depends=[rphast]; }; - rticles = derive2 { name="rticles"; version="0.6"; sha256="1rdjk5h9li55j3r7pj7q82z2y4phxqwybr3375dyajymd370gsys"; depends=[knitr rmarkdown tinytex xfun yaml]; }; + rticles = derive2 { name="rticles"; version="0.7"; sha256="11nvrl68pj6p8whhdal19a24dlzckxx0c56x807cbv7wwapn8gsz"; depends=[knitr rmarkdown tinytex xfun yaml]; }; rtide = derive2 { name="rtide"; version="0.0.5"; sha256="0ns79xkkl141bbns8zlvx3gf48k4a03qa21pjyhnhgkm9lsihwfc"; depends=[abind checkr lubridate]; }; - rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; }; + rtiff = derive2 { name="rtiff"; version="1.4.6"; sha256="09p4rki1z6zy79z9hb8pajglznnklr4hg7fcyrdxnqs1sjbw1iwy"; depends=[pixmap]; }; rtika = derive2 { name="rtika"; version="1.20"; sha256="0b38lia1r1inqxlbzkkvhgkgrbm1b3y9j9k518hv4qw98z542b32"; depends=[curl digest rappdirs sys]; }; rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; }; rtimicropem = derive2 { name="rtimicropem"; version="1.3"; sha256="1z7nrmzwdgz7fy2i23rl07jd39sdxqsdmmmkaaxzagj7whd58inj"; depends=[changepoint dplyr ggplot2 knitr lazyeval lubridate pathological R6 rbokeh readr stringr tibble tidyr]; }; @@ -11826,10 +11974,11 @@ in with self; { runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; }; runjags = derive2 { name="runjags"; version="2.0.4-2"; sha256="035sxmh0b0m6dwz8qbpsmw2p7ihkx3cxgkhj27i0j6dsjryl3x4p"; depends=[coda lattice]; }; runner = derive2 { name="runner"; version="0.2.0"; sha256="17scm3kvv4gklwfqwc8kjxa4ycdk0f7vxi8ixfy29lif9wlanmrw"; depends=[Rcpp]; }; + runstats = derive2 { name="runstats"; version="1.0.1"; sha256="05kaw3wkvr6csaa17ivib0hssh2c4nmmkqyba796zpixwmmmb7wq"; depends=[]; }; 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.6"; sha256="1qh7cf9h1v1fhh2cibrz5afdri6zhcdx0nv0d2y2i6mam0xljf6x"; depends=[Rcpp RcppArmadillo spatstat]; }; - ruta = derive2 { name="ruta"; version="1.0.2"; sha256="18r6vcjlxarwdc2gi1d1r5lq763nnvsy7ccq77lbl3cswx5s7x1q"; depends=[keras purrr]; }; + ruta = derive2 { name="ruta"; version="1.1.0"; sha256="1qr2ryz55h2j3wlwg0535lhmk2ydm0idfxl07rlfxq1pi32cjms1"; depends=[keras purrr R_utils]; }; ruv = derive2 { name="ruv"; version="0.9.7"; sha256="1ynxmax9sz74s8abmmizla6jas385mn5ij151mq35k0yv1xszzj5"; depends=[ggplot2 gridExtra scales]; }; rv = derive2 { name="rv"; version="2.3.3"; sha256="1h5lhy87v88b70a7pbq5xirskm6ih9fk90n6mzp1nmkr7w1d3zai"; depends=[]; }; rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; @@ -11839,13 +11988,13 @@ in with self; { rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; }; rvertnet = derive2 { name="rvertnet"; version="0.7.0"; sha256="01z3ij5z21v901hz4l9173r4pa9jz2nl7bx086ka1bxvcy0dgqgj"; depends=[crul dplyr ggplot2 jsonlite maps]; }; rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; }; - rvg = derive2 { name="rvg"; version="0.1.9"; sha256="0r2amwygazq1sff8fl0k618fxs2d5pxp5ryz7kqyjkcnxfghgnxf"; depends=[gdtools officer Rcpp xml2]; }; + rvg = derive2 { name="rvg"; version="0.2.0"; sha256="1zdcrkd8iinv5nraxpd31378q4qllm4ll75gaz2mysd6ybdln811"; depends=[gdtools officer Rcpp xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; rviewgraph = derive2 { name="rviewgraph"; version="1.2"; sha256="0qw1fdfwg2763a1k1qmryblw5rpagsi5p70rs7fj256zfcjvwrz8"; depends=[rJava]; }; rvinecopulib = derive2 { name="rvinecopulib"; version="0.3.0.1.1"; sha256="09zs1ckc5c0z4xg6h348v8nig37b400mkwsa0z4hn7rrhjf5i3gf"; depends=[assertthat BH cctools kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; rwalkr = derive2 { name="rwalkr"; version="0.4.0"; sha256="01ia1wkmbigly45kyc1ydrah0yzxlymsnj3vy6wf8ck24lv51dif"; depends=[dplyr httr tidyr]; }; rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; - rwavelet = derive2 { name="rwavelet"; version="0.1.0"; sha256="15shy8v659r3qnx32hrq6zn5fwinwg6aiys71f45k0s9jhj973ki"; depends=[dplyr signal]; }; + rwavelet = derive2 { name="rwavelet"; version="0.4.0"; sha256="0wb3kd97inyh985q1hspnzwxfawfdps43r3zzdpw0jd8sgd7zqxp"; depends=[signal]; }; rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; @@ -11862,7 +12011,7 @@ in with self; { rzmq = derive2 { name="rzmq"; version="0.9.6"; sha256="05j34fwwqlzq9nfkaafl39aqc0nvljf22pndqhj151gpnrpgr8w0"; depends=[]; }; s2 = derive2 { name="s2"; version="0.4-0"; sha256="1mpivllq3r3kn7msb7qn9h8fr31jl5cvfg1pdq1wi69k4bznd8y0"; depends=[Rcpp]; }; s20x = derive2 { name="s20x"; version="3.1-27"; sha256="021f9l34svx42mnzi080rr44sxz9zjvcnxljakcag02r4hl52pcp"; depends=[]; }; - s2dverification = derive2 { name="s2dverification"; version="2.8.0"; sha256="13cjzxrjwahjhdw5q8lpbwgywgswqrcnj7rkff9kraan9lj83bkk"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; + s2dverification = derive2 { name="s2dverification"; version="2.8.5"; sha256="1y4sj5dkjr9kx3m0iwxpsrq7x1rqjfrz2wxbngk1a6qnxyk52aim"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; }; sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; }; sBF = derive2 { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; }; @@ -11884,7 +12033,7 @@ in with self; { sae = derive2 { name="sae"; version="1.2"; sha256="1fai9lkyyssnkkdrjrrx7vzj88nglmd4bkzan3hdhrc49abclp59"; depends=[lme4 MASS]; }; sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[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.9.0"; sha256="19l41qpwspccphmgxi20p7f473lxxh8d86b0wyy5jq24phhd8awx"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; + saeSim = derive2 { name="saeSim"; version="0.10.0"; sha256="0nh8x2v0g8i0rjq4s5q0ayhyxhl5p0126plmd4vnnhaifm6pn0q3"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; saemix = derive2 { name="saemix"; version="2.2"; sha256="1gp9xww9q3cq9dr6nifp4wlyg9gmamab845py1ag07vnr2gfwx5c"; depends=[]; }; saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; @@ -11908,12 +12057,14 @@ in with self; { 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]; }; sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; }; - sandwich = derive2 { name="sandwich"; version="2.5-0"; sha256="168kq5kk34xbhfsxsanard9zriyp6cw0s09ralzb57kk42pl9hbc"; depends=[zoo]; }; + sandwich = derive2 { name="sandwich"; version="2.5-1"; sha256="1mk685b9wq7k566pbml52rj96i5h6b3vf215k9picgmq296nzvyv"; depends=[zoo]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; }; sanon = derive2 { name="sanon"; version="1.5"; sha256="1iikm7ivlz87kbq0ax9r1dz29zdq1kmhxd2imzc4hkvr1rwgciv6"; depends=[]; }; santaR = derive2 { name="santaR"; version="1.0"; sha256="10g4z951mpxw9d21s5f6zwfch5xs9vx812fb0wyrbw9s8drmlbkh"; depends=[doParallel foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny shinythemes]; }; + saotd = derive2 { name="saotd"; version="0.2.0"; sha256="1rhkhsnmh3nf7y0x5sl3mmr5mismz8m92gj0v12niysalcywiarh"; depends=[dplyr ggplot2 ggraph igraph ldatuning lubridate magrittr maps plyr purrr reshape2 scales stringr tidyr tidytext topicmodels twitteR widyr]; }; sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; }; + sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.0.6"; sha256="1ilksk1rqs98gavdpm10g6gbz7dn0h3fzz1hzd8hzkvmwfgcvmcf"; depends=[dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tibbletime tidyr]; }; sarima = derive2 { name="sarima"; version="0.7.6"; sha256="1x0qxvq2sax8c2x3max4ghhdrxcyji92vdz4bg5jkpakrn4ilm8a"; depends=[FitAR FitARMA Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; sars = derive2 { name="sars"; version="1.1.1"; sha256="03kik3fl56p5z182bh1irs55q77a9n17in632nszms5n4sz3zy9g"; depends=[cli crayon dplyr nortest numDeriv]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; @@ -11934,7 +12085,7 @@ in with self; { sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; }; sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; }; sbtools = derive2 { name="sbtools"; version="1.1.6"; sha256="1wvd7xbkfyx88bi1vz30c6jb20fgsrcgpvkw4g4ym0966vhv1ca1"; depends=[curl httr jsonlite stringr]; }; - scBio = derive2 { name="scBio"; version="0.1.2"; sha256="01yqfqddgak0iaysphsf08mbkqbgbpr0gsyvkj3hpyj7kk1937h4"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; }; + scBio = derive2 { name="scBio"; version="0.1.4"; sha256="0m4lkwr22idaksxkri322vhh7831h1jdpvv81v3504pxhyg4c93g"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; }; 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]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; @@ -11973,7 +12124,7 @@ in with self; { scoper = derive2 { name="scoper"; version="0.1.0"; sha256="1a170x1h2wglsmqp0fjga2q29yfnfdbgjcm62412n575j9d4xp5n"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval shazam stringi]; }; 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.2.3"; sha256="1fhs3css56razkl2xix464z5fsbjhfkiqnmd016yn9r4pmgmyqk2"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; }; + scorecard = derive2 { name="scorecard"; version="0.2.4"; sha256="0vc8484d3d933kddg37hbql5l6h7kpfl6iqi4irwy1vq63xf2126"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.0.9"; sha256="1hnz9dgx5fxbhh54psalrr50n22vc250v2xxxl49j09q26xh37kl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; }; @@ -12013,7 +12164,7 @@ in with self; { sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; sdwd = derive2 { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; }; seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; }; - seacarb = derive2 { name="seacarb"; version="3.2.11"; sha256="0ad9v8p9xfyv2z2ix8zv98w5pqjbdrrknw68ndc3i817r7pygcz6"; depends=[gsw oce]; }; + seacarb = derive2 { name="seacarb"; version="3.2.12"; sha256="1gb7ma2qpw8vnwfblwhalagar1cjqfd4la61bw652kk28v98y9bs"; depends=[gsw oce]; }; sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; }; searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; @@ -12034,7 +12185,7 @@ in with self; { seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; }; seedwater = derive2 { name="seedwater"; version="1.0"; sha256="0qqhjax16lnyriv6q9n89g93bs1zy8xwx9jp0xbilba7djzjh33g"; depends=[rpanel tkrplot]; }; seedy = derive2 { name="seedy"; version="1.3"; sha256="1a21sl8i7z12cjaqj08lkq3viazxlgxv82vaarm58fgbpsvdi0m0"; depends=[]; }; - seewave = derive2 { name="seewave"; version="2.1.0"; sha256="0i0zhvgl64fwpabnwvfdxndmw5whhh2fd4lhpg399w4rzrwzv92y"; depends=[tuneR]; }; + seewave = derive2 { name="seewave"; version="2.1.3"; sha256="0mi5pqgf0x3lfhdhqmjrp04rb4c0vffi068kdalvywjkkprnqygi"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-5"; sha256="0q1k3zh29pkxx2sq28dw1vn4nmdv7pa8pw48vmywfcm4vmqnx7xg"; depends=[sp splancs]; }; segMGarch = derive2 { name="segMGarch"; version="1.2"; sha256="0chw41h25jka9wa3rf3d8dq2ym47379jflv33q6qxaak8xy1kmd9"; depends=[corpcor doParallel fGarch foreach iterators mvtnorm Rcpp RcppArmadillo]; }; segclust2d = derive2 { name="segclust2d"; version="0.2.0"; sha256="1n5h92dza7wgfpfyzlfb7hbrqb0a8dhc38vml9645gym3a1riwn5"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; }; @@ -12058,7 +12209,7 @@ in with self; { selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; sem = derive2 { name="sem"; version="3.1-9"; sha256="1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa"; depends=[boot MASS matrixcalc mi]; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; - semPlot = derive2 { name="semPlot"; version="1.1"; sha256="0fzz580an7mmq6vycxbcvfdqbii0qz0nghlidb6in05j8dppsnsn"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem semTools XML]; }; + semPlot = derive2 { name="semPlot"; version="1.1.1"; sha256="1xbq5rbajfpfdsi1hw3spmbri9sn87034k8vxb6nvjxsr2gkivw2"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem semTools XML]; }; semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; }; semTools = derive2 { name="semTools"; version="0.5-1"; sha256="0lh10yw888hcj1mdl96p5pw8gi0a1dj8panclghry6b8xaa3w7ni"; depends=[lavaan]; }; semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.1"; sha256="0fd5qnw5jcmf5akkv59z1zjizsczwlmnpkfd8bfminhpa89sgp1y"; depends=[shiny shiny_semantic]; }; @@ -12066,7 +12217,7 @@ in with self; { 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]; }; semiArtificial = derive2 { name="semiArtificial"; version="2.2.5"; sha256="1m8kwjhqjpqjzz22caiwpb4nb70d8y0ssf9j4rfyyh530x2q2k1m"; depends=[cluster CORElearn flexclust fpc ks logspline MASS mcclust nnet robustbase RSNNS StatMatch timeDate]; }; - seminr = derive2 { name="seminr"; version="0.5.3"; sha256="18yd2pcp4msy6w4gpj5znid4gygh1hg2794lhsjqxvyz36hb3i5p"; depends=[]; }; + seminr = derive2 { name="seminr"; version="0.6.0"; sha256="1c68n7q2a1s63fdnws33j9rvnp5n6nyd1q3wmmdia8a3z7qp2k8g"; depends=[]; }; semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; }; semtree = derive2 { name="semtree"; version="0.9.13"; sha256="0am7fm7f9kgq6kmd17axrswlg191ny3pq6b5sf731diz1ghyncmp"; depends=[bitops cluster digest OpenMx plotrix rpart rpart_plot sets stringr]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; @@ -12083,11 +12234,11 @@ in with self; { sensitivitymv = derive2 { name="sensitivitymv"; version="1.4.3"; sha256="1ga8mf92niiv1z3g3kv5ha5xdd1089aaqp19dz68kv8a396vhy1j"; depends=[]; }; sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; sensmediation = derive2 { name="sensmediation"; version="0.2.0"; sha256="0x8wa1gmnhnsq8asdjfklb34ghk9jvqlmpw29cpvhvlhvl5x7fr3"; depends=[maxLik mvtnorm]; }; - sensobol = derive2 { name="sensobol"; version="0.1.0"; sha256="0d60nfgiqmm4szrx3adjwqm5pksg62g3mhifny0x9g1mdj76010w"; depends=[boot data_table ggplot2 magrittr randtoolbox Rdpack rlang scales stringr]; }; + sensobol = derive2 { name="sensobol"; version="0.1.1"; sha256="0nl95kfrx9c99zjmlxgk2mlk98zb0jhhm5c7ij8qfcx5p55bq8j9"; depends=[boot data_table ggplot2 magrittr randtoolbox Rdpack rlang scales stringr]; }; sensors4plumes = derive2 { name="sensors4plumes"; version="0.9.3"; sha256="1r9sddnlxpjck7rhm2w7z8jak7wmrxg3d62dydc5dqcqhgp54r6p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; }; sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; }; senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; }; - sentimentr = derive2 { name="sentimentr"; version="2.6.1"; sha256="1xwi3rjyhx3w042r2g4a8rzqr2svam7fdx2ivc9vyhj9y81az7fh"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; }; + sentimentr = derive2 { name="sentimentr"; version="2.7.1"; sha256="13myh7w9pynmgvqspsxpnj8mz8jz8nwkwjyax4hahvwb9707hf2s"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; }; sentometrics = derive2 { name="sentometrics"; version="0.5.6"; sha256="073xhygj833a8k249kw5sbg7jmmcs9k4fsva88say5xhkbq62yqr"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; }; separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; }; seplyr = derive2 { name="seplyr"; version="0.8.3"; sha256="1v4rr7v1hsrn15r4cbqd6ym9j9aiwnkmcix585fj3d4vfy1jklh5"; depends=[dplyr rlang tidyr wrapr]; }; @@ -12150,14 +12301,14 @@ in with self; { shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; shapes = derive2 { name="shapes"; version="1.2.4"; sha256="1zqykhx8rz1k2ahi2lmmzll1c8k0as6vw4gbd3rpfb5fvpni3ni0"; depends=[MASS minpack_lm rgl scatterplot3d]; }; shapper = derive2 { name="shapper"; version="0.1.0"; sha256="04ncsq29fbiki1s83gh2gla1a7qb8kh0gp5267in3fhh62297xwp"; depends=[ggplot2 reticulate]; }; - shar = derive2 { name="shar"; version="0.2"; sha256="14dh73q1208r51j8gn5n35hawmphz8fahdwnjry47npixqvjaj43"; depends=[classInt raster spatstat]; }; + shar = derive2 { name="shar"; version="0.3"; sha256="0wyx8dvpjx841bsvlcr3sqbqdc08p88nmaiqpmf4q29pj57cmpmf"; depends=[classInt raster Rcpp spatstat]; }; sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; }; sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; }; sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; shazam = derive2 { name="shazam"; version="0.1.11"; sha256="0j6b7cbfvqz0xdcbyfx0abfklnv7yvjaalx2l3863m81qn877d65"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; }; shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; - shiftR = derive2 { name="shiftR"; version="1.4"; sha256="12mb4b5zhiq7hfkpc9hgi004hqli1kkkzdy2169svwrjv7bfifrn"; depends=[]; }; + shiftR = derive2 { name="shiftR"; version="1.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; }; shiny = derive2 { name="shiny"; version="1.2.0"; sha256="1wb68vjzclblq5fnhyfxr7n585za3dy4wnxryva0k43fxgyq9kpy"; depends=[crayon digest htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; }; shiny_i18n = derive2 { name="shiny.i18n"; version="0.1.0"; sha256="15llwr4yrx6rlk32b92wcq3dn360y5cvy4mh2aqkza9ikcvlhcvv"; depends=[jsonlite yaml]; }; shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; }; @@ -12177,7 +12328,7 @@ in with self; { shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; shinyTime = derive2 { name="shinyTime"; version="0.2.1"; sha256="0gpa6kypchvvlq71nnlilciclcrhaa488prjz46sddrsxjy09mp7"; depends=[htmltools shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.6"; sha256="1rw6nwvjsmzfj5fprvg0fasfq079pmdid6vv6rj11wvy7rf40y6j"; depends=[jsonlite shiny]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.5"; sha256="18b8lbpl0s7xn616603yy7r1qzd2wkrqnb92vlm2ylbb5a1x0a1m"; depends=[htmltools jsonlite scales shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.8"; sha256="1s4j3w9h843n7x7jkibc29kz9dqgc9dy861470mrc47wmhnbibz2"; depends=[htmltools jsonlite scales shiny]; }; shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; }; shinyalert = derive2 { name="shinyalert"; version="1.0"; sha256="0ngmpbzw6fw1gs6sv9m3xv2c9bmrxg0bs6lnvxn8hm8cwr4440xi"; depends=[digest shiny]; }; shinyanimate = derive2 { name="shinyanimate"; version="0.3.0"; sha256="0vshid5mfq006cprjj61d0g7ajyc3plc66x55c5jjmijwbp6pw7a"; depends=[shiny]; }; @@ -12187,6 +12338,7 @@ in with self; { shinydashboard = derive2 { name="shinydashboard"; version="0.7.1"; sha256="0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i"; depends=[htmltools promises shiny]; }; shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="0.6.0"; sha256="01yfijdh6ynxzd45bidywvdk0rlx7fzfzq5pbapbvknb7sbasi0y"; depends=[htmltools shiny shinydashboard]; }; shinyhelper = derive2 { name="shinyhelper"; version="0.3.1"; sha256="1z3wb3vdpz9pcn6rfmpbxky05cf8bxldhpwzldrmhn03spz3n987"; depends=[markdown shiny]; }; + shinyhttr = derive2 { name="shinyhttr"; version="1.0.0"; sha256="1l02g0qgvycwpfr6wl7svnms128fhlzbn9p7i4mr7ghgsd5qr58a"; depends=[shinyWidgets]; }; shinyjqui = derive2 { name="shinyjqui"; version="0.3.2"; sha256="1a73vsq1wc3xf14y64hkgnk5jgxj98b8aj3g0fs7mgayar3an5g0"; depends=[htmltools htmlwidgets jsonlite shiny]; }; shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; }; shinymaterial = derive2 { name="shinymaterial"; version="0.5.5"; sha256="0wbi2ccnxjyq4y5xijvn0a38sv56s9cab0c8k86cv5gapyzdzs7x"; depends=[jsonlite shiny]; }; @@ -12195,6 +12347,7 @@ in with self; { shinytest = derive2 { name="shinytest"; version="1.3.0"; sha256="0xgsbw72jpyjw0shg6vb8cxxw3948xhbl2sjx0d376fy2jb1rh43"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch 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]; }; + shipunov = derive2 { name="shipunov"; version="1.0"; sha256="197gkyydvsxsrpizmz6v85wk16lhgdxdbq51870anmgp3r40v49m"; depends=[]; }; shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; }; shotGroups = derive2 { name="shotGroups"; version="0.7.4"; sha256="1x2ar8ybb972nd146gqz57hxybxc1myx862wbb743rpa70c7iawc"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; @@ -12225,7 +12378,7 @@ in with self; { signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; sigora = derive2 { name="sigora"; version="3.0.1"; sha256="1pz9jibxjvvbc0wmd7sj2fss6hd8h1fvcg8vg72qwqvfy3f9jdry"; depends=[]; }; sigr = derive2 { name="sigr"; version="1.0.5"; sha256="0i7nah32x0llbkkfcdv355507vc8w0dw3kl2hz37xj3fxcpz9218"; depends=[wrapr]; }; - siland = derive2 { name="siland"; version="1.0"; sha256="0zqwslg0vak22q475azwank81wr4kfx33h21w84lsg7iihrb08nv"; depends=[lme4 raster rgdal sp]; }; + siland = derive2 { name="siland"; version="1.2"; sha256="1njn5a4gr4rpf8xwbfvxiyg7h64pfzxijakn9sbhb1agspn5z1zz"; depends=[ggforce ggplot2 lme4 raster rgdal sp]; }; sim1000G = derive2 { name="sim1000G"; version="1.39"; sha256="1qxl7lsdsd4skn6x8iw7jx60ly0rwsj27yh5yiqmhxa34jpyjg0m"; depends=[hapsim MASS readr stringr]; }; simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; }; simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; }; @@ -12237,10 +12390,11 @@ in with self; { simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; simPop = derive2 { name="simPop"; version="1.1.1"; sha256="10dsr1rbglv5kwm5q05dxv4396wxwzhlf0851ynndlcbyxl8rvc0"; 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]; }; + simTool = derive2 { name="simTool"; version="1.1.3"; sha256="1vjl2hf6nw108vidbrc6hxsl6qdkr56ahldavx2s9klkqg2kmhwr"; depends=[dplyr plyr purrr reshape tibble tidyr]; }; 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]; }; simcausal = derive2 { name="simcausal"; version="0.5.5"; sha256="0k1dbg10bmpxc37nq9vk849qsdi09whc8r85rj08pbcfaac8cgfv"; depends=[assertthat data_table igraph Matrix R6 stringr]; }; - simcdm = derive2 { name="simcdm"; version="0.1.0"; sha256="14icp5wwqrjds3qdhm602fds54i5x6vq2mj7r89nllak1kh5gqmw"; depends=[Rcpp RcppArmadillo]; }; + simcdm = derive2 { name="simcdm"; version="0.1.1"; sha256="1qzxxpz3nvqf9801k6zgphv6vd8alf2sf6cvzggk7cz6x5jc3w1r"; depends=[Rcpp RcppArmadillo]; }; simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; }; simdistr = derive2 { name="simdistr"; version="1.0.0"; sha256="0r7qfrq4vcjqrzajc6xmn0rrkinqwbr8cqghgp4iklbhsjbk2xfl"; depends=[]; }; simecol = derive2 { name="simecol"; version="0.8-12"; sha256="06zw9xhj8jwhmqwxxbj8hgz9cxrw1b4syy6z79aawv9cg1bnwfhf"; depends=[deSolve minqa]; }; @@ -12248,9 +12402,9 @@ in with self; { simex = derive2 { name="simex"; version="1.7"; sha256="0dmyxhg3bk23y08xbgwlg791pcl3131im3jkh9x5pjqczfjvim0a"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; }; simglm = derive2 { name="simglm"; version="0.7.2"; sha256="1dg44fkrayhpwz63ga77jbkadghcldqggwc4jcrmfwzwbwbz5sr0"; depends=[broom dplyr Matrix purrr rlang]; }; - simmer = derive2 { name="simmer"; version="4.2.1"; sha256="19nsj93mh8hbfdc7z0gd06ydljn7yyn3fz5d6jz8pdvd1sy99z58"; depends=[BH codetools magrittr R6 Rcpp]; }; + simmer = derive2 { name="simmer"; version="4.2.2"; sha256="0anzg70cqaixd32j14ry028hxhkazzj6k3pb9v9j2jpd4wlizdyp"; depends=[BH codetools magrittr R6 Rcpp]; }; simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.1"; sha256="1s73mfmpjz91n932kjk50aai5j3p1sjibq73yxrjdhlyhiy4d8lp"; depends=[simmer]; }; - simmer_plot = derive2 { name="simmer.plot"; version="0.1.14"; sha256="0w72064h8s6b2fhz5nv3i6c86wvcxfvhybb96vh5ykr1xkqpybbh"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; + simmer_plot = derive2 { name="simmer.plot"; version="0.1.15"; sha256="0g13d6qw6cl7bzmpkckiswvg9n4mrrdbs195r3pyljaw5c5bmvhp"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; simmr = derive2 { name="simmr"; version="0.3"; sha256="18ycrd7qbz7frvd3bgbqaaapslw1jw89fy3np5qyb9sswyk08w9m"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags viridis]; }; simode = derive2 { name="simode"; version="1.1.2"; sha256="1jxds57rpk629ar7kcpwzc33wkrznk2dkq9j9dqc97l6yw2h7aaa"; depends=[deSolve pracma quadprog]; }; simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; }; @@ -12263,7 +12417,7 @@ in with self; { simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; }; simputation = derive2 { name="simputation"; version="0.2.2"; sha256="0bn5pq3gbsjc7sdivki98k9cb0sp5wkpm0bwi4mdnvpd7r2psb1n"; depends=[gower MASS rpart]; }; simr = derive2 { name="simr"; version="1.0.5"; sha256="1j5w93iliykfnpxl9kzh1rp6d3iy26ksj3j7yjl348yvplh0iyjl"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; }; - simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; }; + simrel = derive2 { name="simrel"; version="2.0"; sha256="1wshbnmq9yqh01f9mjvfhhr3d76dshkxmqchxk11v4yx4apd8b4z"; 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-14"; sha256="1sg1zmngpviqpbsy8kxnw4f4x93gy3gh02ykmcw8j9falfnd7g6i"; depends=[lavaan]; }; simstandard = derive2 { name="simstandard"; version="0.3.0"; sha256="0fg5y6n5ydn6qxbd5sdbxh3aqj4i7qk7h9c28i3s5z4s9rxgycdj"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; }; @@ -12277,12 +12431,13 @@ in with self; { sindyr = derive2 { name="sindyr"; version="0.2.1"; sha256="0977qb9f2247y6bzlsp9lqfbmncq2prqr57myrgd6f60jc09n3mj"; depends=[arrangements crqa igraph matrixStats pracma]; }; sinew = derive2 { name="sinew"; version="0.3.8"; sha256="1ggx7wgmgnsv69nnc55mg9g7rzjv5m23sygz7x8q68pybmjr7fc1"; depends=[cli crayon miniUI rematch2 rstudioapi shiny sos stringi yaml]; }; sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; - siplab = derive2 { name="siplab"; version="1.3"; sha256="1wl7i8i24mwmndkfjbk38kn49x4hrcs52sq1hfw8crqa20knaf12"; depends=[spatstat]; }; + sinx = derive2 { name="sinx"; version="0.0.5"; sha256="1g1mddy7xw0vf010ysn6i54i0xchsamyn23z11c85j9am59siinj"; depends=[bookdownplus cowsay jsonlite pagedown xaringan]; }; + siplab = derive2 { name="siplab"; version="1.4"; sha256="1kayskawq9dqwwmk17akl68xw9kwllkmh4i251gdqkfcz61j3bb4"; depends=[spatstat]; }; sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; }; - sirt = derive2 { name="sirt"; version="3.2-39"; sha256="0m82rvz24lk6xdx0sf02ns42qni53b6crxm8aapi5p8zk95k1jvz"; depends=[CDM coda lavaan lavaan_survey MASS mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; }; + sirt = derive2 { name="sirt"; version="3.3-26"; sha256="16q2aw9ld1cx7m4l60dbmiyqkgx5m42yl6vbg21s18g5kfmypjpk"; depends=[CDM coda lavaan MASS mirt mvtnorm Rcpp RcppArmadillo TAM]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; - sitar = derive2 { name="sitar"; version="1.1.0"; sha256="1a2x6igzq0i1vac54xyiq14vzx0m20431nv7aw0anv0lss7xy6r8"; depends=[dplyr nlme quantreg rlang tibble]; }; + sitar = derive2 { name="sitar"; version="1.1.1"; sha256="1klnfp54sq0jgsyaha6k4i5fv313icjmri5khfsdg1q1zzqxw1f8"; depends=[dplyr glue nlme purrr quantreg rlang rsample tibble tidyr]; }; 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-4"; sha256="0ypn9y1kighvh17yj1v83dkj973vqgzbr5lmkl761lam3m1fglq0"; depends=[data_table lattice latticeExtra]; }; @@ -12291,9 +12446,9 @@ in with self; { sizeMat = derive2 { name="sizeMat"; version="1.0.0"; sha256="05dw4hgpw5msgy5cabf5dixr6ma66i9wz9wlajihqkpbg134jz1k"; depends=[MASS matrixStats mcmc MCMCpack]; }; sjPlot = derive2 { name="sjPlot"; version="2.6.2"; sha256="0x9pbchmz4qf4c9bi52dhhgv1phfj03q1hnxic8vndl6xwib63cy"; depends=[broom dplyr forcats ggeffects ggplot2 glmmTMB knitr lme4 magrittr MASS modelr nlme psych 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.0.16"; sha256="1zi1ncna16zl9hcy7mzara4kjxqkgwcw9ncp388ss353wwc9y2nc"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase]; }; - sjmisc = derive2 { name="sjmisc"; version="2.7.7"; sha256="0xm9pmq17maivmjsygwx3bdjd71hf829qbx735hyxa69z9dhp24q"; depends=[broom crayon dplyr haven magrittr purrr rlang sjlabelled stringdist stringr tidyr]; }; - sjstats = derive2 { name="sjstats"; version="0.17.3"; sha256="02na2pzxp88yp52h7vs959fgydiddmns39m9x4i0vz8fp016bdf8"; depends=[bayesplot broom coin crayon dplyr emmeans glmmTMB lme4 magrittr MASS Matrix modelr nlme purrr pwr rlang sjlabelled sjmisc tidyr]; }; + sjlabelled = derive2 { name="sjlabelled"; version="1.0.17"; sha256="00c0c22ynpihgf2bvmcfnkvqwqvxax2zzb7wldsmg2f7z5a32aa6"; depends=[dplyr haven insight magrittr purrr rlang]; }; + sjmisc = derive2 { name="sjmisc"; version="2.7.9"; sha256="11iiap0w5v0dszgwx4pi3j1zf9vnlw1ml1wjvq1hg9iz1plgbfnc"; depends=[dplyr haven magrittr purrr rlang sjlabelled]; }; + sjstats = derive2 { name="sjstats"; version="0.17.4"; sha256="012hp9m17xzjnsfvjjz2wdfgxm3irsrfx0zmahfnfmgdrwxd5vk5"; depends=[broom dplyr emmeans insight lme4 magrittr MASS Matrix modelr purrr rlang sjlabelled sjmisc tidyr]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skeleSim = derive2 { name="skeleSim"; version="0.9.8"; sha256="1wxdl30cy8vr1cd0wcjxyklp6crw4bv8r77ma2dkzmxm2ma5jw92"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; }; skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; }; @@ -12311,13 +12466,15 @@ in with self; { sld = derive2 { name="sld"; version="0.3.2"; sha256="0za5pw7ki419ni9pqqzddb10d16nvv5rh5jrkl4f77j0ps2ajylp"; 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.1.0"; sha256="1vfvpxzq16dmh6qrh7kwbndyfnr209frdz5hck3ry4gfz9rqzm5f"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; slfm = derive2 { name="slfm"; version="0.2.2"; sha256="01n9y6kyl7z1ynckp2hkrv2yl9jf30zcbbi3sx9jrcha557fg1cf"; depends=[coda lattice Rcpp RcppArmadillo]; }; slickR = derive2 { name="slickR"; version="0.2.4"; sha256="14y4rwa450xqw6prdgp2l7xs9vv6zqbxwg7hc3hjgq47jy8qsdm1"; depends=[base64enc htmltools htmlwidgets xml2]; }; 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.0"; sha256="0lpfygv9jf4a5zvydwjbbdx6wj5fn08bdddg7yl302q44d4kx7g6"; depends=[png purrr raster]; }; sloop = derive2 { name="sloop"; version="1.0.1"; sha256="00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j"; depends=[codetools crayon purrr rlang tibble]; }; - slouch = derive2 { name="slouch"; version="2.1.1"; sha256="1pzvlbqyby12m0pfspbih222mbhdcgmians8khd3yj9570djxqa7"; depends=[ape memoise]; }; + slouch = derive2 { name="slouch"; version="2.1.2"; sha256="0xf2saf4q0ywmng3avl6hjd2wjjzfpbwlnagggvs8ri41jyk7gma"; depends=[ape 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]; }; sm = derive2 { name="sm"; version="2.2-5.6"; sha256="0c4whcx879gb4lwvqnzxl5n9xgpcqh2c54ip9ami3mwfprzcv45q"; depends=[]; }; @@ -12333,8 +12490,8 @@ in with self; { smartdata = derive2 { name="smartdata"; version="1.0.2"; sha256="1j1ngvlaj0kx0kp8ffvndcd5kk8zamjrgx2dn156zp4zjsd27vhv"; 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]; }; smartsizer = derive2 { name="smartsizer"; version="1.0.1"; sha256="0m474f6dz0izwdh2xvgx6shsbkpr969ckcld56d7c589kjhapbrl"; depends=[MASS]; }; smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; }; - smbinning = derive2 { name="smbinning"; version="0.8"; sha256="0fw4hxd5vr5h7lp7hj6xz06m1rdm74p46n15q6vyw7ywhpngrl6s"; depends=[Formula gsubfn partykit sqldf]; }; - smcfcs = derive2 { name="smcfcs"; version="1.3.1"; sha256="0f3sd4pz46wjpyw932qrxw4hr3fmdbjrhcrgfmvm89hp0r09vz74"; depends=[MASS survival VGAM]; }; + smbinning = derive2 { name="smbinning"; version="0.9"; sha256="1sr0nsqqzxdf402g9qx1ycigbh330idl9n2cyli4x4zxj1nqm3yv"; depends=[Formula gsubfn partykit sqldf]; }; + smcfcs = derive2 { name="smcfcs"; version="1.4.0"; sha256="0dlk2i2g8scbqy573drpf5252g0aa2i1v63172jswjmy5hl28byf"; depends=[MASS survival VGAM]; }; smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; }; @@ -12371,7 +12528,7 @@ in with self; { snem = derive2 { name="snem"; version="0.1.0"; sha256="1267i8fvj1830dkh7k4j07llgv7rq983mfw9r5j9s22vgyf2sk76"; depends=[mvtnorm]; }; snfa = derive2 { name="snfa"; version="0.0.1"; sha256="01k2nw8b8mwsd07jijfqk3rj88l9m36c5jai7qma56fjxx23s3wb"; depends=[abind ggplot2 prodlim quadprog Rdpack rootSolve]; }; snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; }; - snipEM = derive2 { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; }; + 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.1"; sha256="04kazyq5hhiznh0g1qd5l6yh82kjkvd1n4hslisdwas2v3wr2h82"; depends=[httr magrittr memoise RSelenium rvest shiny wdman xml2]; }; @@ -12417,7 +12574,7 @@ in with self; { 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="3.8"; sha256="1x4hp1hlngi3gcn7gr16qd9lzsmv4j611sx8254z06fgw3gxlwd4"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; + sommer = derive2 { name="sommer"; version="3.9.3"; sha256="0ylwck1w1nw43f12gcfminx4b6sz6xwmywddbpi7lf44ickqm14m"; 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=[]; }; @@ -12433,7 +12590,7 @@ in with self; { sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; - soundgen = derive2 { name="soundgen"; version="1.3.2"; sha256="007i8fm39gb6x1yakbf8g5l2dm08fgjh9dfxly4zdk1ih1h5b4zk"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="1.4.0"; sha256="1qaidf5acb78bjk4jak939d48cxm81hp2h393ks9x4wdqvwpyi3z"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; }; sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; }; @@ -12451,7 +12608,7 @@ in with self; { spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; }; spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; }; spTest = derive2 { name="spTest"; version="0.2.5"; sha256="11x2wq3031mqbj4n6hvb4l3sp4382qankdl1v1qh7ab2xa0h6xw8"; depends=[geoR sp]; }; - spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; }; + spThin = derive2 { name="spThin"; version="0.1.0.1"; sha256="1cj859q0i5ldqvndky2jwr5jwnpgj01mfqkw8hb8pibpwaknmy7y"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.3"; sha256="0vzqig9dq4k6p5s2gbm5arqiih28ghzjx0fs7ml70vx2f181jrxi"; depends=[coda extraDistr sp spacetime]; }; spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; spaMM = derive2 { name="spaMM"; version="2.6.1"; sha256="0dlrac9fk6hav9b6xa6i0krim7q31piz58y3zc96xsn60gbskprj"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; }; @@ -12485,8 +12642,9 @@ in with self; { 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]; }; + 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]; }; - sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; }; + 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.2.2"; sha256="12143qij3p8vry9i02i52nj00m1ckkwg2rq99dq00dq43axcpvgw"; depends=[data_table MASS Matrix mgcv refund]; }; sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.4"; sha256="1vm853x5vvk745mm68wx0bkimmgwnbrdhj2rwy1nmgpk1lzi8vq6"; depends=[Matrix Rcpp RcppEigen]; }; @@ -12521,12 +12679,13 @@ in with self; { spatialkernel = derive2 { name="spatialkernel"; version="0.4-23"; sha256="0kvhirh7afk2gfy21pa6117yk6kzbaf2dxfkr1ax3b554rnrv4p0"; depends=[spatstat]; }; 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]; }; + spatialreg = derive2 { name="spatialreg"; version="1.1-3"; sha256="1004rz4x34i0nmm46ac2vq7ddxp31cvbbdhd79jd49z4vzycs2bn"; depends=[boot coda expm gmodels LearnBayes MASS Matrix nlme spData spdep]; }; spatialrisk = derive2 { name="spatialrisk"; version="0.5.1"; sha256="0625416qjlx3d2h5n54933qnqkca8fjlamr3g67yl3287466wkwv"; depends=[Rcpp RcppProgress]; }; - spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; }; + spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="1.3.1"; sha256="139m6jaw6f5gglwqrd4f5mzr4vkqk2r1a069971y7ap2klzzbhns"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; }; spatialwidget = derive2 { name="spatialwidget"; version="0.2"; sha256="105pgsv4dq3pmk9bylb3fxzvp44frfp6xcvq5d01ja4gnwmb35p2"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp]; }; - spatsoc = derive2 { name="spatsoc"; version="0.1.6"; sha256="0ng4daf4kj50wfqvs2pzp3kb10mmm73f6mdi0dkah0wl9r2qxi8p"; depends=[adehabitatHR data_table igraph rgeos sp]; }; - spatstat = derive2 { name="spatstat"; version="1.58-2"; sha256="1fjg9dlxkp99z6vpv0y7prnvwjajb7gyjff7m745dvqaj72hd292"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; + spatsoc = derive2 { name="spatsoc"; version="0.1.8"; sha256="0zkmag51a0gg8c88yffkmsivfii0iqq3dvf5wi4gisgmkicyl2zv"; depends=[adehabitatHR data_table igraph rgeos sp]; }; + spatstat = derive2 { name="spatstat"; version="1.59-0"; sha256="03a7z4ya7f9m46h617a909i7crwb8nay7w3l7i3nlq1zd7rqb157"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; spatstat_data = derive2 { name="spatstat.data"; version="1.4-0"; sha256="137cf9x6qcp7lw3rpjqizsy73z99yihff8gr434wlz7b5fwmn7hj"; depends=[spatstat_utils]; }; spatstat_local = derive2 { name="spatstat.local"; version="3.5-7"; sha256="1sdcx4qxv0z5q97rljn34mssbs4w6qbqxhn71xmkns01xypl1wr2"; depends=[spatstat spatstat_utils tensor]; }; spatstat_utils = derive2 { name="spatstat.utils"; version="1.13-0"; sha256="0wijib2fmmvz5sf2sp212ms88ffhcz9c1d0j2ljdxf222lp6v8l1"; depends=[]; }; @@ -12539,7 +12698,7 @@ in with self; { spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; }; spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; }; - spdep = derive2 { name="spdep"; version="1.0-2"; sha256="1ciqn5xslm4ryad10nm6fqy1qhq3qhd4hx9bj94kphfm8x1zm7kg"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sf sp spData]; }; + spdep = derive2 { name="spdep"; version="1.1-2"; sha256="06mk81kc1ml2wjc8wwwgr0wasjcr4mwrxpfa8vfc373bmnha635s"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sf sp spData]; }; spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; }; spdplyr = derive2 { name="spdplyr"; version="0.2.0"; sha256="1saphs0x5lvm9fr8ik57qrl3f7w23lbsz17qp53xl2c5b3snq3kv"; depends=[dplyr lazyeval rlang sp spbabel tibble]; }; spduration = derive2 { name="spduration"; version="0.17.1"; sha256="1hsz4hcw85f1rj2pd8ppzsd1r8fh4yf6axc11yf2hd287ghzzxzy"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; @@ -12561,7 +12720,7 @@ in with self; { spef = derive2 { name="spef"; version="1.0.8"; sha256="1c4hpm19zqh869z8qbixkfbidnygc3fy91d0m2l4bp2s6bq1wdnz"; 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.0"; sha256="199gs48rpia3v2kp7i5ag5f7limds2j3694aacln8gb0znm0k8n1"; depends=[commonmark hunspell knitr xml2]; }; + spelling = derive2 { name="spelling"; version="2.1"; sha256="1j92brq29za3di1723xhmx240ya2v351dvcg0r1xr5yclw1kh3jp"; 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-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; }; sperrorest = derive2 { name="sperrorest"; version="2.1.5"; sha256="126vwk3bxs27gblakc5nplj0k90a21gks9d0kbyanlxc2ihsy243"; depends=[doFuture foreach future future_apply gdata glue magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; @@ -12607,10 +12766,10 @@ in with self; { sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; sport = derive2 { name="sport"; version="0.1.2"; sha256="1d5j42a6gx64pxh8bifrzc08z382sz55339f9237s6zq751pjjjy"; 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]; }; - spotifyr = derive2 { name="spotifyr"; version="2.0.0"; sha256="1y75pxmpmh4p1zx87bxc1zimq4ax1m7nmz6f592wpsaz0vaccvam"; depends=[dplyr httr jsonlite lubridate purrr readr rvest stringr tibble tidyr]; }; + spotifyr = derive2 { name="spotifyr"; version="2.1.0"; sha256="1ziag07x7ibf405z7i9dji8g2ign2c9dmzx794svf2qzzahrds8q"; depends=[dplyr genius httr jsonlite lubridate purrr readr rvest stringr tibble tidyr]; }; spp = derive2 { name="spp"; version="1.15.5"; sha256="097rb34kk20varsdf0d9gf3k2hxbislsirzgjm61ksrzmj96fj0w"; 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-3"; sha256="0zy2dwzk33cwch0pdhhsyiy169z39iij3zvvjg81gxa29pq0h1ab"; depends=[magic partitions Rcpp]; }; + spray = derive2 { name="spray"; version="1.0-5"; sha256="1ppgq3lizi7spvdv5l9mc4w6qac0q7ykf03zjak48ac5ajkbns38"; depends=[magic partitions Rcpp]; }; 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]; }; sprinter = derive2 { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; }; @@ -12618,8 +12777,10 @@ in with self; { sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; spsann = derive2 { name="spsann"; version="2.1-0"; sha256="0smxkcizs38m84d1d7852hsw699blv6x0n1ma9bi071r9lngljm5"; depends=[pedometrics Rcpp sp SpatialTools]; }; spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; }; + spsh = derive2 { name="spsh"; version="1.0.4"; sha256="11xfbhj9g8c99npzs76y30j829gfvhi9zrq2dn97c1idd08200c9"; depends=[DEoptim FME lhs pracma]; }; spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; - spsurvey = derive2 { name="spsurvey"; version="3.4"; sha256="0bi2d5jfqbnhhfhs79wid7ksg77vh8r5r8q2g4zbzpjgc9c67lj4"; depends=[deldir foreign Hmisc MASS rgeos sp]; }; + spsur = derive2 { name="spsur"; version="1.0.0.3"; sha256="101k39g0psvvrf8qkic9ijh2sps444i5bl1z3fr9c4i29yfgzvnm"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; }; + spsurvey = derive2 { name="spsurvey"; version="4.0.0"; sha256="0bx3x4cddsr5r402cxi0321628ab7hjajgcv937ah4km3g2z9ihs"; depends=[crossdes deldir foreign Hmisc MASS rgeos sp]; }; spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; }; sptemExp = derive2 { name="sptemExp"; version="0.1.3"; sha256="1j5c63mywv92c2zyqaa1rp22s5dmsj0as1f3q93455wjvvr42sz6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; }; sptm = derive2 { name="sptm"; version="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; }; @@ -12627,7 +12788,7 @@ in with self; { spup = derive2 { name="spup"; version="1.3-1"; sha256="0xq9z9iy3bwqhzq783qydgmczxvh7knkk9vdvwnbpbk0rbjgq3kn"; depends=[gstat magrittr mvtnorm purrr raster whisker]; }; sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; }; sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; }; - sqlscore = derive2 { name="sqlscore"; version="0.1.3"; sha256="0043ri91zzl08f47kjkvwqqnb8p7k2qlksg988x1dhna28n519va"; depends=[dbplyr]; }; + sqlscore = derive2 { name="sqlscore"; version="0.1.4"; sha256="1wvjiy7g0rxfy10vssdrv5li5sbvrin9wjy0ai0nxk503kw7g74k"; depends=[dbplyr]; }; sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; }; squash = derive2 { name="squash"; version="1.0.8"; sha256="1x1rw0ny2kas0x8y5vv9czyqmwml7s5d2c8a33vqap0x8q52r4z6"; depends=[]; }; squid = derive2 { name="squid"; version="0.1.1"; sha256="0qv9lazgiqazhq096ybmllalm2l2h794ry4p1r93c10msxg37sdp"; depends=[arm data_table ggplot2 lme4 MASS shiny]; }; @@ -12645,8 +12806,8 @@ in with self; { 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]; }; ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; - ssgraph = derive2 { name="ssgraph"; version="1.7"; sha256="0gw6gglvcpiil913kn0w4rjkyvymf1qrjaxm46qyi1hijgah3mns"; depends=[BDgraph igraph Matrix]; }; - ssh = derive2 { name="ssh"; version="0.4"; sha256="1zdl2p7zvhv7liybflp4wck86d9vban7a0pp19agqli8v6j1k894"; depends=[askpass]; }; + ssgraph = derive2 { name="ssgraph"; version="1.8"; sha256="0047h8cg7rv4qckhv3ixplfbpilj9sshd6vvg20zzb4wqnk5h1cr"; depends=[BDgraph igraph]; }; + ssh = derive2 { name="ssh"; version="0.5"; sha256="0gdqzhhzrp88g7gx3ava51ps1xjlbznqrxziv3synka1wbhc8cmc"; depends=[askpass credentials]; }; ssh_utils = derive2 { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.1"; sha256="08gkmmn71qra34x00r1vl6zyfwz7bwkbsax09vkqi7a15k1c3dph"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; @@ -12663,7 +12824,6 @@ in with self; { 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]; }; stR = derive2 { name="stR"; version="0.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; }; - stUPscales = derive2 { name="stUPscales"; version="1.0.3.3"; sha256="1hby7z9j23pd0z2hvyvprjl4gglb2rg9rh5fpkqy26x24nwkgk3h"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; }; staRdom = derive2 { name="staRdom"; version="1.0.12"; sha256="0356k9xivci1sm7a122bjzlpn438zhwcbxy65z3d2z6rv5lly8mm"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 matrixStats MBA multiway pracma R_matlab 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]; }; @@ -12688,8 +12848,9 @@ in with self; { stars = derive2 { name="stars"; version="0.3-0"; sha256="0dnb8vq1ma2zggz1df18nbwm384g08kdhxmph9vfgkd2cf2fnl0d"; depends=[abind classInt rlang sf units]; }; startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; startup = derive2 { name="startup"; version="0.11.0"; sha256="1ibplrnzqv0z7mm8c3py5prlp4wg95xhk1jxv5i3z1w9ndqimbfv"; depends=[]; }; - startupmsg = derive2 { name="startupmsg"; version="0.9.5"; sha256="1dn7yr957qa47c0hxdq2c27qvdpg9iy5i0lwz4kijz9yph2daahh"; depends=[]; }; + startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; statGraph = derive2 { name="statGraph"; version="0.2.0"; sha256="03cxm3kvs88q7p8v859xzma97vlklx50yh3kgmmfzf4axdm6dcgm"; depends=[igraph MASS]; }; + statVisual = derive2 { name="statVisual"; version="1.0.5"; sha256="1w6xprfiagixa74nybb6n2whb3y6zxrv46m52mrm9lj39a7pybjs"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gplots gridExtra knitr limma pROC pvca randomForest reshape2 rmarkdown rpart_plot tibble]; }; statar = derive2 { name="statar"; version="0.7.0"; sha256="0jp2547gvm1na4bnnvzw3j3jya5db2k6xnbnmbwv9cmw1bwfbazk"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; }; statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; }; statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; }; @@ -12702,11 +12863,11 @@ in with self; { statnetWeb = derive2 { name="statnetWeb"; version="0.5.0"; sha256="02344i8rhjxy8ainfvf5vn39g1nk2n448l76cg74cyxv6zv4f55w"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; 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="0.2.0"; sha256="1qss4qik51y4pc04618anxnjilclqvp6cry7gl92dxnax6x1j3z1"; depends=[readr sf]; }; + stats19 = derive2 { name="stats19"; version="0.2.1"; sha256="0s3zzkb34jygb4ph2j0q488qasvg1xgsabgnnisc9fqwalxd096l"; depends=[readr sf]; }; statsDK = derive2 { name="statsDK"; version="0.1.1"; sha256="0insx4sivac0nfxaa11iz9dd7374g51fcndsgljj3f14zw1xyq66"; depends=[dplyr ggplot2 httr jsonlite lubridate readr stringr tibble tidyr]; }; statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; }; stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; }; - stdReg = derive2 { name="stdReg"; version="3.0.0"; sha256="0mjn2zvpadxm3q5kw4v3jpfmx94chjxdf8n1m7c4dm7gfaj0q38x"; depends=[data_table drgee numDeriv survival]; }; + stdReg = derive2 { name="stdReg"; version="3.3.0"; sha256="0m907dcgqprnasq17z3wyx7fampsqhwjvg2r0nji5bg9gzag4253"; depends=[data_table drgee numDeriv survival]; }; stddiff = derive2 { name="stddiff"; version="2.0"; sha256="0mik01a8agcdpjq4r7lcdf3w2jcy6s9gx9zl7plzvnl2r3s5xw5b"; depends=[]; }; stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; }; steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; }; @@ -12718,6 +12879,7 @@ in with self; { stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; }; stepR = derive2 { name="stepR"; version="2.0-3"; sha256="1vz7mr2zycn4w0zv4rg2dn4v4dbbpxv8vy20sl9nphya0w0w4mrg"; depends=[digest R_cache Rcpp]; }; stepp = derive2 { name="stepp"; version="3.2.0.0"; sha256="0fnjqbncadscv6ryvqyqf8qqgpfzh2hka5ld2zvw39mjqzy5gadi"; depends=[car survival]; }; + steps = derive2 { name="steps"; version="0.2.1"; sha256="1ccghvhrbk0d2m1896wbnzf55i1rlvwmdnr5dikr9h9sc79dahla"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; }; stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; stevedore = derive2 { name="stevedore"; version="0.9.1"; sha256="0laib1vd9limzvxp2lij414a4mvbbx1j63rx4yzdyh6jiglm8l7h"; depends=[crayon curl jsonlite yaml]; }; stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; @@ -12735,7 +12897,7 @@ in with self; { stoRy = derive2 { name="stoRy"; version="0.1.2"; sha256="1n2ivdv6fa3qkk2xhgcy8cixpbw6mijr4p8q34q8d9fvh9qs9g11"; depends=[data_tree R6]; }; stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; }; stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; }; - stochvol = derive2 { name="stochvol"; version="2.0.1"; sha256="0ryadw3df6m2kk8di0kniin27s5c62wj89nk85hq7hasvb59fr80"; depends=[coda Rcpp RcppArmadillo]; }; + stochvol = derive2 { name="stochvol"; version="2.0.2"; sha256="0vl2qznxx9h2bzh86iwmza436rb84yk2xl7dm1cxdxbm73sbr2lm"; depends=[coda Rcpp RcppArmadillo]; }; stockR = derive2 { name="stockR"; version="1.0.68"; sha256="0pgyxh19csv21vgji1sjpqaaqb1wwz62mnsf85a97ba9aph9lxwb"; depends=[gtools]; }; 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=[]; }; @@ -12743,11 +12905,12 @@ in with self; { stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.1"; sha256="16w6si2icpsyhkn0d3l6sh64nj6ynyymp7jxfwa792ds2wrz2mkm"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; }; storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; }; - stplanr = derive2 { name="stplanr"; version="0.2.7"; sha256="0jxhg15fysj4x224g2s1hbjp8y6cyn53mzwhg1x5qax9h6cjrfyz"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sf sp stringi stringr]; }; + stplanr = derive2 { name="stplanr"; version="0.2.8"; sha256="0vzsrrpq32063risg6d0n6x231rykv0n4fa8pyyp1h4xp6j2pcrx"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringi stringr]; }; stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; }; strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; + strapgod = derive2 { name="strapgod"; version="0.0.1"; sha256="15y8vq9lrgk4b69sjb4bg7nx35x5nsmvky3jh7mywy8ykfpgm86i"; depends=[dplyr rlang tibble tidyr]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; stratEst = derive2 { name="stratEst"; version="0.1.2"; sha256="045wmvkv9jxmazvy0p2dkf3200vy5gf124cv78132ysrnh2vcd4v"; depends=[Rcpp RcppArmadillo]; }; strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; }; @@ -12757,7 +12920,7 @@ in with self; { stratifyR = derive2 { name="stratifyR"; version="1.0-1"; sha256="0w135smkgryx29ppa7khpay8w04b3g2pxka0wsqlhksrp5pqa086"; depends=[actuar fitdistrplus mc2d triangle zipfR]; }; stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; }; stream = derive2 { name="stream"; version="1.3-0"; sha256="0wj6j070wmiw50vmjs075jm7k7aaryq4qm8dnj522vr7g0ryvkdh"; depends=[animation BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; }; - streamMOA = derive2 { name="streamMOA"; version="1.1-4"; sha256="09vspcz806j2f397hr8h685vy4xbx419bbha91f44s3bhks1y7fr"; depends=[rJava stream]; }; + streamMOA = derive2 { name="streamMOA"; version="1.2-1"; sha256="14da621js0ccgk20hmg1c7691v108zll9jy851japwqr0nalm1rj"; depends=[rJava stream]; }; streamR = derive2 { name="streamR"; version="0.4.5"; sha256="1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix"; depends=[ndjson RCurl rjson]; }; streambugs = derive2 { name="streambugs"; version="1.0"; sha256="1dyh5rwi47dn584nyy7f7vg5j5nlpz7ygcl8lwkj7prahplmzg5d"; depends=[deSolve]; }; stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; }; @@ -12766,7 +12929,7 @@ in with self; { stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; }; stringdist = derive2 { name="stringdist"; version="0.9.5.1"; sha256="0gap1g9xwhp0zxqsznkc2carpvi80z03prr4q8m528684lznx2xa"; depends=[]; }; stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; }; - stringi = derive2 { name="stringi"; version="1.3.1"; sha256="0qn3xy6vnz11vv2prbm55vkbgxr6dl8w5vk5q8d7wlp9nqxndprj"; depends=[]; }; + stringi = derive2 { name="stringi"; version="1.4.3"; sha256="1vbr6g9p1iyzdj7wfw6afyizvnd1a2srfvkl72pq23vhdcwwpkhk"; 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]; }; @@ -12775,7 +12938,7 @@ in with self; { structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; }; structree = derive2 { name="structree"; version="1.1.5"; sha256="0m14jzhmkfn8dpxjzj8xh9zf6cggqj3awnfz7zh1xlkkka91jz8d"; depends=[lme4 mgcv penalized]; }; strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; }; - strvalidator = derive2 { name="strvalidator"; version="2.1.0"; sha256="15qpdbqr740bn2zimfyspj6arzigc39hdf73yy9lbk6vhiq43yyq"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 gWidgets2RGtk2 MASS plyr RGtk2 scales]; }; + strvalidator = derive2 { name="strvalidator"; version="2.2.0"; sha256="0pfc6bj5sdik6a3qxsxshd6n3jp27kzap3hp6zlldknwybsavrl3"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 gWidgets2tcltk 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.7.3"; sha256="0xd85ijshhsyzkm22vacjl2p7ni8x3zfypmrwmvvba5x9l82s3hi"; depends=[]; }; @@ -12784,7 +12947,7 @@ in with self; { stylest = derive2 { name="stylest"; version="0.1.0"; sha256="0dr7j9fh8kp6wsqql38s3rk596xl6m9nx0w1l5v25hv2bphidxzr"; depends=[corpus Matrix]; }; stylo = derive2 { name="stylo"; version="0.6.9"; sha256="14kr12gjbk7l6f4lz5m4j51vsjkyhnpgbiflsl327az5l0nrr5vw"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; - subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; }; + subcopem2D = derive2 { name="subcopem2D"; version="1.3"; sha256="06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3"; depends=[]; }; subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; }; subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; }; subgroup_discovery = derive2 { name="subgroup.discovery"; version="0.2.0"; sha256="17z49l26sfly3fln2z1x9vd6a6rsxn65z9lcb8kjylngm5s63rqj"; depends=[]; }; @@ -12803,12 +12966,12 @@ in with self; { subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-11"; sha256="1hv9d99ir1xz6p0arxr77dv5qb45sr8jhapm6wf755l7pxlqqklq"; depends=[magrittr]; }; - sugrrants = derive2 { name="sugrrants"; version="0.2.3"; sha256="00pa9zxnc40hyqnpfqggp808ag8nsik3b4jfc2zq2sj0c39bwvw0"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; + sugrrants = derive2 { name="sugrrants"; version="0.2.4"; sha256="04qfa3falpkbdnjks5vd0izjpp5pmc3wf4bkv0ha89ya556306jv"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; }; summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; }; summarytools = derive2 { name="summarytools"; version="0.9.2"; sha256="1q83kii6prqf9z5v8cxj1q2944kx9x7dcxyqix3m883a94dmgivy"; depends=[checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools RCurl tidyr]; }; sunburstR = derive2 { name="sunburstR"; version="2.1.1"; sha256="0r46ca3pvnvak7dqslbn64dg8h6d50nlhh0wrsxi8vcwgsycaf6y"; depends=[d3r dplyr htmltools htmlwidgets]; }; - suncalc = derive2 { name="suncalc"; version="0.4"; sha256="190bnh26bl26piq6512ijrx2hygzdscryjsjyz8y4ara8bf646r3"; depends=[V8]; }; + suncalc = derive2 { name="suncalc"; version="0.5.0"; sha256="1chkl297km313m89h9mbp7vnpz188fhzz5dn8x5cjkqy0mm6c0qc"; depends=[data_table lubridate magrittr]; }; sundialr = derive2 { name="sundialr"; version="0.1.2"; sha256="16vjjznck5gaw02x73qf8hc5gvg8bd9wnjcxxm7y5a2bh9j44038"; depends=[Rcpp]; }; supc = derive2 { name="supc"; version="0.2.1"; sha256="121dy7ymvxvq3ksf17hg0df74ycd2nag2z2ggnw4p2rwzj99vgc5"; depends=[BH Rcpp]; }; supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; }; @@ -12817,13 +12980,13 @@ in with self; { 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]; }; superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; }; - superml = derive2 { name="superml"; version="0.2.0"; sha256="0h89fa9g6sn114zg94i27vaky9b92zhw9via0k60qifgm8s5fgbb"; depends=[assertthat caret ClusterR data_table doParallel FNN glmnet kableExtra liquidSVM Metrics naivebayes R6 ranger tm xgboost]; }; + superml = derive2 { name="superml"; version="0.3.0"; sha256="0r5fq9kvbh4bfm2im5ddp69b44sc0lxaiqd69kmi8k11rvvv5wd1"; depends=[assertthat data_table doParallel Metrics R6]; }; supernova = derive2 { name="supernova"; version="2.0.0"; sha256="0nj7r0nqqhhi6hlwx4c6i57n26gbc4csml58spvmbnsbypbvc7c9"; depends=[]; }; superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; support = derive2 { name="support"; version="0.1.2"; sha256="1ih32hhgkbrdmjprqqf1sqlijgibzsrzh37i8jfmfb8n0d6h4x5a"; depends=[BH doParallel matrixStats MHadaptive nloptr randtoolbox Rcpp RcppArmadillo]; }; support_BWS = derive2 { name="support.BWS"; version="0.2-0"; sha256="1yfjpr9v9zsbkysm3r6zk9r0a072g038lmj9wk4014a3rk9kmm80"; depends=[]; }; - support_BWS2 = derive2 { name="support.BWS2"; version="0.2-1"; sha256="01qzlcbivs8ri7pr5mhii55np703s4zj21l5069wycc79y1k9rh3"; depends=[]; }; + support_BWS2 = derive2 { name="support.BWS2"; version="0.2-2"; sha256="1pykq297gz42n6scl5s6zjy33wjvcb5590vcrgysdigf3hqb22ra"; 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]; }; sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; }; @@ -12858,7 +13021,7 @@ in with self; { surveysd = derive2 { name="surveysd"; version="1.0.0"; sha256="155917rfyaijpiiiqgggnyisknikx3xid4kjqvh9299bs769a169"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; }; survidm = derive2 { name="survidm"; version="1.2.0"; sha256="0dgcxhf8x1aavr4n4aqanfc23zd62dyk3h05sa04611h6n9l8j9c"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; }; survivALL = derive2 { name="survivALL"; version="0.9.3"; sha256="0lnvs7b097sl21gvnfafdprzvh197p1q4nzzagkdf4xm1xw8pj0h"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; }; - survival = derive2 { name="survival"; version="2.43-3"; sha256="0ldrjja1dj4n1ic0lbggm7jvk52sl5h85i8m23nrgndi60acsv4r"; depends=[Matrix]; }; + survival = derive2 { name="survival"; version="2.44-1.1"; sha256="1faiwyg7x8y2kfzb66l4yc8br0mdlz4k20znmjrwq96dbzhm3cam"; depends=[Matrix]; }; survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.1"; sha256="0y4hgskc36jrriy6577bnkvg1gmxs0x3pxiv3lma38a9lj71ivwf"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; @@ -12884,7 +13047,7 @@ in with self; { svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; svars = derive2 { name="svars"; version="1.2.2"; sha256="0ajiw22lrwi4s7vya42c6xxa4mlx44axxhdcvw20ksykkr350bxq"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA strucchange tsDyn vars zoo]; }; svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; }; - svd = derive2 { name="svd"; version="0.4.2"; sha256="1hxkhw1vgr901bbcfa0r7ng5kl8cmdnrhvri8f9yh29i914h7hb3"; depends=[]; }; + svd = derive2 { name="svd"; version="0.4.3"; sha256="0wlvzqak6fng6v5473hyphrfxrfc2apw5f3fgvg7bz2fj6nzcry4"; 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.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; }; @@ -12908,18 +13071,19 @@ in with self; { sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; }; swephR = derive2 { name="swephR"; version="0.1.5"; sha256="139xp7lwzqspckf04fnfcwrpi4zhi01k94fhhka92sk2647yvd4z"; depends=[Rcpp]; }; swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; }; - swgee = derive2 { name="swgee"; version="1.3"; sha256="0shacrrj72c2yhnbrrryy98yvxb16882zawvfhy1hpf39gspld7n"; depends=[gee geepack mvtnorm]; }; + swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; }; swirl = derive2 { name="swirl"; version="2.4.3"; sha256="1l7gwisk3sjslh6zh4cq3vxf5y84af2fr078cp4i86rw1w2j9d44"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.5.2"; sha256="07r6rdj079ryafdgs0p8jhnk4h7iqm7agh9wjhvm12abbwjr9g1x"; 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]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; switchr = derive2 { name="switchr"; version="0.13.5"; sha256="11y9f8h5qkaykkdk5ya1z8dyw98z5svny56hx0q2b1z2f0iszwc3"; depends=[RCurl RJSONIO]; }; switchrGist = derive2 { name="switchrGist"; version="0.2.4"; sha256="137kz944qqqrislbm6anknw6n303j441mfhfcrzh33xcb19z320v"; depends=[gistr httpuv RJSONIO switchr]; }; - swmmr = derive2 { name="swmmr"; version="0.8.1"; sha256="0zl00864x9q6a2aqdbqs3b5kw6z50wgr46c62kxk9xkns8317sa7"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; + swmmr = derive2 { name="swmmr"; version="0.9.0"; sha256="1iv9dmgpjfl7yzjlph42bamnwchjdic6n0lgs33z0incvgsv3m3g"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; sybil = derive2 { name="sybil"; version="2.1.5"; sha256="1biy1cc87g7adfglzp2mq6ca5sfp1ljq087id0xqdmrwz0650maq"; depends=[lattice Matrix]; }; sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; }; - sybilccFBA = derive2 { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; }; + sybilccFBA = derive2 { name="sybilccFBA"; version="3.0.0"; sha256="0kv66c70vh8jq9xad459lmskkw8bar2zlrws2fqdjf4ww064ymgp"; depends=[Matrix sybil]; }; sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.0"; sha256="0p3w7ipyrqrh7nf52h8qmr4fikyinm8an7npmcb7kwjd59rcy554"; depends=[MASS Matrix sybil]; }; + sylcount = derive2 { name="sylcount"; version="0.2-1"; sha256="0a5762cy2h4vhy35z88l9i4ny30zpj5bvmmw3n5xzz275hsd3piw"; 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=[]; }; sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; }; @@ -12934,23 +13098,25 @@ in with self; { synchronicity = derive2 { name="synchronicity"; version="1.3.5"; sha256="1kgsk64aifjm3mfj102y3va7x1abypq2zi0cqbnjhl8fqyzp69hx"; depends=[BH bigmemory_sri Rcpp uuid]; }; synchrony = derive2 { name="synchrony"; version="0.3.7"; sha256="0lnin4aphy1lq20bn7nsdj0ymy2xdwjzdj2f89xq0qwkc7w7b5jb"; depends=[]; }; synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; }; - synoptReg = derive2 { name="synoptReg"; version="0.2.1"; sha256="1ip74czb96kshzl6akxk5nxi6i25a3i1jzyfq0b2ji5bk7ydhmqr"; depends=[ncdf4 raster zoo]; }; + synoptReg = derive2 { name="synoptReg"; version="0.2.2"; sha256="0s3m7basw71gliy22c599ysj5s068ki20i8031yrrbdhif8zhbqg"; depends=[ncdf4 raster zoo]; }; + syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; }; synthACS = derive2 { name="synthACS"; version="1.4.5"; sha256="04vw2xbg055anwiawkddnik4q67vvbvx9firm85hs7cj73mv07q4"; depends=[acs data_table Rcpp]; }; - synthpop = derive2 { name="synthpop"; version="1.5-0"; sha256="0p0dszrh66xzfaiks89qli23c8qzq8gvi4d7wwlngkmq4k8y80rq"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; }; - sys = derive2 { name="sys"; version="3.0"; sha256="1g0q1f56qmp3x5gja19qrmgk3j4d89yp16z1ziv1jn5p4dlmfpxh"; depends=[]; }; + synthpop = derive2 { name="synthpop"; version="1.5-1"; sha256="0cd9g0aa4598l3gyqpywalmkmvibhqkxhkm2qkln11rkwv12lcyv"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; }; + sys = derive2 { name="sys"; version="3.1"; sha256="0aj3wcyah3r7c9s3rbs0c8nifd4vqmkzg9fqkrb7f838ww0qw24q"; depends=[]; }; sysfonts = derive2 { name="sysfonts"; version="0.8"; sha256="0wng902plryf2d8fc7k7m3jx11acz51kb2d91cqbyhq7xpk06z43"; depends=[]; }; sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; systemfit = derive2 { name="systemfit"; version="1.1-22"; sha256="19nmhidnzyk2wcwi5v28n9lkvylfw4in63vg5naqlk3w4fbwm2wb"; depends=[car lmtest MASS Matrix sandwich]; }; 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]; }; + tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.7"; sha256="1j06rc5s6jpz8i116m98ygc75sx6lk8jd9gw6fb8q342mbbmqh8h"; depends=[coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; }; taRifx = derive2 { name="taRifx"; version="1.0.6.1"; sha256="1qnp2562irhb516jfapmpg4260172ckc8jc3vxfkjsj7dnr35j6l"; depends=[plyr reshape2]; }; tab = derive2 { name="tab"; version="3.1.2"; sha256="1vc5swfy9p3bsv5bqqgk4w81apzk6d0m1xz0cbhii7rpn7x6zh1h"; depends=[gee survey survival xtable]; }; taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; }; tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; }; table1 = derive2 { name="table1"; version="1.1"; sha256="01r6zlhv3d0ggniv6aaszmzqbappy9zycayiwwlknbwrgiwkp58z"; depends=[Formula htmltools knitr]; }; table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; }; - tableHTML = derive2 { name="tableHTML"; version="1.1.0"; sha256="0j2dk11h0dvibppyxjix4pxr6i9ji9ipzaizsr1fadrpk5xzawd5"; depends=[htmltools magrittr shiny]; }; + 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.10.0"; sha256="166amb76acrw3dgvllc46kgblp82f46zvlgig2prg92xnid1zaws"; depends=[e1071 gmodels labelled lmerTest MASS nlme survey zoo]; }; tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; @@ -12959,7 +13125,7 @@ in with self; { tableschema_r = derive2 { name="tableschema.r"; version="1.1.0"; sha256="0ny683p9kaidj5bayz77hyvsaqg3jk87pb95271znk8hzhl2jlcj"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; }; tabr = derive2 { name="tabr"; version="0.2.0"; sha256="1wmb1ywlsx2fqc9rg6hfi1anjiq4g552y65b0nflbv5yxsw96wsk"; depends=[dplyr magrittr purrr]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; }; - tabula = derive2 { name="tabula"; version="1.0.0"; sha256="1w3lk5999hnxbpyg4kvihd9sydm85b8yzqxjwd8mkhz6amxi55n8"; depends=[dplyr FactoMineR ggplot2 magrittr rlang tidyr]; }; + tabula = derive2 { name="tabula"; version="1.2.0"; sha256="14zbm46ass0whd9pihy7rvivbc2asd10davhwy5fvb76k9n371w2"; depends=[dplyr FactoMineR ggplot2 magrittr plyr rlang tidyr]; }; tabularaster = derive2 { name="tabularaster"; version="0.5.0"; sha256="0cqax6hq0pbxmqls3cs21cc86662wdzjyx4lkxw42dbw4v13f728"; depends=[dplyr fasterize gibble magrittr raster rlang sp spatstat spbabel spex tibble viridis]; }; 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]; }; @@ -12974,8 +13140,9 @@ in with self; { takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; }; tanaka = derive2 { name="tanaka"; version="0.1.0"; sha256="1j0xjklwrlzrh0078bk34qzk2fvv0fb3r2rak571hkm3xpl2g5zn"; depends=[isoband lwgeom raster sf]; }; tangram = derive2 { name="tangram"; version="0.4"; sha256="1yj5vwc8jkiic4zjag9k7w3j6dibqw5zsi78q6gssshsi9z0zbgy"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; }; + tapkee = derive2 { name="tapkee"; version="1.0"; sha256="0cd1zkyhrfn33hhy6kdqwnmrs31d9b20750zgq0zm4c68qsnz506"; depends=[]; }; tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; }; - tatoo = derive2 { name="tatoo"; version="1.1.0"; sha256="1dsycdp3vln1m1w3nhhrr60x8raw6gbihjpav0d4ad8qla2fq8nh"; depends=[assertthat colt crayon data_table magrittr openxlsx purrr rlang stringi withr]; }; + 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=[]; }; tauturri = derive2 { name="tauturri"; version="0.3.0"; sha256="014301f5mzy6vblqzb61bxjv46kdynmmrxjpxyvk01w1k8wkwfcn"; depends=[httr magrittr plyr purrr tibble]; }; tawny = derive2 { name="tawny"; version="2.1.7"; sha256="1b2v0cgkmhzxy36dcdn6hnbqk6l5ac5c3myvwryf7wlp19xi786d"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; }; @@ -12992,7 +13159,7 @@ in with self; { tbl2xts = derive2 { name="tbl2xts"; version="0.1.2"; sha256="1zz310253s6gz0hzzldil5r03mm7ngvvnba7hxm8fm9dhfmvkbj6"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; }; tbltools = derive2 { name="tbltools"; version="0.1.0"; sha256="1x83n0848xzb5m9jbk2330gr715zlfrvghpb5iz45cmqz8ym6sxy"; depends=[magrittr]; }; tbrf = derive2 { name="tbrf"; version="0.1.2"; sha256="03n9s2n5y9d669l78v6s2dbk3sz51g5v28301ng2w082njrsvxhv"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; - tcR = derive2 { name="tcR"; version="2.2.3"; sha256="057bbzvzgrsq1sgrs874mjgq4xqcy33rg960x1r20bnkvl3cimcf"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; + tcR = derive2 { name="tcR"; version="2.2.4"; sha256="17g26cq6zpcmg9kv32v0rvyqmml5wkbwra7p8f1cdzyc0zajbvn2"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive2 { name="tclust"; version="1.4-1"; sha256="17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb"; depends=[]; }; @@ -13018,8 +13185,8 @@ in with self; { tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; tensorA = derive2 { name="tensorA"; version="0.36.1"; sha256="176hjy3bvg3in62r97wxbhq187sjz6c1gwy9x6spaxl6k4my3zy7"; depends=[]; }; tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; }; - tensorBSS = derive2 { name="tensorBSS"; version="0.3.4"; sha256="0wh14qy7fa7klb7yy272d16cvgfgnrf25wba3bqbpral9pv5nkmv"; depends=[ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; - tensorflow = derive2 { name="tensorflow"; version="1.10"; sha256="15zzirwxwfp29a180w5kkb4dgmzc79zfi0w0hzsh8r5j7hnvcf7r"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; }; + tensorBSS = derive2 { name="tensorBSS"; version="0.3.5"; sha256="1m4g9jr2s37xys2q4gv6rqknrznd4nrppa7qrgygqywwlmnyid44"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; + tensorflow = derive2 { name="tensorflow"; version="1.13.1"; sha256="0fv58ml67miq7cb0d66p880vs8c91v6gdz5xba9mxppbd63k5li8"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; }; tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; }; tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; }; tergm = derive2 { name="tergm"; version="3.5.2"; sha256="0p7qcr59p6n7snzspv02m8gn26rgk3rp2hxilmp5jailk43zid35"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; @@ -13040,12 +13207,12 @@ in with self; { textTinyR = derive2 { name="textTinyR"; version="1.1.2"; sha256="177m3mh61isjk9svbnv5gdlpyfy7fdmafi2znxh2m7fqcwn7k3af"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; }; textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; }; - texteffect = derive2 { name="texteffect"; version="0.2"; sha256="1g9vda1xx5fysifs1716m3bw651sk5l2ayn23gdlcsyrpynj3d1q"; depends=[boot ggplot2 MASS]; }; + texteffect = derive2 { name="texteffect"; version="0.3"; sha256="1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7"; depends=[boot ggplot2 MASS]; }; textfeatures = derive2 { name="textfeatures"; version="0.3.0"; sha256="07xi4bdpf5zibhs83wwv8sh58b8avmnm7f5j8gcai4195wwqflnn"; depends=[dplyr purrr rlang syuzhet text2vec tfse tibble tokenizers]; }; textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; }; textile = derive2 { name="textile"; version="0.1.2"; sha256="067zli6sl7bp9843spgx47hmw55aq61yinqw1lqifmrpk7b0ywk5"; depends=[]; }; textir = derive2 { name="textir"; version="2.0-5"; sha256="0ban5qiinlxizqpcgafv4b5gwxlil6jdfarjd6l1m48awxh3mlnb"; depends=[distrom gamlr Matrix]; }; - textmineR = derive2 { name="textmineR"; version="3.0.2"; sha256="1dgxdik2vv6jrza3aw1yfqf55ldznahmlga60rw99fz39bhrf7z9"; depends=[Matrix Rcpp RcppArmadillo RcppProgress RSpectra stopwords stringr text2vec]; }; + textmineR = derive2 { name="textmineR"; version="3.0.3"; sha256="1gmm4wqab7p33s4g24iq25qbzz30xk8sv81vh3cjw0px50b3ppi8"; depends=[gtools magrittr Matrix Rcpp RcppArmadillo RcppProgress RSpectra stopwords stringr text2vec]; }; textmining = derive2 { name="textmining"; version="0.0.1"; sha256="16wiykhrjs4djwa7q2wm4g8b3mrhh6hq9d9876w1j7c2s6zx69gd"; depends=[caret dplyr koRpus mallet networkD3 NLP rJava slam SnowballC stylo tm topicmodels wordcloud]; }; textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; textrank = derive2 { name="textrank"; version="0.3.0"; sha256="1sjzllz3ixxr043hbmbvwkwvj5wzh3m08x9z7h6hvy8ld8nzmn74"; depends=[data_table digest igraph]; }; @@ -13066,40 +13233,40 @@ in with self; { tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; }; tfruns = derive2 { name="tfruns"; version="1.4"; sha256="1mqv5m13qm1dqz0622jd5ayb3nk76lfa657y2hyqv261flxizhvg"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; }; tfse = derive2 { name="tfse"; version="0.5.0"; sha256="05q75xsiy955xwgchagk7l7725y6mylp5lj5284xm7y2xh197zp3"; depends=[dapr magrittr]; }; - tgcd = derive2 { name="tgcd"; version="2.0"; sha256="1553f464jpmngdj8fmbjn9cpmrcp4ysgsfx4w7q4pm4csslsqvlr"; depends=[]; }; + tgcd = derive2 { name="tgcd"; version="2.1"; sha256="0anaycfsjax62iasly9b0mmmhqfcl11a8ncavr1c1i7rikandj0i"; 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]; }; tgram = derive2 { name="tgram"; version="0.2-3"; sha256="0vlnry8drq3fqfy8dk50pcwcx9dj657kx6s19fs2b6acigkr4g7w"; depends=[zoo]; }; thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; - theiaR = derive2 { name="theiaR"; version="0.1.0"; sha256="0c4y1wqnagg99y71xhs3nlqlckf3xvrrjh3bv29zh41vdjc4v5ib"; depends=[askpass httr R6 raster tiff XML]; }; + theiaR = derive2 { name="theiaR"; version="0.2.0"; sha256="1zvgg3xs1xlmg7gkv7pax7w5xgarvya4nvv4d78iv7p02bzckbxv"; depends=[askpass httr R6 raster tiff XML]; }; themetagenomics = derive2 { name="themetagenomics"; version="0.1.0"; sha256="1p8qyvll6a9yx2akny1087f73r6p5zi6cf1si7b8i786bcs9khwj"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; }; theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; }; thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.13"; sha256="1j43mjznriq8d5ki50rb41vgmzj2gq8sahvhj11742ggxd0bzvdb"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr]; }; - thor = derive2 { name="thor"; version="1.0.1"; sha256="02yyn8sp2s8qhxhwhc4f4921014c5q70b5x2r00jbqlwg069szj2"; depends=[R6 storr]; }; + thor = derive2 { name="thor"; version="1.1.0"; sha256="0ard98z5kb9r6k4qvnbqq4mx4x6ydhd4b6ppzrp19yilvdb8wgjp"; depends=[R6 storr]; }; threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; }; threejs = derive2 { name="threejs"; version="0.3.1"; sha256="1s3rdlzy7man6177ycayg6xsh6k8y1r9rdj9yzn3b93j2rs0nxbi"; depends=[base64enc crosstalk htmlwidgets igraph]; }; 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]; }; - thriftr = derive2 { name="thriftr"; version="1.1.4"; sha256="11svky3dyx4bqgrmpy6zbd4ai5zccy70mrvqj86899qc5gh52wjb"; depends=[R6 rly stringi]; }; + 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]; }; - tibble = derive2 { name="tibble"; version="2.0.1"; sha256="04rxf5x9awwa9c00v9p7d3a2lqnn7j2rjg4r219hmw7cbqlwrcks"; depends=[cli crayon fansi pillar pkgconfig rlang]; }; + tibble = derive2 { name="tibble"; version="2.1.1"; sha256="111jl0hdjhh7hkydxvsr5l19gb0ylxq7xrkc28awnc9pzglpgis5"; depends=[cli crayon fansi pillar pkgconfig rlang]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.2"; sha256="0hv929zcfwhg1by2jkdjh2h42dqis4291ph7k0zlrywmpm4zn6n8"; depends=[assertthat dplyr glue hms lubridate purrr Rcpp rlang tibble zoo]; }; 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=[]; }; - tidyLPA = derive2 { name="tidyLPA"; version="0.2.4"; sha256="0bjc6nhcczryhvmlkcvqwv5bv0w49z1kk8x7bx57189xap2lfsd9"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; }; + tidyLPA = derive2 { name="tidyLPA"; version="1.0.2"; sha256="02alsv44v8yf23aibpchichwn6yrmwy2751a18kaj8azgz1x7i07"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; }; tidyRSS = derive2 { name="tidyRSS"; version="1.2.8"; sha256="0nnpj7r7r3mvbifkg1ysg05k1p0ni9gnisv2rkj2prhzi2vxk43d"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; }; tidybayes = derive2 { name="tidybayes"; version="1.0.4"; sha256="1cf4rhsik835gsrj1h1y0zcsvvgnrmn0q7jcib8m082zmzw7z7ma"; depends=[arrayhelpers coda dplyr forcats ggplot2 ggstance HDInterval LaplacesDemon magrittr plyr purrr rlang stringi tibble tidyr tidyselect]; }; tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; }; tidycensus = derive2 { name="tidycensus"; version="0.9"; sha256="1ps46kljafpg4445sr6q4764hqxpk652czn7nfd0xz0551w001wf"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; }; tidygraph = derive2 { name="tidygraph"; version="1.1.2"; sha256="1zpsarm74afbc7p5dlyb0whc09670qdcddw1ckb25cfc9hfh0hjn"; depends=[dplyr igraph magrittr pillar R6 Rcpp rlang tibble tidyr]; }; - tidyhydat = derive2 { name="tidyhydat"; version="0.3.5"; sha256="1b82pxkn54kil661hkc5dp52nkl4sdbc0qr835ax1j00ix4hzi0b"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; + tidyhydat = derive2 { name="tidyhydat"; version="0.4.0"; sha256="0k239xixq6x9xb51ipmxn7ph72ibqa9s9sp79gkabgawc0lij6q0"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; tidyimpute = derive2 { name="tidyimpute"; version="0.1.0"; sha256="03b475nn206hxq3i0n7j1qws82rwwk5vqivmdg5mff44dvz4gl5s"; depends=[dplyr na_tools rlang]; }; tidylog = derive2 { name="tidylog"; version="0.1.0"; sha256="0mwd9crb0a0c8gpchsdjcap56fc602h1x7bk5f0rvvmw41xz06kn"; depends=[dplyr glue]; }; tidymodels = derive2 { name="tidymodels"; version="0.0.2"; sha256="1hidjrayqxz1g7bn20pqs1bwyx4cxxqx9dq5lwqyfsij0ir0lia9"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; }; @@ -13111,6 +13278,7 @@ in with self; { tidyselect = derive2 { name="tidyselect"; version="0.2.5"; sha256="0x3cp36byhfjajikr1lwffjm85ayw3bcs7d7kb0cydgs61ifiqjw"; depends=[glue purrr Rcpp rlang]; }; tidystats = derive2 { name="tidystats"; version="0.3"; sha256="11bl4m14n29fcy9g3b0sx10fx2kl6949fczzdzw2cllqn2krfx45"; depends=[dplyr kableExtra knitr magrittr miniUI purrr readr rlang shiny stringr tibble tidyr]; }; tidystopwords = derive2 { name="tidystopwords"; version="0.9.0"; sha256="1zw6rz8fs8mynaqhrxidrar8vyiq73i8hl4h2lrfz83rxrihbq39"; depends=[dplyr stringr]; }; + tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; }; tidytext = derive2 { name="tidytext"; version="0.2.0"; sha256="15xyn7mz81cm6dqsjvdb681q2sag9pp62kv11y0blyxd81wpy994"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; tidytidbits = derive2 { name="tidytidbits"; version="0.2.0"; sha256="194b5j1f8ap0rl6v227wpz4vbps3iw60k4wryk12yw4z4xp0l9xw"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; tidytransit = derive2 { name="tidytransit"; version="0.3.8"; sha256="1fn3k1n37f13jykh86ixs3hacv970ajjmaify2ygkfbbmd287bah"; depends=[assertthat data_table dplyr here hms htmltools httr lubridate magrittr readr rlang scales sf stringr tibble tidyr zip]; }; @@ -13151,10 +13319,10 @@ in with self; { 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.0"; sha256="1hczc2nrm8xgvw3igkfnlqyz73686l447kigsrd6m796v8ny1gbf"; depends=[htmltools knitr rmarkdown]; }; + tint = derive2 { name="tint"; version="0.1.1"; sha256="0ii80qhxy91qzm4am1anfg56ah446vfsa68likdvmzl2k50wyjm0"; depends=[htmltools knitr rmarkdown]; }; tinter = derive2 { name="tinter"; version="0.0.1"; sha256="1zw5a79mryqighf8b6gidsi30001749sllpwqwbck26cyal6m8y6"; depends=[checkr]; }; tinyProject = derive2 { name="tinyProject"; version="0.5"; sha256="10sllhjcla4pfgp5n1y5vi318q9bcy82j88rx3k1sgzmbq1nc1c2"; depends=[brew devtools]; }; - tinytex = derive2 { name="tinytex"; version="0.10"; sha256="02bz8zaka5j51zin976n5nmk19a0390d0gwgj4zrbh48hl313rqm"; depends=[xfun]; }; + tinytex = derive2 { name="tinytex"; version="0.11"; sha256="017g0niwmx8qafsn9b01gp60j5fgwxch0dnkmjgpxxr1k4h1r64x"; depends=[xfun]; }; tiobeindexr = derive2 { name="tiobeindexr"; version="0.1.1"; sha256="09vw83hkf7lgd3xyhbmqkyv57g3dz856230xkf8630jiicfvcg3b"; depends=[rvest xml2]; }; 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]; }; @@ -13189,6 +13357,7 @@ in with self; { 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.40"; sha256="157m5jjkfd7g9aih5zylxzwkkdryj9l6yapgwjqydvwj6ab6k67l"; depends=[beeswarm plotwidgets tagcloud XML]; }; tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; }; + tmt = derive2 { name="tmt"; version="0.1.9-3"; sha256="0l4q21qq1srcfldwfwmc1w0wpi0zjpngpjrp6w287vgnqjc8y7kx"; depends=[ggplot2 Rcpp]; }; tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.0.2"; sha256="04bjdlrz82v9skirap2fmngi2sv9xakkgmkgpwdv3qshszvx3wz4"; depends=[]; }; 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]; }; @@ -13206,14 +13375,14 @@ in with self; { topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; }; topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; }; tor = derive2 { name="tor"; version="1.1.1"; sha256="0vibnjm0q8rn73c5xdbfw5z4pk4ja1m1mx9c6p423pz72znwrcpw"; depends=[fs readr rlang tibble]; }; - tosca = derive2 { name="tosca"; version="0.1-3"; sha256="16vxhqr3496s39gvmxqr1qgbvlsiycl2flvbxvi61pxzbm4fn3yw"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; }; + tosca = derive2 { name="tosca"; version="0.1-4"; sha256="1c7x89b2vh2xl5bc1xgclmnk2gajqalxmz4ipqlwp9axz91w85gs"; 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.1"; sha256="1ks49iaay0sz345cm77kv61mxsnin5dsggdjabcc4mnsgwh6k1sb"; depends=[data_table magrittr purrr stringr]; }; touch = derive2 { name="touch"; version="0.1-4"; sha256="0xz3mvwhyn7wbqhbfp2klrnf89gvsncrv5y7fmk9ym3nkq7z26cg"; depends=[Rcpp]; }; touchard = derive2 { name="touchard"; version="2.0"; sha256="0lbpli38ljv9nlw4gilanr1dwdwncykl59qnrk47zic6w0v4d6lm"; depends=[MASS nleqslv numDeriv plotrix]; }; tourr = derive2 { name="tourr"; version="0.5.6"; sha256="028pbprq1hjfbzvybpdkwi49arsg9r7ayjb52flw33szfqdpcimw"; depends=[MASS]; }; tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; }; - toxEval = derive2 { name="toxEval"; version="1.0.3"; sha256="0al05javwiy25jixpf3kinbdrx0b8v5j724328k0pd1zc7kngp29"; depends=[dplyr DT ggplot2 leaflet magrittr RColorBrewer readxl shiny shinyAce shinycssloaders shinydashboard tidyr]; }; + toxEval = derive2 { name="toxEval"; version="1.0.4"; sha256="1jz2d1wxw1jnyygsp34y3py8mwxjrnvj64smsifac32mvvi6ka5s"; 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=[]; }; @@ -13222,11 +13391,12 @@ in with self; { tracerer = derive2 { name="tracerer"; version="2.0.1"; sha256="0w8si9fgdh28swqba5jvb0zqgpkb33nq9vyq9rga83sfzn2wkik8"; depends=[jsonlite Rcpp testit]; }; tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; }; track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; }; - trackdem = derive2 { name="trackdem"; version="0.4.2"; sha256="0isd3cs10z6sqm8sh2q577z8bhnagq9gqsvdlsv377lk1z7wd1ln"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; }; - trackeR = derive2 { name="trackeR"; version="1.3.0"; sha256="0jx8dmb64gp0s56k3an4nhaqyi8w6acr7inz4rgx4k568adbb0ps"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; }; + trackdem = derive2 { name="trackdem"; version="0.4.3"; sha256="04gjvm4dxdy7nwaq6f0nbvqb2hbvmava5x6q5kvyy7snsr8mx25f"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; }; + trackeR = derive2 { name="trackeR"; version="1.5.0"; sha256="1bq3x1an0d6v0gnj71rs31f5f58j24rwyd1wymzmrhg2jhsi1dnh"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; }; trackr = derive2 { name="trackr"; version="0.10.5"; sha256="0cngwszax3i9p0095kxrz7w4rnryc0lmylckixzrmhx80qkxcaw1"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; }; tractor_base = derive2 { name="tractor.base"; version="3.3.0"; sha256="0i62dwra0yh565ryz75byfgqv22bqwz7138zs48w46yj2h8q9hyj"; depends=[ore reportr RNifti shades]; }; trade = derive2 { name="trade"; version="0.5.3"; sha256="0v0yw261daag0hw3sc7dh2bpm8sd3r46xbcbcbxv7qb59rad756w"; depends=[antitrust]; }; + tradestatistics = derive2 { name="tradestatistics"; version="0.1"; sha256="1vzmh3vplqv3v5nnn8416z1vp93wsnq6v1y9rql3gv36s4bm9ypc"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; }; trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; }; traitdataform = derive2 { name="traitdataform"; version="0.5.2"; sha256="1glk9k1n0zyqpnwsy7f7w4rzh5xlsw0db6fcf7ay04kpzjj0442b"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; }; traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; }; @@ -13249,7 +13419,7 @@ in with self; { 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]; }; treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; }; - treeclim = derive2 { name="treeclim"; version="2.0.0"; sha256="0hiba5xc6rp5zzka31k5klmlllpgbnla4pm920zk12jxn796953l"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; + treeclim = derive2 { name="treeclim"; version="2.0.3"; sha256="03d734zxz4vjrx7xw9r8y8lcsacn0p92q09n05vqfx4p7wvpwp26"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; }; treedater = derive2 { name="treedater"; version="0.3.0"; sha256="0aiqznj8mmxmwmw15m9n1c6wbjawlixwqh8ch735jjbhq737d1s4"; depends=[ape limSolve]; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; @@ -13294,16 +13464,17 @@ in with self; { truncreg = derive2 { name="truncreg"; version="0.2-5"; sha256="1scbjh5k1b8cjjavax08grlxdfs75s63dss0ifpz4d0axc4nm3iy"; depends=[maxLik]; }; trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; }; trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; }; - tryCatchLog = derive2 { name="tryCatchLog"; version="1.0.2"; sha256="0452xcfv98d2nfdhi9l2033s381lsa1kjghmrk05d3kc88d22np7"; depends=[futile_logger]; }; + tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.4"; sha256="0iahbm1zjgrb5x5awlvy1jgylw47p7qa1cxhrzg2mjknwpsd4vwm"; depends=[]; }; tsBSS = derive2 { name="tsBSS"; version="0.5.2"; sha256="00brzy0dkvdwrsf5jlpyp6ggwc2wkmdkb3l6h8fx1i3lmhnaqhkg"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo]; }; tsDyn = derive2 { name="tsDyn"; version="0.9-48"; sha256="01yqfd156ffnxy9wyd3s9vkpkc9n0davs1cq606sbpvvkmphnws3"; 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.2"; sha256="0lw4s7gxn4xldsk5f3dz27bb9jywa14195703b5q1497h9j966gk"; 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=[]; }; - tsbox = derive2 { name="tsbox"; version="0.0.3"; sha256="1dcfp0lg6fvhhkspgk9a41crnfq7gx50ll4a4a0qil795349srnj"; depends=[anytime data_table]; }; + tsbox = derive2 { name="tsbox"; version="0.1.0"; sha256="0zq7ph5mh200wjmwg5a3lqwv5ggbcsqd1cbby0zmnvjwdxri9s1v"; depends=[anytime data_table]; }; tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; }; tscount = derive2 { name="tscount"; version="1.4.1"; sha256="0bnzv06wxc1kzjlysljndsjimjsn3g8v6s1vbics1cwcs5jkjwr4"; depends=[ltsa]; }; + tsdb = derive2 { name="tsdb"; version="0.6-2"; sha256="1kr9dw1wiz376xzal0qn7733va7rf19y7hd3j8g6jjqfwz8vf78g"; depends=[datetimeutils fastmatch zoo]; }; tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; tsdf = derive2 { name="tsdf"; version="1.1-4"; sha256="0kjcfh7vrnyg2aqzr5kkzdccriy2h5x1byzhdhvyb68fi4fjf4dh"; depends=[gsDesign]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; @@ -13354,7 +13525,7 @@ in with self; { tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; }; tuts = derive2 { name="tuts"; version="0.1.1"; sha256="0mwc6lsnhxww041wh3020wz7w812asp1d6djv4n9pl7jil0kvkry"; depends=[coda doParallel foreach lomb mcmcplots rjags truncnorm]; }; tvR = derive2 { name="tvR"; version="0.3.0"; sha256="1pg13bvndqyyi2yl1bg3bkdh2xq060ihl25j3a91nahwasy3225m"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; - tvReg = derive2 { name="tvReg"; version="0.3.0"; sha256="16z032j5wxyvgc29m8sgh4wcvsdam6a0srjwym52885rdslbkmjy"; depends=[bvarsv MASS Matrix systemfit vars]; }; + tvReg = derive2 { name="tvReg"; version="0.4.0"; sha256="0af00arbrirskk9d3zry83vzasr65lc68kq13ck3x13r3gpnk8r0"; depends=[bvarsv MASS Matrix systemfit vars]; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; }; tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; }; twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; }; @@ -13377,7 +13548,6 @@ in with self; { 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.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; }; uavRmp = derive2 { name="uavRmp"; version="0.5.4"; sha256="0djx6z9489pr03bf01y2d79ar840q4ffj39j72c8phz27yz40y04"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; }; - uavRst = derive2 { name="uavRst"; version="0.5-2"; sha256="0hsm3469jfyll4vwvzy5zc64mgb7q4ddih5h9k6d3jjh40yb47jc"; depends=[foreach raster Rcpp]; }; ubci = derive2 { name="ubci"; version="0.0.3"; sha256="0pczbasicng6zl44kh61jcx8mbmg2na14q2lni10z1liwwk3swsp"; depends=[dplyr httr lubridate magrittr tibble tidyr]; }; ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; uclust = derive2 { name="uclust"; version="0.1.0"; sha256="0b4cj1np4b7m3nfk3crisw9qznk86lbh7x9xb70lwjmcjjgxkw8q"; depends=[dendextend robcor]; }; @@ -13388,8 +13558,9 @@ in with self; { ufs = derive2 { name="ufs"; version="0.2.0"; sha256="1z7vwlk01nxz55zfs30scx7crldf9ic7rklpw8rh4vk7p755nzk2"; depends=[BiasedUrn dplyr ggplot2 ggridges gtable pander scales SuppDists viridis]; }; uiucthemes = derive2 { name="uiucthemes"; version="0.2.1"; sha256="1l96mch9r5npsdv1v4qfyj43ana7a2ff7yj04q6fzhh27v0fx7ak"; depends=[rmarkdown]; }; ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; - ukbtools = derive2 { name="ukbtools"; version="0.11.0"; sha256="0ww8knrivykk8zx0mqc0bg9f1m64psdpjcxvdn4alhs88ywc71cf"; depends=[data_table dplyr ggplot2 magrittr plyr purrr readr scales stringr tibble tidyr XML]; }; + ukbtools = derive2 { name="ukbtools"; version="0.11.1"; sha256="0wm8lllpqnwsp4q12argixxvcc81vj65w9iyrxgrjdn5zkip5lpp"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.15"; sha256="051bavhsqybg0m1nkv52k9vy5a80aanas146ndx0k9dn2mqmpsw7"; depends=[RCurl XML]; }; + ukpolice = derive2 { name="ukpolice"; version="0.1.2"; sha256="0jwc57360cr9fkqzs5j2jmnfagci86jzi6p5d5mpm35drsrzm1ca"; depends=[jsonlite purrr tibble]; }; umap = derive2 { name="umap"; version="0.2.0.0"; sha256="1qdq3isrv6dqz462sfwk1albbs6h8lcnqidhwr1jxa09bwinhk7q"; depends=[Rcpp reticulate RSpectra]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; umx = derive2 { name="umx"; version="2.9.9"; sha256="157zbr7vgy85f25z46kpry4k4wxb3vf3am13n9xcnsmk63xim12s"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; }; @@ -13402,13 +13573,14 @@ in with self; { ungroup = derive2 { name="ungroup"; version="1.1.1"; sha256="0jrxxp93ak9bva98j3nmkhrb7znz7lpywk56415k4b2rzpy3j7fs"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; }; 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.1"; sha256="1zf2pclddswrssil7ikq75449ks3070jxkzy2lmggq9gyipdypps"; depends=[gmp graph]; }; - unifed = derive2 { name="unifed"; version="1.0.1"; sha256="1rxraj89l1ky8iwpa6z7i14hfm5m64bb65pa0kzzm6lawdpc3jhn"; depends=[]; }; + unifDAG = derive2 { name="unifDAG"; version="1.0.2"; sha256="0az9knspvf49mvp41m64lpm1a0nzvkygg957pb81mm9kh6cjbhfs"; depends=[gmp graph]; }; + unifed = derive2 { name="unifed"; version="1.0.2"; sha256="16gjr1hkb8aqhas6ngyyhs29ws04klrhianj5hbdd6b0mmzl5jjc"; depends=[]; }; uniformly = derive2 { name="uniformly"; version="0.1.0"; sha256="0n3s0x05v4d79jn51nwj06gm074rgy269f57y2q5z0bkwyp6yc7n"; depends=[pgnorm]; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; }; + unine = derive2 { name="unine"; version="0.1.0"; sha256="0fjx8761jnwri0sqbcz5r50sbsig4qb1sj444grq8c0ibkkgyq6c"; depends=[Rcpp]; }; uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; unitedR = derive2 { name="unitedR"; version="0.3.1"; sha256="06plbhjbn1gflpxarn21knhiwfr02vxprak9qcghl30fkkymd02r"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.6"; sha256="1dpi1zqd8aiwg6vlsgwl0gnhl3n09i72i0g0wg7w4z3syk7sgybi"; depends=[crayon diffobj]; }; + unitizer = derive2 { name="unitizer"; version="1.4.8"; sha256="1q2l32lkxv87vaih5wqfn6n2a2q6mlaw83mgrn4g5ircp5z3r98j"; depends=[crayon diffobj]; }; units = derive2 { name="units"; version="0.6-2"; sha256="0w7iwp8c66d5gj4rsb8c87vb0ja39hym6fmfnqaqwb3is1snfa2y"; depends=[Rcpp]; }; unittest = derive2 { name="unittest"; version="1.3-0"; sha256="0haf3s3pc5bhsm6y5njghr9w8ifsjxczm5r7g0ynylwzvd019n8b"; depends=[]; }; univOutl = derive2 { name="univOutl"; version="0.1-4"; sha256="041cc1jn95zababc4i84c378i204zkn865k2vd7mk1piwm3qkrj5"; depends=[Hmisc robustbase]; }; @@ -13416,7 +13588,7 @@ in with self; { unix = derive2 { name="unix"; version="1.5"; sha256="0sgm1gzfkfilrsgmv567ld79azmfk076xl998sv139kh9dvwgsyx"; depends=[]; }; unjoin = derive2 { name="unjoin"; version="0.0.3"; sha256="08vjgl4dnh9kycrvdq5ngf57fy61n0nc582bi4znv06pq696rkwp"; depends=[dplyr rlang tibble]; }; unmarked = derive2 { name="unmarked"; version="0.12-3"; sha256="0cbi3saga4g39x68xxhvk07wd0qwjx9jih3g5lhz0zidz4fp3g40"; depends=[lattice Matrix plyr raster Rcpp RcppArmadillo reshape2]; }; - unpivotr = derive2 { name="unpivotr"; version="0.5.0"; sha256="1w0gc15wy9901nb9l2srqbanpcs5zy7bhrmzlqbqhrpa1rdsbf2f"; depends=[cellranger dplyr forcats magrittr pillar purrr rlang tibble tidyr xml2]; }; + unpivotr = derive2 { name="unpivotr"; version="0.5.1"; sha256="0j2q98xm3gg3mscn9ckl4pcihwc4p5gn4sk5sr1nqi4ghc047qaf"; 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.3"; sha256="06v6hjpbybv07vqfq23i2s6j0ic035vnm0i4wfqgiw0pw6c85242"; depends=[sys]; }; unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; @@ -13433,7 +13605,7 @@ in with self; { urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; }; urlshorteneR = derive2 { name="urlshorteneR"; version="0.9.2"; sha256="1y5n1rn2c7yj5ncxfnsrj9lvaam2j3vvx8ld1vqyjay1r8flzifd"; depends=[httr jsonlite stringr]; }; urltools = derive2 { name="urltools"; version="1.7.2"; sha256="18lp66f2l504b8q3j4xy8j9pyzzlljw9f112sn6qii1cg83072wm"; depends=[Rcpp triebeard]; }; - uroot = derive2 { name="uroot"; version="2.0-9"; sha256="0nxc8d4v9v5z3wbnj325iq2yrh0mipqgg2rn8pp2jyyq9vb1cxlv"; depends=[]; }; + uroot = derive2 { name="uroot"; version="2.0-9.1"; sha256="16wi1dhsb2vb11xgckbdf38043xx47vmsnisvddv7qhqc6dzbdpp"; depends=[]; }; usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; }; usedist = derive2 { name="usedist"; version="0.1.0"; sha256="17mldp0888ig2xc8cp1nhldj5g3srwmbx3mfcnzz21n1fz31jkmg"; depends=[]; }; useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; @@ -13448,9 +13620,10 @@ in with self; { utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; }; utility = derive2 { name="utility"; version="1.4.3"; sha256="12g2y9xzzi2sl3ya3va1p7nc7hrjhr4arsz06f8xlxw5n8kvdxag"; depends=[]; }; utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; }; - utiml = derive2 { name="utiml"; version="0.1.4"; sha256="1z93a7ldgkab6hsa9a0hzyhxsbac45sgqn7fy2jh615d2kw7pqr1"; depends=[mldr]; }; + utiml = derive2 { name="utiml"; version="0.1.5"; sha256="02wxsg1gg2y83cii5ly7r8lk376kas261f9qyl03z55p5m72w9zy"; depends=[mldr ROCR]; }; uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; }; uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.7"; sha256="0lihcjd79sqnw64bd2d4p02rl7fmzpyykrdi7b5dsnnwjhr0ks6r"; depends=[Exact geepack plyr sandwich survival]; }; + uwot = derive2 { name="uwot"; version="0.1.2"; sha256="033d291bqvx3r3si3j1y38lhczhk1n71i5h2s5v6l40s6dmyrlg4"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppParallel RcppProgress RSpectra]; }; vMask = derive2 { name="vMask"; version="1.0"; sha256="14zfmgidlvlmm9anjcz3wvz4crc24ysq7jj1j1078fp7px5vvr8z"; depends=[]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; vaersvax = derive2 { name="vaersvax"; version="1.0.5"; sha256="0bfbpdjnykvb9r0p28bz8lrqxksy4jvwnd28y6gdlprpisiipiic"; depends=[]; }; @@ -13478,7 +13651,7 @@ in with self; { varbin = derive2 { name="varbin"; version="0.2.1"; sha256="0gcynwc0vx7qlp3z0pcc4i7mjlnxkwy8ydxz2wr244fw32qgp4kq"; depends=[rpart]; }; varbvs = derive2 { name="varbvs"; version="2.5-16"; sha256="0pji7vqpbih01y7n0q6zpxhfszznzig4z3hmmpr4jqpdplv13x8d"; depends=[lattice latticeExtra Matrix nor1mix Rcpp]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; - vardpoor = derive2 { name="vardpoor"; version="0.14.0"; sha256="0j1rrrrfgck9896zs5ll8x59pb0qrg80x8yvpzlnv9wxjq1h438p"; depends=[data_table foreach ggplot2 laeken MASS plyr pracma stringr surveyplanning]; }; + vardpoor = derive2 { name="vardpoor"; version="0.15.0"; sha256="1zz3gqri7g24wbz1b76qmsl8s79ry7vdi0dj77hd6zncdgch1bzv"; depends=[data_table foreach ggplot2 laeken MASS plyr pracma stringr surveyplanning]; }; varhandle = derive2 { name="varhandle"; version="2.0.3"; sha256="11yisjgqc8fq0sj1kzgp51i926cs4yqkpfmbis5ak786wqalc6na"; depends=[]; }; variables = derive2 { name="variables"; version="1.0-1"; sha256="05bqhkzava24z7dqg79vf9144d226rr5mby6ry32lqyx7w0gql9x"; depends=[]; }; varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; @@ -13510,7 +13683,7 @@ in with self; { vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; vegperiod = derive2 { name="vegperiod"; version="0.2.5"; sha256="1icjv3z8bfl2yl1pkr3kbs34q2yqv65aadw40jzrd98djdprzkni"; depends=[]; }; vegtable = derive2 { name="vegtable"; version="0.1.4"; sha256="1gk80i4gi98nigiya4n8ng8d2y7l3j63i1ijg4g80nfr5w64qh5w"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; }; - vein = derive2 { name="vein"; version="0.6.0"; sha256="1hss9rjvpw5dir1nz2yw7h87rf14ib95piwj26ihhh9kcgg3fldh"; depends=[data_table eixport sf sp units]; }; + vein = derive2 { name="vein"; version="0.7.0"; sha256="0b5vnv1bdxylsc1j2vh6l1vgdpih92ibzllwcp26wprd2rjdmkdr"; depends=[data_table eixport sf sp units]; }; velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; }; velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; }; vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; }; @@ -13523,7 +13696,7 @@ 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.6"; sha256="02sa0l4dh0n066y0ls377dh6q4fdhlx2jj80gk5c5x9l5ms649xk"; depends=[]; }; + vetr = derive2 { name="vetr"; version="0.2.7"; sha256="1gwaa5wz675g6hgifwvskix929ar1jk2h0gpfyhxifzdb6dp2mw4"; depends=[]; }; vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; @@ -13539,12 +13712,13 @@ in with self; { 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=[]; }; virtualspecies = derive2 { name="virtualspecies"; version="1.4-4"; sha256="04byc39id5vn22h06b0yqb08bxnpsfdgig4v5r8hjv240c0p8q91"; depends=[ade4 raster rworldmap sp]; }; + virtuoso = derive2 { name="virtuoso"; version="0.1.3"; sha256="12rpqrhsj0n3f360w2gh1mwjjd6w9mv42116z86zaxvic8hf5694"; 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.5"; sha256="1q0dgdv5nxfyb5xakll61y1klyd2js36f3rzipng89nl0v5almqz"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; + visNetwork = derive2 { name="visNetwork"; version="2.0.6"; sha256="1an8x40hpj7qz370i6gxnyy009kbpji10lidxxlnai5glbk7h97c"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; }; visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; }; visreg = derive2 { name="visreg"; version="2.5-0"; sha256="0n19k6rsmpqga6r8lyhjviqs3nw881dhr211621m2cl7knqhhi4y"; depends=[lattice]; }; - vistime = derive2 { name="vistime"; version="0.8.0"; sha256="0dlmi1p34sbhlmv858wdfkw9ad9z5mm9b4j5pyma44ralkah9h3h"; depends=[plotly RColorBrewer]; }; + vistime = derive2 { name="vistime"; version="0.8.1"; sha256="0nm7sdbj99nlb46rfs5w2k62v1iikfymmz934rb21rn7cj8hs99p"; depends=[plotly RColorBrewer]; }; 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]; }; visualR = derive2 { name="visualR"; version="1.0.0"; sha256="0jj7lha259kai79kak2ic1avp5yclphzf6q4bn3yzl23nppb8k3q"; depends=[optionstrat plotly]; }; @@ -13578,7 +13752,8 @@ in with self; { 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]; }; vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; }; - vtreat = derive2 { name="vtreat"; version="1.3.7"; sha256="0y680808ss8n2nklib22f4i9h0y7d5rqlcifd6fs4nmw81vgk4hj"; depends=[wrapr]; }; + vtable = derive2 { name="vtable"; version="0.3.0"; sha256="0dp19kgqydhnd11rbbf0zkw5si4pzj6l2sch0z2j0v6l374aqhb4"; depends=[sjlabelled]; }; + vtreat = derive2 { name="vtreat"; version="1.3.8"; sha256="118yafpinkgrmavlac5ryc40vgn7dcd83cijldh84i0khrc1102a"; depends=[wrapr]; }; vtree = derive2 { name="vtree"; version="1.0.0"; sha256="1bvl3j2xnl59l9hn7cygv2vmjw98w1pzag01w9qwchxqzk56yi7g"; depends=[DiagrammeR DiagrammeRsvg rsvg]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; }; @@ -13593,6 +13768,7 @@ in with self; { waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; }; 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.0.1"; sha256="1zl95v01qbnrs7nh2rcmhjny57wvfylzrdm7gpyyxj753mzwla6b"; depends=[shiny]; }; wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; }; walkalytics = derive2 { name="walkalytics"; version="0.1.0"; sha256="1kl6kwwnl67d45akna01xp389wjxsxlc84l0bcpadbipsqyb3kd1"; depends=[base64enc dplyr httr purrr sp stringr tibble]; }; walker = derive2 { name="walker"; version="0.2.5"; sha256="0y2g0pqv2147x6sa5ksyaj6hg6zs14z935cyw06vxc6bbia2isw6"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; }; @@ -13609,6 +13785,7 @@ in with self; { wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; }; 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.0"; sha256="1vyg2h8fcld2nj5v5hlsrshp5l29v6jlpbypkic06vsvnrsy98lv"; 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]; }; @@ -13656,7 +13833,7 @@ in with self; { welchADF = derive2 { name="welchADF"; version="0.3"; sha256="0k2di5fwh5jv87mw4bjnhbk2rmhf2v2f5ksjr5dgnyhnawwxqq97"; depends=[lme4]; }; wellknown = derive2 { name="wellknown"; version="0.5.0"; sha256="1y3hi5ajqaxx3s40cx24ayfcd3c6d1ydlhsm0gg2fxgmidm6bhwy"; depends=[jsonlite V8]; }; wesanderson = derive2 { name="wesanderson"; version="0.3.6"; sha256="09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2"; depends=[]; }; - wevid = derive2 { name="wevid"; version="0.5.2"; sha256="0275vf49ryw6ljpibz138xci236bhqvwz59nc33qplqvankfsgcs"; depends=[ggplot2 pROC reshape2 zoo]; }; + wevid = derive2 { name="wevid"; version="0.6"; sha256="17h8735qxppzkb7j6agdag4ylhvn5g02did51f2jx0cn6yzxfpy5"; depends=[ggplot2 mclust pROC reshape2 zoo]; }; wfe = derive2 { name="wfe"; version="1.8"; sha256="18fdw0vmddsf2vgsgm8szn6zqvqk29cqr8gi75w0m61x9bachvkh"; 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]; }; @@ -13668,7 +13845,7 @@ in with self; { whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; 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]; }; - whoami = derive2 { name="whoami"; version="1.2.0"; sha256="1b1zvbvmyh979fq72qa5k83888wpfr44l0qjz0pgdlad1li0nfnc"; depends=[httr jsonlite]; }; + 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]; }; wicket = derive2 { name="wicket"; version="0.4.0"; sha256="1lizzmj69bswzlk18fv2v4yxxc6dynvmkymdiafznzcyyz4a8xnf"; depends=[BH Rcpp]; }; widals = derive2 { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; }; @@ -13678,7 +13855,7 @@ in with self; { wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; }; wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; }; - wikisourcer = derive2 { name="wikisourcer"; version="0.1.2"; sha256="0p8wv2r6nfry2plnl55izifhxya30jjz6c4zgnaq6jk6hzr8zcvr"; depends=[dplyr purrr rvest stringr urltools xml2]; }; + wikisourcer = derive2 { name="wikisourcer"; version="0.1.4"; sha256="0x6yp7hmrasrxpwlbsabzrr316d5yxynafmv0jh6yhx4i36l08wf"; depends=[magrittr purrr rvest tibble urltools xml2]; }; wikitaxa = derive2 { name="wikitaxa"; version="0.3.0"; sha256="0v681qac33dlcdlah20qf5qb9g5h917rpzv67brx1handjnapnqh"; 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.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; }; @@ -13725,7 +13902,7 @@ in with self; { 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]; }; wrangle = derive2 { name="wrangle"; version="0.5.1"; sha256="13a1xglbdagzf4jks7ac2xnsqp176jvymdbqycldp2hg0mjvpcjz"; depends=[dplyr lazyeval magrittr rlang tidyr]; }; - wrapr = derive2 { name="wrapr"; version="1.8.4"; sha256="1kci2v1hr6mxpi33i6jvlfcs96063zjvgwi2zrbjzfh1ayq0700v"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="1.8.6"; sha256="182xh4laia2wlvpdpzqgsybwh7n7rscq14iq31md2f6brrf54rvn"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="0.1.8"; sha256="052x0lxpchr6f97yfj3vmhh8gc8qg5pp1m91h5akrav4yfawbs7k"; depends=[]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="1.1"; sha256="0w4wnpl3yhaqp63p32bk60xrbmd7xd11kxifjbzrghi7d4483a46"; depends=[]; }; @@ -13734,7 +13911,7 @@ in with self; { wru = derive2 { name="wru"; version="0.1-9"; sha256="0xrm3f1khggcvdzzk65mnbfcyji3kjz8hrk9d2n4y15nhpbw8p8h"; depends=[devtools]; }; wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; }; wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; }; - wsyn = derive2 { name="wsyn"; version="1.0.0"; sha256="05l3r75nydnmf02j6c6sj4sx85rz6hvlll8pw25j5kzkq1mlgypa"; depends=[fields MASS]; }; + wsyn = derive2 { name="wsyn"; version="1.0.1"; sha256="1lsaah5dndg1myx3qgbm4hih2wr1zgjfaracnyljfrri2cb436n6"; depends=[fields MASS]; }; wtest = derive2 { name="wtest"; version="3.1"; sha256="1rlas9jn57mcyjic9dhkqj355djldc95q07b076w847cd4pmzqvb"; depends=[]; }; wtss = derive2 { name="wtss"; version="1.1.0"; sha256="019zvmq4z5xy5dwcf4g0z43x2mb14d1lgqhs1zp6821izffpbd0s"; depends=[jsonlite lubridate RCurl roxygen2 zoo]; }; wunderscraper = derive2 { name="wunderscraper"; version="0.1.0"; sha256="1h9nhxvs673n2ivw466qm77k20541cwgmmq35iv3dcb3hvw36p0r"; depends=[httr jsonlite sf tigris]; }; @@ -13744,7 +13921,7 @@ in with self; { x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; 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-1"; sha256="1v6slh5136av3l7bk99a57gj6i6khx2j55qv4pyz1zmrzzgaayyc"; depends=[]; }; - x3ptools = derive2 { name="x3ptools"; version="0.0.1"; sha256="16kms5hbpa5hz5i0pdwx49yp2hmhyr8hd4w672vmwi94s5d84i1q"; depends=[digest rgl xml2 zoo]; }; + x3ptools = derive2 { name="x3ptools"; version="0.0.2"; sha256="1a3vdljd51kvd70mq9cr84r536zmby7vkd36a02z2sxabq03cl9s"; depends=[assertthat digest png rgl xml2 zoo]; }; xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; }; xROI = derive2 { name="xROI"; version="0.9.13"; sha256="0687cg113ykslsky1lln2mf097flzjkpyw0hvgzd9dzqc14vpzki"; depends=[colourpicker data_table jpeg lubridate moments plotly raster RCurl rgdal rjson shiny shinyAce shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyTime sp stringr tiff]; }; xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; }; @@ -13755,9 +13932,10 @@ in with self; { xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; xergm = derive2 { name="xergm"; version="1.8.3"; sha256="155469550rsdwszrhw7vdgwz2h0d72a8f4hirrb6hny7f1q63ykk"; depends=[btergm GERGM rem tnam xergm_common]; }; xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; }; - xesreadR = derive2 { name="xesreadR"; version="0.2.2"; sha256="1y7iilqdj9jv5snzylihs996hvpcj9s3yaiy7wr20m5yh1ngwkvj"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; - xfun = derive2 { name="xfun"; version="0.5"; sha256="1wkrapc490r9l9z6mz623zn9ijq64mckc17xg2s7n3s9yaxj98lb"; depends=[]; }; - xgboost = derive2 { name="xgboost"; version="0.81.0.1"; sha256="1knpks51z7kz7n70mxpzdk3i8w4j92wxmbxfj1ffm0b8wqrdlyiy"; depends=[data_table magrittr Matrix stringi]; }; + 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.6"; sha256="123wmnykmlq9prqx1g9ij9vyqx25pib2jnqjrwy39rfmzbsypbx3"; depends=[]; }; + xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; + xgboost = derive2 { name="xgboost"; version="0.82.1"; sha256="0plhx63wcm4syslzmjfv6bdgaqn96fnav048hrj0vxk4dzgfp8sq"; depends=[data_table magrittr Matrix stringi]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; xkcd = derive2 { name="xkcd"; version="0.0.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; }; @@ -13776,6 +13954,7 @@ in with self; { xopen = derive2 { name="xopen"; version="1.0.0"; sha256="1vrvgdika1d63dwygynbv2wmd87ll8dji5dy89hj576n8hw601z2"; depends=[processx]; }; xplain = derive2 { name="xplain"; version="0.2.1"; sha256="01hl9dxiqqxzdixqccga0sywlhv97pi1l51r9sr7v106s7q11jxn"; depends=[RCurl readr XML]; }; xplorerr = derive2 { name="xplorerr"; version="0.1.1"; sha256="17h8z9rmqkmm6lm9gipa33mr7zxpzd5xbjk251592mwr79lwsh8n"; depends=[magrittr shiny]; }; + xpose = derive2 { name="xpose"; version="0.4.4"; sha256="0ps9v2iiygrzpj1zvw0xbg0cscpvsph3b2w2cv4m602iwkd6372r"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; xpose4 = derive2 { name="xpose4"; version="4.6.1"; sha256="1722ai8r94dmy4d2r728iir0hl2b2gmym8xjsqscfc6jw070734i"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; xptr = derive2 { name="xptr"; version="1.1.1"; sha256="1xjmplalf5w7iqkc5dk57g7lvx4jlndg4b2hvqpn05g628bxxdx2"; depends=[]; }; xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; }; @@ -13785,12 +13964,12 @@ in with self; { xspliner = derive2 { name="xspliner"; version="0.0.2"; sha256="07niy8dl4fcp1pv8dl4h9vyw8slxvhjj7qc5x7ywabyfh140pvyh"; depends=[dplyr ggplot2 magrittr mgcv pdp purrr tidyr]; }; xtable = derive2 { name="xtable"; version="1.8-3"; sha256="09f311gq9g7dzf8jdvcx72j11xb7p00jlg066jjbpa6pz3zv1cjk"; depends=[]; }; xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; }; - xtensor = derive2 { name="xtensor"; version="0.9.0-0"; sha256="18v653pjqr1hnv6mmrfxvlssx83245dzhg8772s6m80awkzzljpj"; depends=[Rcpp]; }; + xtensor = derive2 { name="xtensor"; version="0.10.1-0"; sha256="0bk4c8i1j3pzzcwjix2c5m0wd5fl0232kg8xw1c3l9hrapdgsf63"; depends=[Rcpp]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; xtractomatic = derive2 { name="xtractomatic"; version="3.4.2"; sha256="1w70kk608avnf7zdjx79gxqmj12cw86ma4x0b9j92md1vmpw5389"; depends=[dplyr httr ncdf4 readr sp]; }; xts = derive2 { name="xts"; version="0.11-2"; sha256="1f0kxrvn13py3hk2gh2m56cqm39x3bqp1i350r5viddacrm2yxqj"; depends=[zoo]; }; xwf = derive2 { name="xwf"; version="0.2-2"; sha256="1psryam65pg7flfa20smm6lx184f76dhjv1lig8sy7y9hphfv3s1"; depends=[mgcv]; }; - xxIRT = derive2 { name="xxIRT"; version="2.1.1"; sha256="1y21yc840kq98sy06qcnlnzizv5aya5yllx4mjx9njv7mvcsp1wr"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; }; + xxIRT = derive2 { name="xxIRT"; version="2.1.2"; sha256="0b8yv8ixmcjiv9hlvpfdknx815smy7df7f2ixifnvhxxafgf1fwq"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; }; xyloplot = derive2 { name="xyloplot"; version="1.6"; sha256="0d1dv3syfjwcp9fil9bl1my19d0kdyz1qrp1yf7ykrk8aq91762v"; depends=[]; }; xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; }; yaImpute = derive2 { name="yaImpute"; version="1.0-31"; sha256="0088i9rlpkxb42xp11cr0h2ql9k581qvnz4ppldrnqci8c1qdpff"; depends=[]; }; @@ -13810,6 +13989,7 @@ in with self; { ypr = derive2 { name="ypr"; version="0.3.0"; sha256="0smbr8zbyydrp82p04k64w9kxvx6i99xb06yh1zfapz4zqv32hac"; depends=[checkr ggplot2 scales]; }; yuima = derive2 { name="yuima"; version="1.8.1"; sha256="1jzk3623c1cpw9j8d9b96x6n0jwz8h2izzhrdp01cwwskbnv3hq2"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; }; yuimaGUI = derive2 { name="yuimaGUI"; version="1.3.0"; sha256="1znwfkhnmv9m32izikziqpgxx8gpw50786r81va808x7q058cp5n"; depends=[DT ggplot2 ghyp plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; + 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.2.0"; sha256="0h5b4d2v4xjv4bypbzwabpk4dxy9i92p2vl0b8jn5adc367912k6"; depends=[MASS NADA truncnorm]; }; zTree = derive2 { name="zTree"; version="1.0.6"; sha256="1mywxrx6bw7dzhrdwyxbjzc8ikgvw423zycyji0jjr69cfhpmywv"; depends=[plyr]; }; @@ -13819,12 +13999,12 @@ in with self; { zeitgebr = derive2 { name="zeitgebr"; version="0.3.3"; sha256="1g2bqc1xx42q54i6ck0ihpxkzw3hmxqn3cvv416afjc0cm45zw8d"; depends=[behavr data_table lomb pracma]; }; zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; - zenplots = derive2 { name="zenplots"; version="0.0-3"; sha256="1ba9xv522knzbirl6ac5hzbmsw8ignsmymbkps2w057w0fsc9iyz"; depends=[graph MASS PairViz]; }; + zenplots = derive2 { name="zenplots"; version="0.0-4"; sha256="0fr9jxqwnbds2grysyz6j129043dfaakwy6gnsb0c7d2iigj9wjy"; depends=[graph MASS PairViz]; }; zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; }; zetadiv = derive2 { name="zetadiv"; version="1.1.1"; sha256="0laxp2pd5s0s9wcnvs1r4shid2gi8ap4y9py6gpl207ywq6cxmgz"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; }; zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; }; - zip = derive2 { name="zip"; version="2.0.0"; sha256="0a86x6a2cy0lkx98yljk9acb6q3ksz9y5acfaqnmbvnn77pibg86"; depends=[]; }; + zip = derive2 { name="zip"; version="2.0.1"; sha256="0cchbzp2s2qz7r4n9qdwgfgik5xzr0dzxmj25r8435i85k86ysi1"; depends=[]; }; zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; }; zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; }; @@ -13832,8 +14012,7 @@ in with self; { 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=[]; }; zoib = derive2 { name="zoib"; version="1.5.1"; sha256="0lsyr8hfhk4dk129x2l1793v6nmf2k97wnsc44ir6ymip3i4zfld"; depends=[abind coda Formula matrixcalc rjags]; }; - zonator = derive2 { name="zonator"; version="0.5.9"; sha256="04gjrm9nxnxsigrc30zghmv37ijsx27134hfnrbm51smw2y60dm4"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; }; - zoo = derive2 { name="zoo"; version="1.8-4"; sha256="1pywcp86kqijdrvl42qwdy75szrag9pzj0p88zbrj2r1klb8rn5i"; depends=[lattice]; }; + zoo = derive2 { name="zoo"; version="1.8-5"; sha256="09p8gmd5ifz80ahnhiianarsr5xx3nz76jzp90d7v3fjffcrcww7"; 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]; }; diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix index 5d8d7d562259..e571c72232c7 100644 --- a/nixpkgs/pkgs/development/r-modules/default.nix +++ b/nixpkgs/pkgs/development/r-modules/default.nix @@ -569,7 +569,6 @@ let "OligoSpecificitySystem" "onemap" "OpenRepGrid" - "palaeoSig" "paleoMAS" "pbatR" "PBSadmb" @@ -633,7 +632,6 @@ let "rgl" "RHRV" "rich" - "rioja" "RNCEP" "RQDA" "RSDA" diff --git a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 7b7dab1481e7..53506ffe8da8 100644 --- a/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips, taglib +, file, libvirt, glib, vips, taglib, libopus , libselinux ? null, libsepol ? null }@args: @@ -275,6 +275,15 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; + opus-ruby = attrs: { + dontBuild = false; + postPatch = '' + substituteInPlace lib/opus-ruby.rb \ + --replace "ffi_lib 'opus'" \ + "ffi_lib '${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + }; + ovirt-engine-sdk = attrs: { buildInputs = [ curl libxml2 ]; }; @@ -427,6 +436,13 @@ in buildInputs = [ taglib ]; }; + thrift = attrs: { + # See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125 + # Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd. + buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0") + "--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\""; + }; + timfel-krb5-auth = attrs: { buildInputs = [ kerberos ]; }; diff --git a/nixpkgs/pkgs/development/ruby-modules/gem/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem/default.nix index c881d4eb4744..7b92a586b54c 100644 --- a/nixpkgs/pkgs/development/ruby-modules/gem/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/gem/default.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { '${version}' \ '${lib.escapeShellArgs buildFlags}' \ '${attrs.source.url}' \ - '${src}' \ + '.' \ '${attrs.source.rev}' ''} diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix index 68422f09a4f4..05c3edc66d62 100644 --- a/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.6.4"; + version = "1.6.6"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "16mx2394wmm4jvy26rlp46mb2nf8cayvxclpa6fn0sb4klqs7mc2"; + sha256 = "1w4vk8zq57b6flp2cpjlkicz4h8bca215669w065zqhfxlpxma2g"; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 604e44cf7b14..be81673f2128 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.18"; + version = "8.19"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1l9dqihl73yi3k27j2a1k87gqzs64z0mpwxj6w68ipvxf4rg63x5"; + sha256 = "107x4ij99igq54f0mdqvv8adl2rh694b8ylf3jz090raqa0d2nyk"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 9759bb532c8d..5e3b001b6a08 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "04al9jnaxgh8la6s2pzzpzm6pyfc5c6g7pc8cwz4xcngbsw60cpn"; + sha256 = "1y6mdm7ph9k3vv8n8hzxr3rqa6bfkh4yn9bcxb7qq67v08dlvx6r"; }; installPhase = '' @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = https://flow.org/; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; - maintainers = with maintainers; [ puffnfresh globin ]; + maintainers = with maintainers; [ marsam puffnfresh globin ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 9219698b2df0..c80a14063a59 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -110,21 +110,21 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "21238"; - gittap = "3.3.0"; - gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; - rev = "3.3.0"; - version = "3.3.0"; - sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; + version_commit = "21276"; + gittap = "3.4.1"; + gittip = "da30e593718d5149f2a3d520c7f79fe1c7ca46ef"; + rev = "3.4.1"; + version = "3.4.1"; + sha256 = "02qfj11j8f37hl46m8h4x9pv161glgdr7q3rfhwmq46px9y7f17p"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "21238"; + version_commit = "21276"; gittap = "3.3.0"; gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; rev = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; - version = "3.3.0"; + version = "2019-02-19"; sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; diff --git a/nixpkgs/pkgs/development/tools/apktool/default.nix b/nixpkgs/pkgs/development/tools/apktool/default.nix index c811b8a99e91..d9d70f64d73e 100644 --- a/nixpkgs/pkgs/development/tools/apktool/default.nix +++ b/nixpkgs/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "apktool-${version}"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "07fwp5sczyivdz37ag9fa258gr9jbz3k3395hp5db7cwizaip2vm"; + sha256 = "1hdwgsw3ggmdzv523wq037kjxhxqp1xq8n8m1qb22vvdj7l1dwd0"; }; phases = [ "installPhase" ]; diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 8778084163e8..a63395efda87 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -2,43 +2,79 @@ , python }: -with python.pkgs; +let + py = python.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "6.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; + }; + }); + + requests = super.requests.overridePythonAttrs (oldAttrs: rec { + version = "2.20.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"; + }; + }); + + idna = super.idna.overridePythonAttrs (oldAttrs: rec { + version = "2.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; + }; + }); + + six = super.six.overridePythonAttrs (oldAttrs: rec { + version = "1.11"; + src = oldAttrs.src.override { + inherit version; + sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + }; + }); + }; + }; + +in + +with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.5.0"; + version = "0.14.2"; src = fetchPypi { inherit pname version; - sha256 = "2acf9517f467950adb4939746658091e60cf60ee80093ffd0d3d821cb8a1f9fc"; + sha256 = "b7f80838d57c1096a9a03ed703a91a8a5775a6ead33df8f31765ecf39b3a956f"; }; # Tests are not included in the PyPI package doCheck = false; propagatedBuildInputs = [ + aws-lambda-builders aws-sam-translator - boto3 + chevron click cookiecutter dateparser docker - enum34 flask - python-dateutil - pyyaml + idna + pathlib2 + requests + serverlessrepo six ]; - postPatch = '' - substituteInPlace ./requirements/base.txt \ - --replace 'aws-sam-translator==1.6.0' 'aws-sam-translator>=1.6.0'; - ''; - meta = with lib; { homepage = https://github.com/awslabs/aws-sam-cli; description = "CLI tool for local development and testing of Serverless applications"; license = licenses.asl20; - maintainers = with maintainers; [ andreabedini ]; + maintainers = with maintainers; [ andreabedini dhkl ]; }; } diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix index c48954a6aaa3..cde6ea2f7a87 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.6.0"; in +let version = "3.6.1"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0ds61yy6hs7jgmld64b65ss6kpn5cwb186hw3i4il7vaydm386va"; + sha256 = "1rv97g9qr6sifl88rxbsqnz5i79m6ifs36srri08j3y3k5dc6a15"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix index d9dc59ee72df..380ba4803bd5 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { }; inherit jdk; - + builder = ./builder.sh; propagatedBuildInputs = [ jdk ]; meta = with stdenv.lib; { description = "Build tooling for Clojure"; - homepage = http://boot-clj.com/; + homepage = https://boot-clj.com/; license = licenses.epl10; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ragge ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix index 18ced2628783..d4e5c5a38dcd 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "buck-${version}"; - version = "2017.10.01.01"; + pname = "buck"; + version = "2019.01.10.01"; src = fetchFromGitHub { owner = "facebook"; - repo = "buck"; + repo = pname; rev = "v${version}"; - sha256 = "05nyyb6f0hv1h67zzvdq8297yl8zjhpbasx35lxnrsjz0m1h8ngw"; + sha256 = "0987s399v4ba2a3crca12vsg9001xcb5drhqi564ninpa5vxamr2"; }; patches = [ ./pex-mtime.patch ]; @@ -20,23 +20,17 @@ stdenv.mkDerivation rec { buildInputs = [ jdk ant python2 watchman python2Packages.pywatchman ]; nativeBuildInputs = [ makeWrapper ]; - targets = [ "buck" "buckd" ]; - buildPhase = '' ant - for exe in ${toString targets}; do - ./bin/buck build //programs:$exe - done + ./bin/buck build -c buck.release_version=${version} buck ''; installPhase = '' - for exe in ${toString targets}; do - install -D -m755 buck-out/gen/programs/$exe.pex $out/bin/$exe - wrapProgram $out/bin/$exe \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}" - done + install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck + wrapProgram $out/bin/buck \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh index c21e10bb0616..8c6b11bd73e7 100755 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -71,6 +71,11 @@ cmakeConfigurePhase() { cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags" + # Don’t build tests when doCheck = false + if [ -z "$doCheck" ]; then + cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags" + fi + # Avoid cmake resetting the rpath of binaries, on make install # And build always Release, to ensure optimisation flags cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" diff --git a/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix index 024c57201e12..3f733e97eed9 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "dub-${version}"; - version = "1.13.0"; + version = "1.14.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; + sha256 = "070kfkyrkr98y1hbhcf85842c0x7l95w1ambrkdgajpb6kcmpf84"; }; postUnpack = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 3651884253ad..92a0ae3eb85b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: python3Packages.buildPythonApplication rec { - version = "0.49.1"; + version = "0.49.2"; pname = "meson"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "05wr4kn88aqq2cbzqx59zj56410c9d42wracb4cjs70mvq0lp50s"; + sha256 = "0ckkzq0kbnnk4rwv20lggm9a4fb5054jbv99i9pwjhid23qy7059"; }; postFixup = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index 6d64c82f90ff..ad4cbeda0f85 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,7 +3,7 @@ tree, hexRegistrySnapshot }: let - version = "3.9.0"; + version = "3.9.1"; bootstrapper = ./rebar3-nix-bootstrap; @@ -75,7 +75,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "14prx5bkyy9sisnp5rj2058xpylq80xygsj1hq8b7m0awvj3r9wy"; + sha256 = "1n6287av29ws3bvjxxmw8s2j8avwich4ccisnnrnypfbm1khlcxp"; }; inherit bootstrapper; diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index 1b884307273e..05e11ad63a7a 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = name; - sha256 = "1r4nyxpf07w98bx9zx0xii97rwsc27s6898xi9ph25p0n6hsdxxg"; + sha256 = "006a4wb9i569pahs8ji86hrv58g2hm8xikgchnll3bdqgxllhnrs"; }; buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/waf/setup-hook.sh index b8a448df8ef8..3da86d3201f5 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -1,20 +1,23 @@ wafConfigurePhase() { runHook preConfigure - if ! [ -f ./waf ]; then - cp @waf@ waf + if ! [ -f "${wafPath:=./waf}" ]; then + echo "copying waf to $wafPath..." + cp @waf@ "$wafPath" fi - if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then - configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" + if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then + wafConfigureFlags="${prefixKey:---prefix=}$prefix $wafConfigureFlags" fi local flagsArray=( - $configureFlags ${configureFlagsArray[@]} + @crossFlags@ + "${flagsArray[@]}" + $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) echoCmd 'configure flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postConfigure } @@ -33,7 +36,7 @@ wafBuildPhase () { ) echoCmd 'build flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postBuild } @@ -52,7 +55,7 @@ wafInstallPhase() { ) echoCmd 'install flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postInstall } diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index c4e8c446e83d..48b0631c64aa 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "083s0bcajks2qnxq6cn9lax5aiyvicf60rf3ifgqksl9skr748qb"; + sha256 = "19rp5kgdgyjfvg23m8dqlv6g1cs2c57nnw64ifjv24hqhy1xc0qk"; }; goPackagePath = "github.com/containers/buildah"; diff --git a/nixpkgs/pkgs/development/tools/cask/default.nix b/nixpkgs/pkgs/development/tools/cask/default.nix new file mode 100644 index 000000000000..e33761a67e02 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/cask/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, python, emacsPackagesNg }: + +stdenv.mkDerivation rec { + name = "cask-${version}"; + version = "0.8.4"; + + src = fetchurl { + url = "https://github.com/cask/cask/archive/v${version}.tar.gz"; + sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478"; + }; + + doCheck = true; + buildInputs = with emacsPackagesNg; [ + s f dash ansi ecukes servant ert-runner el-mock + noflet ert-async shell-split-string git package-build + ]; + buildPhase = '' + emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/templates + mkdir -p $out/share/emacs/site-lisp/cask/bin + install -Dm644 *.el *.elc $out/share/emacs/site-lisp/cask + install -Dm755 bin/cask $out/share/emacs/site-lisp/cask/bin + install -Dm644 templates/* $out/templates/ + touch $out/.no-upgrade + ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask + ''; + + meta = with stdenv.lib; { + description = "Project management for Emacs"; + longDescription = '' + Cask is a project management tool for Emacs that helps automate the + package development cycle; development, dependencies, testing, building, + packaging and more. + Cask can also be used to manage dependencies for your local Emacs configuration. + ''; + + homepage = https://cask.readthedocs.io/en/latest/index.html; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.flexw ]; + }; + + nativeBuildInputs = [ emacsPackagesNg.emacs python ]; +} diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index ecfdc1b027c1..89df5c1241bb 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.150.1"; + version = "2.164.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0sb6mzynw1vg6s43mpd7b0dz1clbf8akga09i14q66isb9nmhf3s"; + sha256 = "1pmya8g3gs5f9ibbgacdh5f6828jcrydw7v7xmg2j86kwc1vclf8"; }; buildCommand = '' diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh index e8b6d9257758..66d1b4ceff66 100755 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh @@ -3,11 +3,20 @@ set -eu -o pipefail -core_json="$(curl --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" +core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" +oldVersion=$(nix-instantiate --eval -E "with import ./. {}; jenkins.version or (builtins.parseDrvName jenkins.name).version" | tr -d '"') version="$(jq -r .version <<<$core_json)" sha256="$(jq -r .sha256 <<<$core_json)" hash="$(nix-hash --type sha256 --to-base32 "$sha256")" url="$(jq -r .url <<<$core_json)" -update-source-version jenkins "$version" "$hash" "$url" +if [ ! "${oldVersion}" = "${version}" ]; then + update-source-version jenkins "$version" "$hash" "$url" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" + git add "${default_nix}" + git commit -m "jenkins: ${oldVersion} -> ${version}" +else + echo "jenkins is already up-to-date" +fi diff --git a/nixpkgs/pkgs/development/tools/database/cdb/default.nix b/nixpkgs/pkgs/development/tools/database/cdb/default.nix index 8def71568e79..f0a4f6c34e25 100644 --- a/nixpkgs/pkgs/development/tools/database/cdb/default.nix +++ b/nixpkgs/pkgs/development/tools/database/cdb/default.nix @@ -52,6 +52,6 @@ in stdenv.mkDerivation { homepage = "https://cr.yp.to/cdb"; license = lib.licenses.publicDomain; maintainers = [ lib.maintainers.Profpatsch ]; - platforms = [ lib.platforms.unix ]; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index e559f714bd1b..1c12a8bc81cd 100644 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/nixpkgs/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; - homepage = http://github.com/timescale/timescaledb-parallel-copy; + homepage = https://github.com/timescale/timescaledb-parallel-copy; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/nixpkgs/pkgs/development/tools/dep2nix/default.nix b/nixpkgs/pkgs/development/tools/dep2nix/default.nix index e7033c44dd49..dcdb1053cf72 100644 --- a/nixpkgs/pkgs/development/tools/dep2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/dep2nix/default.nix @@ -2,16 +2,16 @@ , makeWrapper, nix-prefetch-scripts }: buildGoPackage rec { - name = "dep2nix-${version}"; - version = "0.0.2"; + pname = "dep2nix"; + version = "unstable-2019-04-02"; goPackagePath = "github.com/nixcloud/dep2nix"; src = fetchFromGitHub { owner = "nixcloud"; - repo = "dep2nix"; - rev = version; - sha256 = "17csgnd6imr1l0gpirsvr5qg7z0mpzxj211p2nwqilrvbp8zj7vg"; + repo = pname; + rev = "830684f920333b8ff0946d6b807e8be642eec3ef"; + sha256 = "17sjxhzhmz4893x3x054anp4xvqd1px15nv3fj2m7i6r0vbgpm0j"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/dtools/default.nix b/nixpkgs/pkgs/development/tools/dtools/default.nix index 593287dbf21a..c223a8dc54a1 100644 --- a/nixpkgs/pkgs/development/tools/dtools/default.nix +++ b/nixpkgs/pkgs/development/tools/dtools/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.084.1"; + version = "2.085.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms"; + sha256 = "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660"; name = "dmd"; }) (fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${version}"; - sha256 = "0z3xkv9s1pdx8zdhsb92mwax2q5xhwjgh6g3iv53xip1nsxygn48"; + sha256 = "1x85w4k2zqgv2bjbvhschxdc6kq8ygp89h499cy8rfqm6q23g0ws"; name = "dtools"; }) ]; diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index 31867a87b77f..e0d2d56e7fa5 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.1.3"; + version = "4.1.4"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0fjrzyd872frvlihjr5xssjqirrp0c0aa1s1z8kr5y6hw6d13m2y"; + sha256 = "0z1pr85mdw8c7vdsvznhixzmqmy3s6rrjaybym76c93hdvkr2ir9"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "1qzfz8nm3p6qsx843jl4nlbnx6l0pa6fzz61bb8w2c1p88dwqddy"; + sha256 = "05lyq67paad4h4ng39h8bwkv84bmy6axbxh60fmvl6l1x55dsan6"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "0x5zw0937gm89rfh094kpabzcddw61ckijm8k0k5spir1nb2za9v"; + sha256 = "1ddc9b6h29qdqxnkc4vd6y5iah9i3f5i7v5zjb5b61rssz78wdbq"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "1fz9przvm4jf97xbg3m7ipcnf2gv1zxhmby3bqps582nhc17fckd"; + sha256 = "0qha5klws8l2i0grmwjiz34srr66h93lpx1j0lsgz3pxjxhc33xs"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0s2fiys8mglmz5qf9l1k19p7ipl0r6vd2222n0j8m83bcr1779rz"; + sha256 = "0zbgrwphd1xfkzqai8n7mi9vpzqflq4wwwnl4pdryrkyi3k4yxa6"; }; buildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/goa/default.nix b/nixpkgs/pkgs/development/tools/goa/default.nix index 7469d506244b..53d4bfaa483e 100644 --- a/nixpkgs/pkgs/development/tools/goa/default.nix +++ b/nixpkgs/pkgs/development/tools/goa/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "goa-${version}"; - version = "1.4.0"; + version = "1.4.1"; goPackagePath = "github.com/goadesign/goa"; subPackages = [ "goagen" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "1qx3c7dyq5wqxidfrk3ywc55fk64najj63f2jmfisfq4ixgwxdw9"; + sha256 = "0qcd4ii6arlpsivfdhcwidvnd8zbxxvf574jyxyvm1aazl8sqxj7"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/development/tools/goa/deps.nix b/nixpkgs/pkgs/development/tools/goa/deps.nix index d92489259055..bfe862a4006a 100644 --- a/nixpkgs/pkgs/development/tools/goa/deps.nix +++ b/nixpkgs/pkgs/development/tools/goa/deps.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/dimfeld/httppath"; @@ -10,21 +10,21 @@ }; } { - goPackagePath = "github.com/manveru/faker"; + goPackagePath = "github.com/gofrs/uuid"; fetch = { type = "git"; - url = "https://github.com/manveru/faker"; - rev = "9fbc68a78c4dbc7914e1a23f88f126bea4383b97"; - sha256 = "1cnrf4wdjhxd9fryhlp2krl9acz6dzwic89gshs49pg3aajlf4dy"; + url = "https://github.com/gofrs/uuid"; + rev = "e684523faa0581e44663968f097d478c499d4276"; + sha256 = "1p2md0bmfnn7kaa866fnb8lfnmlzzb8wfhp4ym5915p8mv4whxgz"; }; } { - goPackagePath = "github.com/satori/go.uuid"; + goPackagePath = "github.com/manveru/faker"; fetch = { type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"; - sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; + url = "https://github.com/manveru/faker"; + rev = "9fbc68a78c4dbc7914e1a23f88f126bea4383b97"; + sha256 = "1cnrf4wdjhxd9fryhlp2krl9acz6dzwic89gshs49pg3aajlf4dy"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "f60d9635b16a5a57b06eaa119614ba4df421966a"; - sha256 = "1h587gvgwlpjdn8q3s8i1blfwfklqi0cpb0szj99w1mkgl0ads13"; + rev = "a754db16a40a9d94359b6600b825419c0ca6f986"; + sha256 = "0n0cwb2szcjbyncqhdia77spcjsbm05jcgpnh0i8rdr16ixwanyq"; }; } { @@ -68,9 +68,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] - diff --git a/nixpkgs/pkgs/development/tools/icestorm/default.nix b/nixpkgs/pkgs/development/tools/icestorm/default.nix index b149703241e4..b70fcc6f3924 100644 --- a/nixpkgs/pkgs/development/tools/icestorm/default.nix +++ b/nixpkgs/pkgs/development/tools/icestorm/default.nix @@ -11,13 +11,13 @@ in stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2019.02.23"; + version = "2019.03.11"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "3a2bfee5cbc0558641668114260d3f644d6b7c83"; - sha256 = "1avc9b6w3xbmpq4y4lf9b5mym6aygh5hngzyasa9jyj0cx8mxcpf"; + rev = "fa1c932452e8efe1dfcc6ff095e3f7130a7906b1"; + sha256 = "06rc1sfpdb2682dr1df3hk4m9padjnhjn0p35xq872kil276gnsk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock b/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock index a4e12cb6fe55..3affa961bef1 100644 --- a/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock +++ b/nixpkgs/pkgs/development/tools/jazzy/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.11) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -32,7 +32,7 @@ GEM activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.3) + cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap @@ -43,7 +43,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) escape (0.0.4) ffi (1.10.0) fourflusher (2.0.1) @@ -51,7 +51,7 @@ GEM gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.9.5) + jazzy (0.9.6) cocoapods (~> 1.5.3) mustache (~> 1.1.0) open4 @@ -85,7 +85,7 @@ GEM thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.8.1) + xcodeproj (1.8.2) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/nixpkgs/pkgs/development/tools/jazzy/default.nix b/nixpkgs/pkgs/development/tools/jazzy/default.nix index 15a74f3c5955..981c9c1d0604 100644 --- a/nixpkgs/pkgs/development/tools/jazzy/default.nix +++ b/nixpkgs/pkgs/development/tools/jazzy/default.nix @@ -1,9 +1,10 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerApp, ruby }: -bundlerEnv rec { +bundlerApp rec { inherit ruby; pname = "jazzy"; gemdir = ./.; + exes = [ "jazzy" ]; meta = with lib; { description = "A command-line utility that generates documentation for Swift or Objective-C"; diff --git a/nixpkgs/pkgs/development/tools/jazzy/gemset.nix b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix index 5f4e93354632..0a8ea5f9a507 100644 --- a/nixpkgs/pkgs/development/tools/jazzy/gemset.nix +++ b/nixpkgs/pkgs/development/tools/jazzy/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4"; + sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; type = "gem"; }; - version = "4.2.11"; + version = "4.2.11.1"; }; atomos = { groups = ["default"]; @@ -65,10 +65,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m3hi4va9cr7anxkjf44as14j1hsrvw00bzvz7c906hyb8qcm4fp"; + sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; cocoapods-downloader = { groups = ["default"]; @@ -139,10 +139,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; escape = { source = { @@ -205,10 +205,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13gn4zihfnf3k5ilki3jx7gzin5wdiqvca5q01qq9x7m87j924j6"; + sha256 = "09df1mkf8fhzj0hmgdifnyvd8lhgxr1ps8yjyxfk8n2jkkbiyj7i"; type = "gem"; }; - version = "0.9.5"; + version = "0.9.6"; }; liferaft = { source = { @@ -393,9 +393,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13z3109lwq632vhazndqjlccpwadljg58sflbyl0m57j9d4blv2y"; + sha256 = "0ji3wmpr6xm4172vxh9y6731vm2xrvv7ccwk4ijd5n4if1dakm03"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix new file mode 100644 index 000000000000..ccfa62c0b0df --- /dev/null +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash }: + +rustPlatform.buildRustPackage rec { + pname = "just"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "casey"; + repo = pname; + rev = "v${version}"; + sha256 = "0l35pri5m5k5j12zd42kr5pdx97q1xq1r0shif7hs768if0n8ihm"; + }; + + cargoSha256 = "0wqjk2zxkd6lwki7blsdsbdnr250zs4d0ivjxc2w3i3xivlsjbw8"; + + checkInputs = [ coreutils bash dash ]; + + preCheck = '' + # USER must not be empty + export USER=just-user + export USERNAME=just-user + + sed -i tests/integration.rs \ + -e "s@/bin/echo@${coreutils}/bin/echo@g" \ + -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ + -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" + + sed -i tests/interrupts.rs \ + -e "s@/bin/echo@${coreutils}/bin/echo@g" \ + -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ + -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" + + sed -i src/justfile.rs \ + -e "s@/bin/echo@${coreutils}/bin/echo@g" \ + -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ + -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" + ''; + + meta = with stdenv.lib; { + description = "A handy way to save and run project-specific commands"; + homepage = https://github.com/casey/just; + license = licenses.cc0; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix index e35a310b1002..14f42ed9d40a 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://www.minizinc.org/; + homepage = https://www.minizinc.org/; description = "MiniZinc is a medium-level constraint modelling language."; longDescription = '' @@ -31,4 +31,3 @@ stdenv.mkDerivation { maintainers = [ maintainers.sheenobu ]; }; } - diff --git a/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix b/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix index 6919b03d47c1..8f425a929590 100644 --- a/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/autobuild/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { summary of the build status, after reading the manual. ''; - homepage = http://josefsson.org/autobuild/; + homepage = https://josefsson.org/autobuild/; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix new file mode 100644 index 000000000000..e1aeb025c30f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, perl, autoconf }: + +stdenv.mkDerivation rec { + name = "automake-1.15"; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r"; + }; + + nativeBuildInputs = [ autoconf perl ]; + buildInputs = [ autoconf ]; + + setupHook = ./setup-hook.sh; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths + doInstallCheck = false; # runs the same thing, fails the same tests + + # The test suite can run in parallel. + enableParallelBuilding = true; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + branch = "1.15"; + homepage = https://www.gnu.org/software/automake/; + description = "GNU standard-compliant makefile generator"; + license = stdenv.lib.licenses.gpl2Plus; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix b/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix index 9b35d2960a4d..9975f0f5465c 100644 --- a/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation { - name = "doclifter-2.18"; + name = "doclifter-2.19"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.18.tar.gz; - sha256 = "0g39lbml7dclm2nb20j4ffzhq28226qiwxq1w37p7mpqijm7x3hw"; + url = http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz; + sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python ]; diff --git a/nixpkgs/pkgs/development/tools/misc/help2man/default.nix b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix index 29ed23117fba..f544f48e57c2 100644 --- a/nixpkgs/pkgs/development/tools/misc/help2man/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, gettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.8"; + name = "help2man-1.47.9"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj"; + sha256 = "1li3b6vifhysc2ckx0d7krwrqb8bk0kzn3k18ff1963hjc1qp7nz"; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/default.nix b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix index 9d5e94e7d76e..b7e9dd0aaef4 100644 --- a/nixpkgs/pkgs/development/tools/misc/kibana/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/kibana/6.x.nix @@ -4,13 +4,14 @@ , makeWrapper , fetchzip , fetchurl -, nodejs +, nodejs-10_x , coreutils , which }: with stdenv.lib; let + nodejs = nodejs-10_x; inherit (builtins) elemAt; info = splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; @@ -18,26 +19,14 @@ let shas = if enableUnfree then { - "x86_64-linux" = "0lip4bj3jazv83gydw99dnp03cb0fd1p4z3lvpjbisgmqffbbg5v"; - "x86_64-darwin" = "0hjdnqagcwbjhpcfyr6w0zmy4sjnx4fyp79czb0vp7dig5arnwm3"; + "x86_64-linux" = "039ll00kvrp881cyybb04z90cw68j7p5cspgdxh0bky9lyi9qpwb"; + "x86_64-darwin" = "0qrakrihcjwn9dic77b0k9ja3zf6nbz534v76xid9gv20md5dds3"; } else { - "x86_64-linux" = "1jybn4q7pz61iijzl85d948szlacfcbldn2nhhsb6063xwvf30sa"; - "x86_64-darwin" = "1bl1h6hgp9l5cjq6pzj2x855wjaka8hbs0fn2c03lbzsc991dppr"; + "x86_64-linux" = "1v1fbmfkbnlx043z3yx02gaqqy63bj2ymvcby66n4qq0vlpahvwx"; + "x86_64-darwin" = "1y4q7a2b9arln94d6sj547qkv3258jlgcz9b342fh6khlbpfjb8c"; }; - # For the correct phantomjs version see: - # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js - phantomjs = rec { - name = "phantomjs-${version}-linux-x86_64"; - version = "2.1.1"; - src = fetchzip { - inherit name; - url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; - }; - }; - in stdenv.mkDerivation rec { name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; version = elk6Version; @@ -48,7 +37,7 @@ in stdenv.mkDerivation rec { }; patches = [ - # Kibana specifies it specifically needs nodejs 8.11.4 but nodejs in nixpkgs is at 8.12.0. + # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just # disable the version check. ./disable-nodejs-version-check.patch @@ -63,13 +52,6 @@ in stdenv.mkDerivation rec { makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - '' + - # phantomjs is needed in the unfree version. When phantomjs doesn't exist in - # $out/libexec/kibana/data kibana will try to download and unpack it during - # runtime which will fail because the nix store is read-only. So we make sure - # it already exist in the nix store. - optionalString enableUnfree '' - ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} ''; meta = { diff --git a/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix new file mode 100644 index 000000000000..19590239caf8 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix @@ -0,0 +1,64 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, makeWrapper +, fetchzip +, fetchurl +, nodejs-10_x +, coreutils +, which +}: + +with stdenv.lib; +let + nodejs = nodejs-10_x; + inherit (builtins) elemAt; + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + "x86_64-linux" = "0awkbnbrffv2m6n9zqv8k4m23g4mril69rmj84ndqpdnv7shrk4l"; + "x86_64-darwin" = "0mbaya0xq99vfl8bn1wgi4m43c8qjp910bxf26z436km64311pip"; + } + else { + "x86_64-linux" = "0fy8vh0x2p8n2r3n5f67h1r5z75qfx5q4fghgqwnqymray5798v4"; + "x86_64-darwin" = "0zyhvbwvdj95v2nswx5b83n4cw3zy5a6bkrvypw6k1i833c6v5g7"; + }; + +in stdenv.mkDerivation rec { + name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; + version = elk7Version; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + }; + + patches = [ + # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. + # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just + # disable the version check. + ./disable-nodejs-version-check.patch + ]; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/libexec/kibana $out/bin + mv * $out/libexec/kibana/ + rm -r $out/libexec/kibana/node + makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = if enableUnfree then licenses.elastic else licenses.asl20; + maintainers = with maintainers; [ offline rickynils basvandijk ]; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix new file mode 100644 index 000000000000..ebe62452440e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "macdylibbundler-${version}"; + version = "20180825"; + + src = fetchFromGitHub { + owner = "auriamg"; + repo = "macdylibbundler"; + rev = "ce13cb585ead5237813b85e68fe530f085fc0a9e"; + sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Utility to ease bundling libraries into executables for OSX"; + longDescription = '' + dylibbundler is a small command-line programs that aims to make bundling + .dylibs as easy as possible. It automatically determines which dylibs are + needed by your program, copies these libraries inside the app bundle, and + fixes both them and the executable to be ready for distribution... all + this with a single command on the teminal! It will also work if your + program uses plug-ins that have dependencies too. + ''; + homepage = https://github.com/auriamg/macdylibbundler; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.nomeata ]; + + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix new file mode 100644 index 000000000000..9532b6e34421 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "mkcert"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "FiloSottile"; + repo = pname; + rev = "v${version}"; + sha256 = "1aadnsx5pfmryf8mgxg9g0i083dm1pmrc6v4ln2mm3n89wwqc9b7"; + }; + + modSha256 = "0snvvwhyfq01nwgjz55dgd5skpg7z0dzix7sdag90cslbrr983i1"; + + meta = with lib; { + homepage = https://github.com/FiloSottile/mkcert; + description = "A simple tool for making locally-trusted development certificates"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix index acd25a12f81b..a449c28ea289 100644 --- a/nixpkgs/pkgs/development/tools/misc/objconv/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/objconv/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Object and executable file converter, modifier and disassembler"; - homepage = http://www.agner.org/optimize/; + homepage = https://www.agner.org/optimize/; license = licenses.gpl2; maintainers = with maintainers; [ orivej vrthra ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix index e299a7b0eb82..8f27609ababe 100644 --- a/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pwndbg/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { name = "pwndbg-${version}"; - version = "2018.07.29"; + version = "2019.01.25"; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - sha256 = "1illk1smknaaa0ck8mwvig15c8al5w7fdp42a748xvm8wvxqxdsc"; + sha256 = "0k7n6pcrj62ccag801yzf04a9mj9znghpkbnqwrzz0qn3rs42vgs"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix index 14374937fe09..7b6048eb475d 100644 --- a/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sysbench/default.nix @@ -2,7 +2,7 @@ , libaio }: stdenv.mkDerivation rec { - name = "sysbench-1.0.16"; + name = "sysbench-1.0.17"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ vim mysql.connector-c libaio ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "akopytov"; repo = "sysbench"; - rev = "1.0.16"; - sha256 = "0ypain0m1yqn7yqfb5847fdph6a6m0rn2rnqbnkxcxz5g85kv1rg"; + rev = "1.0.17"; + sha256 = "02i9knvp0bjw6ri848xxiy2dbww2xv70nah9yn67a6zgw617hwa6"; }; meta = { diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix index 80aeb17bef31..632fe9fff325 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.8.2"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a"; + sha256 = "0z4jnj0a5vxjqlwksplhag9b3s3iqdcpcpjjzfazv5jdl5cf58f9"; }; buildInputs = [ ocaml findlib ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index a7f06e734530..1e1f7fade25a 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -55,13 +55,13 @@ let sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.0.2.zip"; - sha256 = "0hxf0ns3si03rl7dxix7i30limbl50ffyvdyk9bqqms4ir8dcza6"; + url = "https://github.com/ocaml/opam/archive/2.0.4.zip"; + sha256 = "1312nc9s4h0vksiimz7jsv3zw17fa05p6mdx23s5sii0qspvnx8c"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "2.0.2"; + version = "2.0.4"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -117,4 +117,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.2 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.4 -p opam-shebangs.patch diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix index 0c67baa96010..a054bc82d45d 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = http://www.antlr.org/; + homepage = https://www.antlr.org/; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix index 8074b7c35ad9..ad0ebbdebba0 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = http://www.antlr.org/; + homepage = https://www.antlr.org/; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix index 35179b336026..cf37287beff8 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = http://www.antlr.org/; + homepage = https://www.antlr.org/; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix index 1ebf7d7dfe24..cee2033665d4 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix @@ -73,7 +73,7 @@ let frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = http://www.antlr.org/; + homepage = https://www.antlr.org/; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix index fc0c6c9ed8a1..ba1b8f27e7c8 100644 --- a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Berkeley YACC"; - homepage = http://invisible-island.net/byacc/byacc.html; + homepage = https://invisible-island.net/byacc/byacc.html; license = licenses.publicDomain; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/tools/pipenv/default.nix b/nixpkgs/pkgs/development/tools/pipenv/default.nix index 3deb7b9643c2..8083151ef81f 100644 --- a/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -24,6 +24,7 @@ buildPythonApplication rec { makeWrapperArgs = [ "--set PYTHONPATH \"$PYTHONPATH\"" + "--set PIP_IGNORE_INSTALLED 1" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 296d45723b24..720544f4b6c6 100644 --- a/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.30.2"; + version = "3.32.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02xsr3cxyws3cnbhvbxgcc9sn22mri3iv9d7f38pkg89lpjph279"; + sha256 = "0kamsnnig56lzs4ziwcxm3b1xyis4z361s9nj3nca0c78sgac8pw"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/pyre/default.nix b/nixpkgs/pkgs/development/tools/pyre/default.nix index 7ae95679482f..b5dfe3c8bfd9 100644 --- a/nixpkgs/pkgs/development/tools/pyre/default.nix +++ b/nixpkgs/pkgs/development/tools/pyre/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages, writeScript -, dune, python3, rsync, buck, watchman }: +, dune, python3, rsync, buck, watchman, sqlite }: let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. - pyre-version = "0.0.20"; # also change typeshed revision below with $pyre-src/.typeshed-version + pyre-version = "0.0.22"; # also change typeshed revision below with $pyre-src/.typeshed-version pyre-src = fetchFromGitHub { owner = "facebook"; repo = "pyre-check"; rev = "v${pyre-version}"; - sha256 = "1alkhdhvmigdhxvvarh0lr5s3b1s6q4arykip2dqb62vs8064s17"; + sha256 = "057vy6zmgwsi0ag9n4m6sszhahmfk2s1ywm36nyfs7w4d0wnk92s"; }; versionFile = writeScript "version.ml" '' cat > "./version.ml" <<EOF @@ -41,6 +41,8 @@ let ppxlib dune ounit + base64 + sqlite.dev # python36Packages.python36Full # TODO ]; @@ -115,7 +117,16 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ pyre-bin ]; nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh - propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ]; + propagatedBuildInputs = with python3.pkgs; [ + docutils + typeshed + click-log + ipython + sqlalchemy + munch + xxhash + ujson + ]; buildPhase = '' bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed} cp -r build/dist dist diff --git a/nixpkgs/pkgs/development/tools/quilt/default.nix b/nixpkgs/pkgs/development/tools/quilt/default.nix index 7986fb2b1341..d5059aa6b93b 100644 --- a/nixpkgs/pkgs/development/tools/quilt/default.nix +++ b/nixpkgs/pkgs/development/tools/quilt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "quilt-0.65"; + name = "quilt-0.66"; src = fetchurl { url = "mirror://savannah/quilt/${name}.tar.gz"; - sha256 = "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn"; + sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"; }; buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ]; diff --git a/nixpkgs/pkgs/development/tools/rhc/Gemfile b/nixpkgs/pkgs/development/tools/rhc/Gemfile deleted file mode 100644 index a780461e254e..000000000000 --- a/nixpkgs/pkgs/development/tools/rhc/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'archive-tar-minitar', '>= 0.5.2.1', github: 'peterhoeg/archive-tar-minitar' -gem 'rhc' diff --git a/nixpkgs/pkgs/development/tools/rhc/Gemfile.lock b/nixpkgs/pkgs/development/tools/rhc/Gemfile.lock deleted file mode 100644 index 004c293b9655..000000000000 --- a/nixpkgs/pkgs/development/tools/rhc/Gemfile.lock +++ /dev/null @@ -1,40 +0,0 @@ -GIT - remote: git://github.com/peterhoeg/archive-tar-minitar.git - revision: dae32ca550a87dba32597115ae18805db4782ebe - specs: - archive-tar-minitar (0.5.2.1) - -GEM - remote: https://rubygems.org/ - specs: - commander (4.2.1) - highline (~> 1.6.11) - highline (1.6.21) - httpclient (2.6.0.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.0.1) - net-ssh-gateway (2.0.0) - net-ssh (>= 4.0.0) - net-ssh-multi (1.2.1) - net-ssh (>= 2.6.5) - net-ssh-gateway (>= 1.2.0) - open4 (1.3.4) - rhc (1.38.7) - archive-tar-minitar - commander (>= 4.0, < 4.3.0) - highline (~> 1.6.11) - httpclient (>= 2.4.0, < 2.7.0) - net-scp (>= 1.1.2) - net-ssh-multi (>= 1.2.0) - open4 - -PLATFORMS - ruby - -DEPENDENCIES - archive-tar-minitar (>= 0.5.2.1)! - rhc - -BUNDLED WITH - 1.13.6 diff --git a/nixpkgs/pkgs/development/tools/rhc/gemset.nix b/nixpkgs/pkgs/development/tools/rhc/gemset.nix deleted file mode 100644 index 933a7dc95afa..000000000000 --- a/nixpkgs/pkgs/development/tools/rhc/gemset.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - archive-tar-minitar = { - source = { - fetchSubmodules = false; - rev = "dae32ca550a87dba32597115ae18805db4782ebe"; - sha256 = "0fvxacbcb52fm5dis451kdd7dv74z8p6nm4vnfqf7jg2aghcxdkd"; - type = "git"; - url = "git://github.com/peterhoeg/archive-tar-minitar.git"; - }; - version = "0.5.2.1"; - }; - commander = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc"; - type = "gem"; - }; - version = "4.2.1"; - }; - highline = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1"; - type = "gem"; - }; - version = "1.6.21"; - }; - httpclient = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l"; - type = "gem"; - }; - version = "2.6.0.1"; - }; - net-scp = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; - type = "gem"; - }; - version = "1.2.1"; - }; - net-ssh = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02xj3pcpqr32nlak0vsx71gd5z65jl3q1hwi2x157vabw1kgjanq"; - type = "gem"; - }; - version = "4.0.1"; - }; - net-ssh-gateway = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l3v761y32aw0n8lm0c0m42lr4ay8cq6q4sc5yc68b9fwlfvb70x"; - type = "gem"; - }; - version = "2.0.0"; - }; - net-ssh-multi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; - type = "gem"; - }; - version = "1.2.1"; - }; - open4 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; - type = "gem"; - }; - version = "1.3.4"; - }; - rhc = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yaq42szq81ph44q7ckzml9yrhz1pkjfik77rxvfzlf90l1g2ibk"; - type = "gem"; - }; - version = "1.38.7"; - }; -} \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix new file mode 100644 index 000000000000..ab88aff0ea11 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-expand"; + version = "0.4.10"; + + src = fetchFromGitHub { + owner = "dtolnay"; + repo = pname; + rev = version; + sha256 = "1f90v67clmql2bb32sgs7c48q8nhyw2pfk4hpkiy8qll8fypjgik"; + }; + + cargoSha256 = "042s28p68jz3my2q1crmq7xzcajwxmcprgg9z7r9ffhrybk4jvwz"; + + meta = with stdenv.lib; { + description = ''A utility and Cargo subcommand designed to let people expand macros in their Rust source code''; + homepage = https://github.com/dtolnay/cargo-expand; + license = with licenses; [ mit asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix new file mode 100644 index 000000000000..346323c955cf --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-xbuild"; + version = "0.5.8"; + + src = fetchFromGitHub { + owner = "rust-osdev"; + repo = pname; + rev = "v${version}"; + sha256 = "1ckrvgdjwkxvy3rc6kix9maynn87al0n7lsjshc9mdmkyvvx8h55"; + }; + + cargoSha256 = "077qiqm470iqcgxqjzbmzxikxd5862vyg788hacli4yzpvyaq9r9"; + + meta = with stdenv.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 ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix b/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix index 05c57e46b893..a0e29a2f3a5f 100644 --- a/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix @@ -5,16 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "pyo3-pack-${version}"; - version = "0.3.8"; + version = "0.5.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "pyo3-pack"; rev = "v${version}"; - sha256 = "14343209w7wphkqh7pnw08pah09spjbwhk6l548g9ivra057gwaz"; + sha256 = "0577v8nqjbb7l7fqvac706bg9zrcp8fbh9ca1mkj44db12v02kgb"; }; - cargoSha256 = "0n7z9p3v92ijqc2ix60wi74as5rql61k5qbqi8b1b02b71xmsp7j"; + cargoSha256 = "1xrzz8c2pfb70i7ynv5lw0d89r284kvhkgjh8z8pgyk1j79ixv2v"; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/trellis/default.nix b/nixpkgs/pkgs/development/tools/trellis/default.nix index eeef99991db8..d8fc3770e347 100644 --- a/nixpkgs/pkgs/development/tools/trellis/default.nix +++ b/nixpkgs/pkgs/development/tools/trellis/default.nix @@ -8,14 +8,14 @@ let in stdenv.mkDerivation rec { name = "trellis-${version}"; - version = "2019.02.21"; + version = "2019.04.02"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "90910577671cdd950e56df6cb29d848dadea9467"; - sha256 = "0j5gnkqfkp8k01wmzsplg713dmw1zvg04hsy33bzbyxaqviybdip"; + rev = "7848ab8db85194cb822bc27af5b50a6fe2db55c6"; + sha256 = "1c9085idsnpw279ddshh58yv920vpcnymzznzj2n5z5vcnkbrr3v"; name = "trellis"; }) (fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/tools/unity3d/default.nix b/nixpkgs/pkgs/development/tools/unity3d/default.nix index f962ef54b028..126ece257801 100644 --- a/nixpkgs/pkgs/development/tools/unity3d/default.nix +++ b/nixpkgs/pkgs/development/tools/unity3d/default.nix @@ -1,9 +1,10 @@ { stdenv, lib, fetchurl, makeWrapper, file, getopt -, gtk2, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb +, gtk2, gtk3, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium +, libpqxx }: let @@ -13,20 +14,21 @@ let cairo dbus expat zlib libpng12 udev tbb libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb + libpqxx gtk3 ]; libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ]; binPath = lib.makeBinPath [ nodejs gnutar ]; - ver = "2017.4.10"; - build = "f1"; + ver = "2018.3.0"; + build = "f2"; in stdenv.mkDerivation rec { name = "unity-editor-${version}"; version = "${ver}x${build}"; src = fetchurl { - url = "https://beta.unity3d.com/download/14396d76537e/LinuxEditorInstaller/Unity.tar.xz"; - sha256 = "e1b4fe41c0ff793f7a9146c49a8eca8c71d30abdfa3e81922bd69699810b3f67"; + url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; + sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; }; nosuidLib = ./unity-nosuid.c; @@ -79,7 +81,8 @@ in stdenv.mkDerivation rec { fi } - upm_linux=$unitydir/Data/Resources/Upm/upm-linux + upm_linux=$unitydir/Data/Resources/PackageManager/Server/UnityPackageManager + orig_size=$(stat --printf=%s $upm_linux) @@ -132,6 +135,6 @@ in stdenv.mkDerivation rec { ''; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 tesq0 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/valadoc/default.nix b/nixpkgs/pkgs/development/tools/valadoc/default.nix index a36e251a4a28..ebeb81c90ec5 100644 --- a/nixpkgs/pkgs/development/tools/valadoc/default.nix +++ b/nixpkgs/pkgs/development/tools/valadoc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}: stdenv.mkDerivation rec { - version = "0.36.1"; + version = "0.36.2"; name = "valadoc-${version}"; src = fetchurl { url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv"; + sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h"; }; nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/web/nodejs/v11.nix b/nixpkgs/pkgs/development/web/nodejs/v11.nix index 5f2931e9b27d..4026a1b02bb6 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v11.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.13.0"; - sha256 = "12n3bm21q8nm6wn116c0af8fpmxhaa7xd4srrba36q0zl4nra4bl"; + version = "11.14.0"; + sha256 = "1rvdyvlvh8ddm9y2razshly5kb87kw0js287i0a5dzb5ay41vxlx"; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v6.nix b/nixpkgs/pkgs/development/web/nodejs/v6.nix deleted file mode 100644 index 154f2b8d6096..000000000000 --- a/nixpkgs/pkgs/development/web/nodejs/v6.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, callPackage, lib, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "6.17.0"; - sha256 = "0j17cpl1mbqvbaa0bk9n3nd34jdyljbvm53gx8n64bhwly7cgnn1"; - } diff --git a/nixpkgs/pkgs/development/web/now-cli/default.nix b/nixpkgs/pkgs/development/web/now-cli/default.nix index 0358f7b8b76e..a0e8b814d8ed 100644 --- a/nixpkgs/pkgs/development/web/now-cli/default.nix +++ b/nixpkgs/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "14.0.3"; + version = "15.0.4"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "0nnwaj3iik8anx7xd5mzbrgq5g5ng8gqmhxyyfgkmawsg34bk6nj"; + sha256 = "7d8fedccce402b3572834cb13a63b343ac2df9e6ad120937289ee88ce6e48d4c"; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/web/remarkjs/generate.sh b/nixpkgs/pkgs/development/web/remarkjs/generate.sh index 040aaf977168..59542101812f 100644 --- a/nixpkgs/pkgs/development/web/remarkjs/generate.sh +++ b/nixpkgs/pkgs/development/web/remarkjs/generate.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -node2nix -6 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix +node2nix -8 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix diff --git a/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix b/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix index 3322c58b40d0..a650747eb065 100644 --- a/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix +++ b/nixpkgs/pkgs/development/web/remarkjs/node-packages.nix @@ -4,22 +4,49 @@ let sources = { - "@sinonjs/formatio-2.0.0" = { + "@sinonjs/commons-1.4.0" = { + name = "_at_sinonjs_slash_commons"; + packageName = "@sinonjs/commons"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz"; + sha512 = "9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw=="; + }; + }; + "@sinonjs/formatio-3.2.1" = { name = "_at_sinonjs_slash_formatio"; packageName = "@sinonjs/formatio"; - version = "2.0.0"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.1.tgz"; + sha512 = "tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ=="; + }; + }; + "@sinonjs/samsam-3.3.1" = { + name = "_at_sinonjs_slash_samsam"; + packageName = "@sinonjs/samsam"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.1.tgz"; + sha512 = "wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw=="; + }; + }; + "@sinonjs/text-encoding-0.7.1" = { + name = "_at_sinonjs_slash_text-encoding"; + packageName = "@sinonjs/text-encoding"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz"; - sha512 = "ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg=="; + url = "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz"; + sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ=="; }; }; - "JSONStream-1.3.3" = { + "JSONStream-1.3.5" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.3"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz"; - sha512 = "3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg=="; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; }; }; "abbrev-1.1.1" = { @@ -31,31 +58,40 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "acorn-5.7.1" = { + "acorn-6.1.1" = { name = "acorn"; packageName = "acorn"; - version = "5.7.1"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; - sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; + sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; }; }; - "acorn-dynamic-import-3.0.0" = { + "acorn-dynamic-import-4.0.0" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; - sha512 = "zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg=="; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; + sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="; }; }; - "acorn-node-1.5.2" = { + "acorn-node-1.6.2" = { name = "acorn-node"; packageName = "acorn-node"; - version = "1.5.2"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz"; - sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg=="; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.2.tgz"; + sha512 = "rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg=="; + }; + }; + "acorn-walk-6.1.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz"; + sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="; }; }; "adm-zip-0.2.1" = { @@ -67,13 +103,85 @@ let sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }; }; - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + }; + }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; + "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/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "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=="; + }; + }; + "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-filter-0.0.1" = { @@ -85,6 +193,15 @@ let sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; }; }; + "array-from-2.1.1" = { + name = "array-from"; + packageName = "array-from"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"; + sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; + }; + }; "array-map-0.0.0" = { name = "array-map"; packageName = "array-map"; @@ -103,6 +220,15 @@ let sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; }; }; + "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"; + }; + }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -121,13 +247,13 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "asn1-0.2.3" = { + "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "asn1.js-4.10.1" = { @@ -166,6 +292,15 @@ let 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"; + }; + }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -184,6 +319,15 @@ let 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=="; + }; + }; "aws-sign2-0.5.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -202,13 +346,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; "balanced-match-1.0.0" = { @@ -220,6 +364,15 @@ let 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.0" = { name = "base64-js"; packageName = "base64-js"; @@ -229,13 +382,13 @@ let sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "bn.js-4.11.8" = { @@ -265,6 +418,15 @@ let 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=="; + }; + }; "brorand-1.1.0" = { name = "brorand"; packageName = "brorand"; @@ -319,13 +481,13 @@ let sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; - "browserify-des-1.0.1" = { + "browserify-des-1.0.2" = { name = "browserify-des"; packageName = "browserify-des"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; - sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw=="; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; "browserify-rsa-4.0.1" = { @@ -355,22 +517,22 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "buffer-5.1.0" = { + "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; - sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; - "buffer-from-1.1.0" = { + "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; - sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-xor-1.0.3" = { @@ -391,13 +553,31 @@ let sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "cached-path-relative-1.0.1" = { + "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=="; + }; + }; + "cached-path-relative-1.0.2" = { name = "cached-path-relative"; packageName = "cached-path-relative"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; - sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; + sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="; + }; + }; + "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=="; }; }; "caseless-0.12.0" = { @@ -409,6 +589,15 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; + "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=="; + }; + }; "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; @@ -418,6 +607,15 @@ let 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=="; + }; + }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -427,13 +625,58 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; + "clone-2.1.2" = { + name = "clone"; + packageName = "clone"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + }; + "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-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-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; "combine-source-map-0.8.0" = { @@ -454,22 +697,40 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + }; + }; + "commander-2.19.0" = { + name = "commander"; + packageName = "commander"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"; + sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; }; }; - "commander-2.15.1" = { + "commander-2.20.0" = { name = "commander"; packageName = "commander"; - version = "2.15.1"; + version = "2.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; + sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; - sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; }; }; "concat-map-0.0.1" = { @@ -490,13 +751,13 @@ let sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; - "config-chain-1.1.11" = { + "config-chain-1.1.12" = { name = "config-chain"; packageName = "config-chain"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; "console-browserify-1.1.0" = { @@ -526,6 +787,15 @@ let sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; + "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"; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -562,6 +832,15 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; + "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=="; + }; + }; "cryptiles-0.2.2" = { name = "cryptiles"; packageName = "cryptiles"; @@ -589,6 +868,15 @@ let sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }; }; + "dash-ast-1.0.0" = { + name = "dash-ast"; + packageName = "dash-ast"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz"; + sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -607,13 +895,76 @@ let sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; - "debug-3.1.0" = { + "debug-2.6.9" = { name = "debug"; packageName = "debug"; - version = "3.1.0"; + 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=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + 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"; + }; + }; + "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=="; }; }; "defined-1.0.0" = { @@ -661,13 +1012,22 @@ let sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; }; }; - "detective-5.1.0" = { + "detect-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "detective-5.2.0" = { name = "detective"; packageName = "detective"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; - sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ=="; + url = "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz"; + sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; "diff-3.5.0" = { @@ -688,13 +1048,13 @@ let sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; - "dom-serializer-0.1.0" = { + "dom-serializer-0.1.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz"; + sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="; }; }; "domain-browser-1.2.0" = { @@ -706,22 +1066,13 @@ let sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; - "domelementtype-1.1.3" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - }; - "domelementtype-1.3.0" = { + "domelementtype-1.3.1" = { name = "domelementtype"; packageName = "domelementtype"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; "domhandler-2.3.0" = { @@ -751,22 +1102,31 @@ let sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; - "ecc-jsbn-0.1.1" = { + "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "elliptic-6.4.0" = { + "elliptic-6.4.1" = { name = "elliptic"; packageName = "elliptic"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; - sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz"; + sha512 = "BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ=="; + }; + }; + "end-of-stream-1.4.1" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; }; }; "entities-1.0.0" = { @@ -778,13 +1138,13 @@ let sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; }; }; - "entities-1.1.1" = { + "entities-1.1.2" = { name = "entities"; packageName = "entities"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; "errno-0.1.7" = { @@ -796,6 +1156,24 @@ let sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; }; }; + "es-abstract-1.13.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; + sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; + }; + }; + "es-to-primitive-1.2.0" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -805,6 +1183,15 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "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=="; + }; + }; "events-2.1.0" = { name = "events"; packageName = "events"; @@ -823,6 +1210,15 @@ let sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; + "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=="; + }; + }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -832,13 +1228,58 @@ let sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; }; }; - "extend-3.0.1" = { + "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"; + }; + }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; + "extend-3.0.2" = { name = "extend"; packageName = "extend"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + 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"; + }; + }; + "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" = { @@ -850,13 +1291,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -868,6 +1309,51 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; + "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"; + }; + }; + "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=="; + }; + }; + "findup-sync-2.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + }; + "flat-4.1.0" = { + name = "flat"; + packageName = "flat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; + sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + }; + }; + "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.5.2" = { name = "forever-agent"; packageName = "forever-agent"; @@ -895,13 +1381,22 @@ let sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + 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=="; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; }; }; "fs.realpath-1.0.0" = { @@ -931,6 +1426,33 @@ let sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; }; }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; + "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-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"; @@ -940,22 +1462,40 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.2" = { + "glob-7.1.3" = { name = "glob"; packageName = "glob"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; - "graceful-fs-4.1.11" = { + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "growl-1.10.5" = { @@ -976,13 +1516,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.0.3" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.0.3"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -1003,6 +1543,51 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; + "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"; @@ -1012,13 +1597,13 @@ let sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; - "hash.js-1.1.4" = { + "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; - version = "1.1.4"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz"; - sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw=="; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; "hawk-1.0.0" = { @@ -1030,13 +1615,13 @@ let sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; }; }; - "he-1.1.1" = { + "he-1.2.0" = { name = "he"; packageName = "he"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "hmac-drbg-1.0.1" = { @@ -1057,6 +1642,15 @@ let sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; }; }; + "homedir-polyfill-1.0.3" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; + }; + }; "htmlescape-1.1.1" = { name = "htmlescape"; packageName = "htmlescape"; @@ -1102,13 +1696,13 @@ let sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; - "ieee754-1.1.12" = { + "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; - sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; "image-size-0.5.5" = { @@ -1192,13 +1786,49 @@ let sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw=="; }; }; - "interpret-1.1.0" = { + "interpret-1.2.0" = { name = "interpret"; packageName = "interpret"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; + sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; + }; + }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "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-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-buffer-1.1.6" = { @@ -1210,6 +1840,168 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; + "is-buffer-2.0.3" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz"; + sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="; + }; + }; + "is-callable-1.1.4" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; + }; + }; + "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.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "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-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-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-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-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-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-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "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-symbol-1.0.2" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -1219,6 +2011,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "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=="; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -1246,6 +2047,33 @@ let sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="; }; }; + "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"; @@ -1255,6 +2083,15 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "js-yaml-3.12.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; + sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + }; + }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -1273,13 +2110,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stable-stringify-0.0.1" = { @@ -1327,13 +2164,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "just-extend-1.1.27" = { + "just-extend-4.0.2" = { name = "just-extend"; packageName = "just-extend"; - version = "1.1.27"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz"; - sha512 = "mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g=="; + url = "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz"; + sha512 = "FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw=="; }; }; "kew-0.1.7" = { @@ -1345,6 +2182,42 @@ let sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }; }; + "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.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; + }; + }; "labeled-stream-splicer-2.0.1" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; @@ -1354,22 +2227,31 @@ let sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg=="; }; }; - "lodash-3.7.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.7.0"; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; - sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; }; }; - "lodash.get-4.4.2" = { - name = "lodash.get"; - packageName = "lodash.get"; - version = "4.4.2"; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "lodash-4.17.11" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.11"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; "lodash.memoize-3.0.4" = { @@ -1381,22 +2263,85 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "lolex-2.7.0" = { + "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=="; + }; + }; + "lolex-2.7.5" = { name = "lolex"; packageName = "lolex"; - version = "2.7.0"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz"; - sha512 = "uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg=="; + url = "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz"; + sha512 = "l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q=="; }; }; - "md5.js-1.3.4" = { + "lolex-3.1.0" = { + name = "lolex"; + packageName = "lolex"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lolex/-/lolex-3.1.0.tgz"; + sha512 = "zFo5MgCJ0rZ7gQg69S4pqBsLURbFw11X68C18OcJjJQbqaXm2NoTrGl1IMM3TIz0/BnN1tIs2tzmmqvCsOMMjw=="; + }; + }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; + "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-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"; + }; + }; + "md5.js-1.3.5" = { name = "md5.js"; packageName = "md5.js"; - version = "1.3.4"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; - sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; + "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=="; }; }; "miller-rabin-4.0.1" = { @@ -1426,22 +2371,31 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.33.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.33.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.18" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.18"; + version = "2.1.22"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; "minimalistic-assert-1.0.1" = { @@ -1489,6 +2443,15 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; + "mixin-deep-1.3.1" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz"; + sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ=="; + }; + }; "mkdirp-0.3.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -1516,13 +2479,13 @@ let sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; }; }; - "module-deps-6.1.0" = { + "module-deps-6.2.0" = { name = "module-deps"; packageName = "module-deps"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz"; - sha512 = "NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ=="; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.0.tgz"; + sha512 = "hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA=="; }; }; "ms-2.0.0" = { @@ -1534,6 +2497,24 @@ let 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=="; + }; + }; + "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=="; + }; + }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -1543,13 +2524,31 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "nise-1.4.2" = { + "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=="; + }; + }; + "nise-1.4.10" = { name = "nise"; packageName = "nise"; - version = "1.4.2"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/nise/-/nise-1.4.2.tgz"; - sha512 = "BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw=="; + url = "https://registry.npmjs.org/nise/-/nise-1.4.10.tgz"; + sha512 = "sa0RRbj53dovjc7wombHmVli9ZihXbXCQ2uH3TNm03DyvOSIQbxg+pbqDKrk2oxMK1rtLGVlKxcB9rrc6X5YjA=="; + }; + }; + "node-environment-flags-1.0.4" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz"; + sha512 = "M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q=="; }; }; "node-uuid-1.4.8" = { @@ -1570,6 +2569,15 @@ let sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; }; }; + "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"; + }; + }; "npmconf-0.0.24" = { name = "npmconf"; packageName = "npmconf"; @@ -1579,6 +2587,15 @@ let sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; }; }; + "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.3.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -1588,13 +2605,67 @@ let sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }; }; - "oauth-sign-0.8.2" = { + "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; - version = "0.8.2"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-keys-1.1.0" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; + sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; + }; + }; + "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.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + }; + }; + "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"; }; }; "once-1.1.1" = { @@ -1624,6 +2695,15 @@ let sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; "osenv-0.0.3" = { name = "osenv"; packageName = "osenv"; @@ -1633,13 +2713,67 @@ let sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; }; }; - "pako-1.0.6" = { + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; + "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-is-promise-2.0.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz"; + sha512 = "pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="; + }; + }; + "p-limit-2.2.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; + sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; + }; + }; + "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-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.10" = { name = "pako"; packageName = "pako"; - version = "1.0.6"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; - sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="; + url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz"; + sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; }; }; "parents-1.0.1" = { @@ -1651,13 +2785,31 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.1" = { + "parse-asn1-5.1.4" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.1"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz"; + sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw=="; + }; + }; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; - sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; }; "path-browserify-0.0.1" = { @@ -1669,6 +2821,15 @@ let sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; + "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-is-absolute-1.0.1" = { name = "path-is-absolute"; packageName = "path-is-absolute"; @@ -1678,13 +2839,22 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-parse-1.0.5" = { + "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-parse-1.0.6" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-platform-0.11.15" = { @@ -1705,13 +2875,13 @@ let sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; }; }; - "pbkdf2-3.0.16" = { + "pbkdf2-3.0.17" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz"; - sha512 = "y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA=="; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; + sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; }; }; "performance-now-2.1.0" = { @@ -1732,6 +2902,15 @@ let sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; }; }; + "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"; + }; + }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -1786,22 +2965,31 @@ let sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "psl-1.1.28" = { + "psl-1.1.31" = { name = "psl"; packageName = "psl"; - version = "1.1.28"; + version = "1.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz"; - sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; }; }; - "public-encrypt-4.0.2" = { + "public-encrypt-4.0.3" = { name = "public-encrypt"; packageName = "public-encrypt"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; - sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q=="; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; + }; + }; + "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=="; }; }; "punycode-1.3.2" = { @@ -1822,6 +3010,15 @@ let 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=="; + }; + }; "qs-0.6.6" = { name = "qs"; packageName = "qs"; @@ -1858,13 +3055,13 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "randombytes-2.0.6" = { + "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -1912,6 +3109,33 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; + "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=="; + }; + }; + "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"; + }; + }; "request-2.36.0" = { name = "request"; packageName = "request"; @@ -1921,13 +3145,13 @@ let sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; }; }; - "request-2.87.0" = { + "request-2.88.0" = { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; "request-progress-0.3.1" = { @@ -1939,6 +3163,24 @@ let sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; }; }; + "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-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; "resolve-1.1.7" = { name = "resolve"; packageName = "resolve"; @@ -1948,13 +3190,40 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.8.1" = { + "resolve-1.10.0" = { name = "resolve"; packageName = "resolve"; - version = "1.8.1"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; - sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "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"; + }; + }; + "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=="; }; }; "rimraf-2.2.8" = { @@ -1984,6 +3253,15 @@ let 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"; @@ -1993,15 +3271,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "samsam-1.3.0" = { - name = "samsam"; - packageName = "samsam"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz"; - sha512 = "1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg=="; - }; - }; "semver-1.1.4" = { name = "semver"; packageName = "semver"; @@ -2011,6 +3280,42 @@ let sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; }; }; + "semver-5.7.0" = { + name = "semver"; + packageName = "semver"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + }; + }; + "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-0.4.3" = { + name = "set-value"; + packageName = "set-value"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + }; + "set-value-2.0.0" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz"; + sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -2029,6 +3334,24 @@ let sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; }; }; + "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-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"; + }; + }; "shell-quote-1.6.1" = { name = "shell-quote"; packageName = "shell-quote"; @@ -2092,6 +3415,15 @@ let sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; }; }; + "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-concat-1.0.0" = { name = "simple-concat"; packageName = "simple-concat"; @@ -2101,6 +3433,33 @@ let sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; }; }; + "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=="; + }; + }; "sntp-0.2.4" = { name = "sntp"; packageName = "sntp"; @@ -2128,22 +3487,67 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "sshpk-1.14.2" = { + "source-map-resolve-0.5.2" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + }; + }; + "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"; + }; + }; + "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.14.2"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; - "stream-browserify-2.0.1" = { + "stream-browserify-2.0.2" = { name = "stream-browserify"; packageName = "stream-browserify"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; - sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; "stream-combiner2-1.1.1" = { @@ -2173,6 +3577,24 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; + "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_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -2191,6 +3613,42 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "string_decoder-1.2.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"; + sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w=="; + }; + }; + "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-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-json-comments-1.0.4" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -2200,6 +3658,15 @@ let sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -2209,13 +3676,22 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "supports-color-5.4.0" = { + "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; - sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-6.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; }; }; "syntax-error-1.4.0" = { @@ -2227,15 +3703,6 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "text-encoding-0.6.4" = { - name = "text-encoding"; - packageName = "text-encoding"; - version = "0.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"; - sha1 = "e399a982257a276dae428bb92845cb71bdc26d19"; - }; - }; "throttleit-0.0.2" = { name = "throttleit"; packageName = "throttleit"; @@ -2254,13 +3721,13 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; - "through2-2.0.3" = { + "through2-2.0.5" = { name = "through2"; packageName = "through2"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; "timers-browserify-1.4.2" = { @@ -2281,13 +3748,31 @@ let sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "tough-cookie-2.3.4" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.4"; + "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/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + 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"; }; }; "tough-cookie-2.4.3" = { @@ -2299,6 +3784,15 @@ let sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; + "tough-cookie-3.0.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; + }; + }; "tty-browserify-0.0.1" = { name = "tty-browserify"; packageName = "tty-browserify"; @@ -2362,13 +3856,49 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "undeclared-identifiers-1.1.2" = { + "undeclared-identifiers-1.1.3" = { name = "undeclared-identifiers"; packageName = "undeclared-identifiers"; - version = "1.1.2"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz"; + sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; + }; + }; + "union-value-1.0.0" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + }; + "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"; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz"; - sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ=="; + 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" = { @@ -2380,6 +3910,15 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; + "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"; @@ -2407,13 +3946,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.3.0" = { + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "verror-1.10.0" = { @@ -2443,6 +3982,42 @@ let sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; }; }; + "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-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=="; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -2461,16 +4036,52 @@ let sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; }; }; + "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=="; + }; + }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; + "yargs-unparser-1.5.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz"; + sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; + }; + }; }; in { marked = nodeEnv.buildNodePackage { name = "marked"; packageName = "marked"; - version = "0.4.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz"; - sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; + url = "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz"; + sha512 = "+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA=="; }; buildInputs = globalBuildInputs; meta = { @@ -2479,21 +4090,22 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.2.2"; + version = "16.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz"; - sha512 = "fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A=="; + url = "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz"; + sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ=="; }; dependencies = [ - sources."JSONStream-1.3.3" - sources."acorn-5.7.1" - sources."acorn-dynamic-import-3.0.0" - sources."acorn-node-1.5.2" + sources."JSONStream-1.3.5" + sources."acorn-6.1.1" + sources."acorn-dynamic-import-4.0.0" + sources."acorn-node-1.6.2" + sources."acorn-walk-6.1.1" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" @@ -2517,15 +4129,15 @@ in }) sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" - sources."browserify-des-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."buffer-5.1.0" - sources."buffer-from-1.1.0" + sources."buffer-5.2.1" + sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."cached-path-relative-1.0.1" + sources."cached-path-relative-1.0.2" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -2538,11 +4150,12 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" + sources."dash-ast-1.0.0" sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" - (sources."detective-5.1.0" // { + (sources."detective-5.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -2550,20 +4163,20 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.4.0" + sources."elliptic-6.4.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."has-1.0.3" sources."hash-base-3.0.4" - sources."hash.js-1.1.4" + sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" @@ -2575,39 +4188,40 @@ in sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.1" sources."lodash.memoize-3.0.4" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."module-deps-6.1.0" + sources."module-deps-6.2.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."pako-1.0.6" + sources."pako-1.0.10" sources."parents-1.0.1" - sources."parse-asn1-5.1.1" + sources."parse-asn1-5.1.4" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.16" + sources."pbkdf2-3.0.17" sources."process-0.11.10" sources."process-nextick-args-2.0.0" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" @@ -2615,11 +4229,11 @@ in sources."shell-quote-1.6.1" sources."simple-concat-1.0.0" sources."source-map-0.5.7" - sources."stream-browserify-2.0.1" + sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" - sources."string_decoder-1.1.1" + sources."string_decoder-1.2.0" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -2627,13 +4241,13 @@ in }) sources."syntax-error-1.4.0" sources."through-2.3.8" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."timers-browserify-1.4.2" sources."to-arraybuffer-1.0.1" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."undeclared-identifiers-1.1.2" + sources."undeclared-identifiers-1.1.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -2652,18 +4266,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; - sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; + sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; }; dependencies = [ - sources."commander-2.15.1" + sources."commander-2.19.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -2673,72 +4287,78 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.4"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; - sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ=="; + url = "https://registry.npmjs.org/less/-/less-3.9.0.tgz"; + sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asap-2.0.6" - sources."asn1-0.2.3" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."clone-2.1.2" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" + sources."ecc-jsbn-0.1.2" sources."errno-0.1.7" - sources."extend-3.0.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."image-size-0.5.5" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - sources."request-2.87.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."source-map-0.6.1" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -2748,40 +4368,355 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.2.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; - sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz"; + sha512 = "RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ=="; }; dependencies = [ + sources."ansi-colors-3.2.3" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.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-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."browser-stdout-1.3.1" - sources."commander-2.15.1" + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cliui-4.1.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."debug-3.1.0" + sources."copy-descriptor-0.1.1" + sources."cross-spawn-6.0.5" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."detect-file-1.0.0" sources."diff-3.5.0" + sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + 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."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."find-up-3.0.0" + sources."findup-sync-2.0.0" + (sources."flat-4.1.0" // { + dependencies = [ + sources."is-buffer-2.0.3" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" sources."growl-1.10.5" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."he-1.1.1" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."he-1.2.0" + sources."homedir-polyfill-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-2.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-regex-1.0.4" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-yaml-3.12.0" + sources."kind-of-6.0.2" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.11" + sources."log-symbols-2.2.0" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."mem-4.3.0" + sources."micromatch-3.1.10" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.5" + sources."node-environment-flags-1.0.4" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.0" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.0.3" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.0.0" + sources."p-limit-2.2.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."supports-color-5.4.0" + sources."path-key-2.0.1" + sources."posix-character-classes-0.1.1" + sources."pump-3.0.0" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-regex-1.1.0" + sources."semver-5.7.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-6.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."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-2.1.0" // { + 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."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + sources."yargs-unparser-1.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -2790,7 +4725,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; mocha-phantomjs = nodeEnv.buildNodePackage { name = "mocha-phantomjs"; @@ -2809,8 +4744,8 @@ in sources."aws-sign2-0.5.0" sources."boom-0.4.2" sources."combined-stream-0.0.7" - sources."commander-2.15.1" - (sources."config-chain-1.1.11" // { + sources."commander-2.20.0" + (sources."config-chain-1.1.12" // { dependencies = [ sources."ini-1.3.5" ]; @@ -2825,6 +4760,7 @@ in sources."http-signature-0.10.1" sources."inherits-1.0.2" sources."ini-1.1.0" + sources."ip-regex-2.1.0" sources."json-stringify-safe-5.0.1" sources."kew-0.1.7" sources."mime-1.2.11" @@ -2840,8 +4776,8 @@ in sources."phantomjs-1.9.7-15" sources."progress-1.1.8" sources."proto-list-1.2.4" - sources."psl-1.1.28" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-0.6.6" sources."request-2.36.0" sources."request-progress-0.3.1" @@ -2849,7 +4785,7 @@ in sources."semver-1.1.4" sources."sntp-0.2.4" sources."throttleit-0.0.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-3.0.1" sources."tunnel-agent-0.4.3" sources."which-1.0.9" ]; @@ -2859,15 +4795,15 @@ in homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; should = nodeEnv.buildNodePackage { name = "should"; packageName = "should"; - version = "13.2.1"; + version = "13.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/should/-/should-13.2.1.tgz"; - sha512 = "l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw=="; + url = "https://registry.npmjs.org/should/-/should-13.2.3.tgz"; + sha512 = "ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ=="; }; dependencies = [ sources."should-equal-2.0.0" @@ -2883,47 +4819,53 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "6.0.1"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-6.0.1.tgz"; - sha512 = "rfszhNcfamK2+ofIPi9XqeH89pH7KGDcAtM+F9CsjHXOK3jzWG99vyhyD2V+r7s4IipmWcWUFYq4ftZ9/Eu2Wg=="; + url = "https://registry.npmjs.org/sinon/-/sinon-7.3.1.tgz"; + sha512 = "eQKMaeWovtOtYe2xThEvaHmmxf870Di+bim10c3ZPrL5bZhLGtu8cz+rOBTFz0CwBV4Q/7dYwZiqZbGVLZ+vjQ=="; }; dependencies = [ - sources."@sinonjs/formatio-2.0.0" + sources."@sinonjs/commons-1.4.0" + sources."@sinonjs/formatio-3.2.1" + sources."@sinonjs/samsam-3.3.1" + sources."@sinonjs/text-encoding-0.7.1" + sources."array-from-2.1.1" sources."diff-3.5.0" sources."has-flag-3.0.0" sources."isarray-0.0.1" - sources."just-extend-1.1.27" - sources."lodash.get-4.4.2" - sources."lolex-2.7.0" - sources."nise-1.4.2" + sources."just-extend-4.0.2" + sources."lodash-4.17.11" + sources."lolex-3.1.0" + (sources."nise-1.4.10" // { + dependencies = [ + sources."lolex-2.7.5" + ]; + }) sources."path-to-regexp-1.7.0" - sources."samsam-1.3.0" - sources."supports-color-5.4.0" - sources."text-encoding-0.6.4" + sources."supports-color-5.5.0" sources."type-detect-4.0.8" ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript test spies, stubs and mocks."; - homepage = http://sinonjs.org/; + homepage = https://sinonjs.org/; license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.5"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; - sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz"; + sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -2933,24 +4875,23 @@ in sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" sources."date-now-0.1.4" - (sources."dom-serializer-0.1.0" // { + (sources."dom-serializer-0.1.1" // { dependencies = [ - sources."domelementtype-1.1.3" - sources."entities-1.1.1" + sources."entities-1.1.2" ]; }) - sources."domelementtype-1.3.0" + sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."isarray-0.0.1" - sources."lodash-3.7.0" + sources."lodash-4.17.11" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -2967,31 +4908,31 @@ in license = "(MIT AND JSON)"; }; production = true; - bypassCache = false; + bypassCache = true; }; shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz"; - sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; + sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."interpret-1.1.0" + sources."interpret-1.2.0" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."rechoir-0.6.2" - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -3001,6 +4942,6 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix index 846dabb21664..266ec146c786 100644 --- a/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/nixpkgs/pkgs/development/web/remarkjs/nodepkgs.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix index 461a81db8574..7537c2795d23 100644 --- a/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix +++ b/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Front-end framework for faster and easier web development"; - homepage = http://getbootstrap.com/; + homepage = https://getbootstrap.com/; license = stdenv.lib.licenses.mit; }; diff --git a/nixpkgs/pkgs/games/atanks/default.nix b/nixpkgs/pkgs/games/atanks/default.nix index 05b645ee326b..de9eb9bbb580 100644 --- a/nixpkgs/pkgs/games/atanks/default.nix +++ b/nixpkgs/pkgs/games/atanks/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://atanks.sourceforge.net/; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/games/crawl/crawl_purify.patch b/nixpkgs/pkgs/games/crawl/crawl_purify.patch index 808a4109f7b1..67a883c16b0c 100644 --- a/nixpkgs/pkgs/games/crawl/crawl_purify.patch +++ b/nixpkgs/pkgs/games/crawl/crawl_purify.patch @@ -1,6 +1,6 @@ -diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile ---- crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 -+++ crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300 +diff -ru3 crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile +--- crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300 @@ -286,13 +286,7 @@ LIBZ := contrib/install/$(ARCH)/lib/libz.a @@ -16,9 +16,9 @@ diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-sr else # This is totally wrong, works only with some old-style setups, and # on some architectures of Debian/new FHS multiarch -- excluding, for -diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font ---- crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 -+++ crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300 +diff -ru3 crawl-ref-0.23.2-src-old/crawl-ref/source/util/find_font crawl-ref-0.23.2-src-new/crawl-ref/source/util/find_font +--- crawl-ref-0.23.2-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 ++++ crawl-ref-0.23.2-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300 @@ -1,6 +1,6 @@ #! /bin/sh @@ -35,3 +35,15 @@ diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.2 + } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \ | head -n1 } 2>/dev/null +diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc +--- a/crawl-ref/source/windowmanager-sdl.cc ++++ b/crawl-ref/source/windowmanager-sdl.cc +@@ -20,7 +20,7 @@ + # else + # include <SDL2/SDL.h> + # endif +-# include <SDL_image.h> ++# include <SDL2/SDL_image.h> + # if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS) + # include <SDL2/SDL_mixer.h> + # endif \ No newline at end of file diff --git a/nixpkgs/pkgs/games/crawl/default.nix b/nixpkgs/pkgs/games/crawl/default.nix index 8966623e2b82..01d1202658c0 100644 --- a/nixpkgs/pkgs/games/crawl/default.nix +++ b/nixpkgs/pkgs/games/crawl/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses +{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, python3, zlib, pkgconfig, ncurses , dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp , tileMode ? false, enableSound ? tileMode }: stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.22.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr"; + sha256 = "1d6mip4rvp81839yf2xm63hf34aza5wg4g5z5hi5275j94szaacs"; }; # Patch hard-coded paths in the makefile @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] + ++ (with python3.pkgs; [ pyyaml ]) ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ] ++ lib.optional enableSound SDL2_mixer; diff --git a/nixpkgs/pkgs/games/flightgear/default.nix b/nixpkgs/pkgs/games/flightgear/default.nix index b70dec62388c..728709a12f62 100644 --- a/nixpkgs/pkgs/games/flightgear/default.nix +++ b/nixpkgs/pkgs/games/flightgear/default.nix @@ -6,14 +6,14 @@ }: let - version = "2018.2.2"; - shortVersion = "2018.2"; + version = "2018.3.1"; + shortVersion = "2018.3"; data = stdenv.mkDerivation rec { name = "flightgear-base-${version}"; src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4"; + sha256 = "1h69ifj84l4k0f497ybk51xj3bprzw4xvwrwzzj708zhkjk78fmh"; }; phases = [ "installPhase" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2"; - sha256 = "61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147"; + sha256 = "0h56npn00b6fd38cf5cha82nnglxmhd12b7h2rn3gjymwhviyjix"; }; # Of all the files in the source and data archives, there doesn't seem to be diff --git a/nixpkgs/pkgs/games/fltrator/default.nix b/nixpkgs/pkgs/games/fltrator/default.nix new file mode 100644 index 000000000000..ef46ea840b79 --- /dev/null +++ b/nixpkgs/pkgs/games/fltrator/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, unzip, fltk, which, libjpeg }: + +stdenv.mkDerivation rec { + name = "fltrator-${version}"; + version = "2.3"; + + src = fetchurl { + url = "mirror://sourceforge/fltrator/fltrator-${version}-code.zip"; + sha256 = "125aqq1sfrm0c9cm6gyylwdmc8xrb0rjf563xvw7q28sdbl6ayp7"; + }; + + buildInputs = [ fltk libjpeg ]; + nativeBuildInputs = [ unzip which ]; + + postPatch = '' + substituteInPlace src/fltrator.cxx\ + --replace 'home += "fltrator/"' "home = \"$out/fltrator/\"" + substituteInPlace src/fltrator-landscape.cxx\ + --replace 'home += "fltrator/"' "home = \"$out/fltrator/\"" + substituteInPlace rsc/fltrator.desktop \ + --replace 'Exec=fltrator' "Exec=$out/bin/fltrator" + ''; + + dontAddPrefix = true; + + makeFlags = [ "HOME=$(out)" "RSC_PATH=$(out)/fltrator"]; + + postInstall = '' + mkdir -p $out/share/applications + cp rsc/fltrator.desktop $out/share/applications + mkdir -p $out/share/icons/hicolor/128x128/apps/ + cp rsc/fltrator-128.png $out/share/icons/hicolor/128x128/apps/fltrator2.png + ''; + + meta = with stdenv.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 + homepage = http://fltrator.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.marius851000 ]; + license = licenses.gpl3; + }; + +} diff --git a/nixpkgs/pkgs/games/gargoyle/default.nix b/nixpkgs/pkgs/games/gargoyle/default.nix index c908a9b75a9c..e645a40aa752 100644 --- a/nixpkgs/pkgs/games/gargoyle/default.nix +++ b/nixpkgs/pkgs/games/gargoyle/default.nix @@ -40,7 +40,11 @@ stdenv.mkDerivation { installPhase = if stdenv.isDarwin then - (substituteAll { inherit (stdenv) shell; src = ./darwin.sh; }) + (substituteAll { + inherit (stdenv) shell; + isExecutable = true; + src = ./darwin.sh; + }) else jamenv + '' jam -j$NIX_BUILD_CORES install mkdir -p "$out/bin" diff --git a/nixpkgs/pkgs/games/openttd/default.nix b/nixpkgs/pkgs/games/openttd/default.nix index d0e880f5f2cc..80a66d31b802 100644 --- a/nixpkgs/pkgs/games/openttd/default.nix +++ b/nixpkgs/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "http://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz"; - sha256 = "06blx844q6a248jwzqlgi82692vvkmvb00bfdx4jhcwp9mayvza5"; + sha256 = "1r8i6yzgww7aw8iibqagahg1gqgw7305g07agy0dpszzvp0mi0gz"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/nixpkgs/pkgs/games/scid-vs-pc/default.nix b/nixpkgs/pkgs/games/scid-vs-pc/default.nix index 94e102e57520..79fef6740023 100644 --- a/nixpkgs/pkgs/games/scid-vs-pc/default.nix +++ b/nixpkgs/pkgs/games/scid-vs-pc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scid-vs-pc-${version}"; - version = "4.19"; + version = "4.20"; src = fetchurl { url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz"; - sha256 = "1k2cgs6bjyrmxy5x6x1chmrxfmm224p3r9r9mpc37kridk4hshqs"; + sha256 = "1mpardcxp5hsmhyla1cjqf4aalacs3v6xkf1zyjz16g1m3gh05lm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/games/steam/chrootenv.nix b/nixpkgs/pkgs/games/steam/chrootenv.nix index 4661cf7d8035..598ddc485630 100644 --- a/nixpkgs/pkgs/games/steam/chrootenv.nix +++ b/nixpkgs/pkgs/games/steam/chrootenv.nix @@ -35,6 +35,10 @@ let ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); + setupSh = writeScript "setup.sh" '' + #!${runtimeShell} + ''; + runSh = writeScript "run.sh" '' #!${runtimeShell} runtime_paths="${lib.concatStringsSep ":" ldPath}" @@ -168,6 +172,7 @@ in buildFHSUserEnv rec { ln -s ../lib32/steam-runtime steamrt/${steam-runtime-wrapped-i686.arch} ''} ln -s ${runSh} steamrt/run.sh + ln -s ${setupSh} steamrt/setup.sh '' else '' ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0 ${lib.optionalString (steam-runtime-wrapped-i686 != null) '' diff --git a/nixpkgs/pkgs/games/steam/steamcmd.nix b/nixpkgs/pkgs/games/steam/steamcmd.nix index 6a2c7fe01b4f..1ea7f0677877 100644 --- a/nixpkgs/pkgs/games/steam/steamcmd.nix +++ b/nixpkgs/pkgs/games/steam/steamcmd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, steam-run, bash +{ stdenv, fetchurl, steam-run, bash, coreutils , steamRoot ? "~/.local/share/Steam" }: @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin substitute ${./steamcmd.sh} $out/bin/steamcmd \ - --subst-var shell \ --subst-var out \ + --subst-var-by coreutils ${coreutils} \ --subst-var-by steamRoot "${steamRoot}" \ --subst-var-by steamRun ${steam-run} chmod 0755 $out/bin/steamcmd diff --git a/nixpkgs/pkgs/games/steam/steamcmd.sh b/nixpkgs/pkgs/games/steam/steamcmd.sh index e092a4fedbe9..588badb41a1a 100644 --- a/nixpkgs/pkgs/games/steam/steamcmd.sh +++ b/nixpkgs/pkgs/games/steam/steamcmd.sh @@ -3,6 +3,9 @@ # Always run steamcmd in the user's Steam root. STEAMROOT=@steamRoot@ +# Add coreutils to PATH for mkdir, ln and cp used below +PATH=$PATH${PATH:+:}@coreutils@/bin + # Create a facsimile Steam root if it doesn't exist. if [ ! -e "$STEAMROOT" ]; then mkdir -p "$STEAMROOT"/{appcache,config,logs,Steamapps/common} diff --git a/nixpkgs/pkgs/games/tintin/default.nix b/nixpkgs/pkgs/games/tintin/default.nix index 286e408e2555..50fb7ba19c40 100644 --- a/nixpkgs/pkgs/games/tintin/default.nix +++ b/nixpkgs/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.01.4"; + name = "tintin-2.01.7"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "1g7bh8xs1ml0iyraps3a3dzaycci922y7fk5j0wyr4ssyjzsy8nx"; + sha256 = "033n84pyxml3n3gd4dq0497n9w331bnrr1gppwipz9ashmq8jz7v"; }; buildInputs = [ zlib pcre ]; diff --git a/nixpkgs/pkgs/games/vitetris/default.nix b/nixpkgs/pkgs/games/vitetris/default.nix index 3ed5700954a4..d57559a4d804 100644 --- a/nixpkgs/pkgs/games/vitetris/default.nix +++ b/nixpkgs/pkgs/games/vitetris/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vitetris-${version}"; - version = "0.57.2"; + version = "0.58.0"; src = fetchFromGitHub { owner = "vicgeralds"; repo = "vitetris"; rev = "v${version}"; - sha256 = "0px0h4zrpzr6xd1vz7w9gr6rh0z74y66jfzschkcvj84plld10k6"; + sha256 = "1fvw9yqg1q25x6dlfi4bl3hrrcdgl6wwq29j89aycxwdfxrxs09w"; }; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/games/wesnoth/default.nix b/nixpkgs/pkgs/games/wesnoth/default.nix index 9d86afa97ec3..137b0e0b6081 100644 --- a/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/nixpkgs/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.5"; + version = "1.14.6"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85"; + sha256 = "0aw3czw3nq8ffakhw2libhvrhnllj61xc5lxpjqv0ig1419s1lj5"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/games/xtris/default.nix b/nixpkgs/pkgs/games/xtris/default.nix new file mode 100644 index 000000000000..9203389355c7 --- /dev/null +++ b/nixpkgs/pkgs/games/xtris/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, xorg }: +stdenv.mkDerivation rec { + name = "xtris-${version}"; + version = "1.15"; + + src = fetchzip { + url = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris-${version}.tar.gz"; + sha256 = "1vqva99lyv7r6f9c7yikk8ahcfh9aq3clvwm4pz964wlbr9mj1v6"; + }; + + patchPhase = '' + sed -i ' + s:/usr/local/bin:'$out'/bin: + s:/usr/local/man:'$out'/share/man: + s:mkdir:mkdir -p:g + s:^CFLAGS:#CFLAGS: + ' Makefile + ''; + buildInputs = [ xorg.libX11 ]; + + meta = with stdenv.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; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/misc/base16-builder/default.nix b/nixpkgs/pkgs/misc/base16-builder/default.nix index 3d713848223b..af57f2a90de3 100644 --- a/nixpkgs/pkgs/misc/base16-builder/default.nix +++ b/nixpkgs/pkgs/misc/base16-builder/default.nix @@ -1,14 +1,6 @@ { stdenv, pkgs }: let - # node-packages*.nix generated via: - # - # % node2nix --input node-packages.json \ - # --output node-packages-generated.nix \ - # --composition node-packages.nix \ - # --node-env ./../../development/node-packages/node-env.nix \ - # --pkg-name nodejs-6_x - # nodePackages = import ./node-packages.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; diff --git a/nixpkgs/pkgs/misc/base16-builder/generate.sh b/nixpkgs/pkgs/misc/base16-builder/generate.sh new file mode 100755 index 000000000000..e1e436010b4b --- /dev/null +++ b/nixpkgs/pkgs/misc/base16-builder/generate.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix +exec node2nix -8 \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ./../../development/node-packages/node-env.nix \ diff --git a/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix b/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix index 52f3446e8c41..5c5de54ee54a 100644 --- a/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/nixpkgs/pkgs/misc/base16-builder/node-packages-generated.nix @@ -58,15 +58,6 @@ let sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; }; }; - "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"; - }; - }; "bulk-replace-0.0.1" = { name = "bulk-replace"; packageName = "bulk-replace"; @@ -94,13 +85,13 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "capture-stack-trace-1.0.0" = { + "capture-stack-trace-1.0.1" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; }; }; "chalk-1.1.3" = { @@ -229,13 +220,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "esprima-4.0.0" = { + "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "filled-array-1.1.0" = { @@ -283,13 +274,13 @@ let sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; }; }; - "graceful-fs-4.1.11" = { + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "has-ansi-2.0.0" = { @@ -301,22 +292,22 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "hepburn-1.0.0" = { + "hepburn-1.1.1" = { name = "hepburn"; packageName = "hepburn"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz"; - sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b"; + url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz"; + sha512 = "Ok3ZmMJN3ek4WFAL4f5t8k+BmrDRlS5qGjI4um+3cHH0SrYVzJgUTYwIfGvU8s/eWqOEY+gsINwjJSoaBG3A9g=="; }; }; - "hosted-git-info-2.6.1" = { + "hosted-git-info-2.7.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.6.1"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz"; - sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; + sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="; }; }; "imurmurhash-0.1.4" = { @@ -364,15 +355,6 @@ let sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; @@ -454,13 +436,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "js-yaml-3.12.0" = { + "js-yaml-3.13.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; + sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; }; }; "keypress-0.1.0" = { @@ -481,13 +463,13 @@ let sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; }; }; - "limax-1.6.0" = { + "limax-1.7.0" = { name = "limax"; packageName = "limax"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/limax/-/limax-1.6.0.tgz"; - sha1 = "996163291c7e8c6e7dd5b438c0190b69622f1b33"; + url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz"; + sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA=="; }; }; "load-json-file-1.1.0" = { @@ -580,22 +562,22 @@ let sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; }; }; - "nodejieba-2.2.6" = { + "nodejieba-2.3.0" = { name = "nodejieba"; packageName = "nodejieba"; - version = "2.2.6"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.6.tgz"; - sha1 = "17cd416705b7b01c062e6cd9d7179b30453eb4a3"; + url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.3.0.tgz"; + sha512 = "ZzLsVuNDlrmcBQa/b8G/yegdXje2iFmktYmPksk6qLha1brKEANYqg4XPiBspF1D0y7Npho91KTmvKFcDr0UdA=="; }; }; - "normalize-package-data-2.4.0" = { + "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "number-is-nan-1.0.1" = { @@ -679,6 +661,15 @@ let sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; }; }; + "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-type-1.1.0" = { name = "path-type"; packageName = "path-type"; @@ -796,13 +787,13 @@ let sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; }; }; - "registry-auth-token-3.3.2" = { + "registry-auth-token-3.4.0" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; - sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; + sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; }; }; "registry-url-3.1.0" = { @@ -823,6 +814,15 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; + "resolve-1.10.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -832,13 +832,13 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "semver-5.5.0" = { + "semver-5.7.0" = { name = "semver"; packageName = "semver"; - version = "5.5.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; "semver-diff-2.1.0" = { @@ -868,22 +868,22 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "spdx-correct-3.0.0" = { + "spdx-correct-3.1.0" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; - sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; }; - "spdx-exceptions-2.1.0" = { + "spdx-exceptions-2.2.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; - sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -895,13 +895,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.0" = { + "spdx-license-ids-3.0.3" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.0"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; - sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz"; + sha512 = "uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="; }; }; "speakingurl-14.0.1" = { @@ -1048,13 +1048,13 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; - "validate-npm-package-license-3.0.3" = { + "validate-npm-package-license-3.0.4" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; - sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g=="; + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "widest-line-1.0.0" = { @@ -1102,11 +1102,10 @@ in sources."argparse-1.0.10" sources."array-find-index-1.0.2" sources."boxen-0.3.1" - sources."builtin-modules-1.1.1" sources."bulk-replace-0.0.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."code-point-at-1.1.0" sources."commander-1.1.1" @@ -1121,22 +1120,21 @@ in sources."ejs-2.6.1" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.0" + sources."esprima-4.0.1" sources."filled-array-1.1.0" sources."find-up-1.1.2" sources."fs-promise-0.3.1" sources."get-stdin-4.0.1" sources."got-5.7.1" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."has-ansi-2.0.0" - sources."hepburn-1.0.0" - sources."hosted-git-info-2.6.1" + sources."hepburn-1.1.1" + sources."hosted-git-info-2.7.1" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" sources."inherits-2.0.3" sources."ini-1.3.5" sources."is-arrayish-0.2.1" - sources."is-builtin-module-1.0.0" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-npm-1.0.0" @@ -1146,10 +1144,10 @@ in sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-yaml-3.12.0" + sources."js-yaml-3.13.0" sources."keypress-0.1.0" sources."latest-version-2.0.0" - sources."limax-1.6.0" + sources."limax-1.7.0" sources."load-json-file-1.1.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" @@ -1163,8 +1161,8 @@ in }) sources."nan-2.10.0" sources."node-status-codes-1.0.0" - sources."nodejieba-2.2.6" - sources."normalize-package-data-2.4.0" + sources."nodejieba-2.3.0" + sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."open-0.0.5" @@ -1174,6 +1172,7 @@ in sources."package-json-2.4.0" sources."parse-json-2.2.0" sources."path-exists-2.1.0" + sources."path-parse-1.0.6" sources."path-type-1.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" @@ -1187,18 +1186,19 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" sources."redent-1.0.0" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeating-2.0.1" + sources."resolve-1.10.0" sources."safe-buffer-5.1.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."semver-diff-2.1.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - sources."spdx-correct-3.0.0" - sources."spdx-exceptions-2.1.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.0" + sources."spdx-license-ids-3.0.3" sources."speakingurl-14.0.1" sources."sprintf-js-1.0.3" sources."string-width-1.0.2" @@ -1215,7 +1215,7 @@ in sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" sources."uuid-2.0.3" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."widest-line-1.0.0" sources."write-file-atomic-1.3.4" sources."xdg-basedir-2.0.0" @@ -1227,6 +1227,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/misc/base16-builder/node-packages.nix b/nixpkgs/pkgs/misc/base16-builder/node-packages.nix index 8e6e01237eae..47020a413e9b 100644 --- a/nixpkgs/pkgs/misc/base16-builder/node-packages.nix +++ b/nixpkgs/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch b/nixpkgs/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch new file mode 100644 index 000000000000..02897f4f44d9 --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/epson-escpr2/cups-filter-ppd-dirs.patch @@ -0,0 +1,55 @@ +diff --git a/configure.orig b/configure +index e9d400f..dac1943 100755 +--- a/configure.orig ++++ b/configure +@@ -12184,48 +12184,8 @@ esac + # *) ESCPR_LIB_NAME="escpr2_32" ;; + #esac + +- +- +-# Check whether --with-cupsfilterdir was given. +-if test "${with_cupsfilterdir+set}" = set; then : +- withval=$with_cupsfilterdir; +-else +- with_cupsfilterdir=no +-fi +- +-if test "xno" = "x${with_cupsfilterdir}"; then +- if test "xyes" = "x$have_cups_config" ; then +- CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin | sed -e 's,^/[^/][^/]*,,'`/filter" +- else +- CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter" +- fi +-else +- CUPS_FILTER_DIR="${with_cupsfilterdir}" +-fi +- +- +-# Check whether --with-cupsppddir was given. +-if test "${with_cupsppddir+set}" = set; then : +- withval=$with_cupsppddir; +-else +- with_cupsppddir=no +-fi +- +-if test "xno" = "x${with_cupsppddir}"; then +- if test -d "${cups_default_prefix}/share/ppd" ; then +- CUPS_PPD_DIR="${cups_default_prefix}/share/ppd" +- elif test "xyes" = "x$have_cups_config" ; then +- CUPS_PPD_DIR="${cups_default_prefix}`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model" +- else +- CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model" +- fi +-else +- CUPS_PPD_DIR="${with_cupsppddir}" +-fi +- +- +- +- ++CUPS_FILTER_DIR="${prefix}/lib/cups/filter" ++CUPS_PPD_DIR="${prefix}/share/cups/model" + + # Check whether --enable-lsb was given. + if test "${enable_lsb+set}" = set; then : diff --git a/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix new file mode 100644 index 000000000000..9ce6f5d7b010 --- /dev/null +++ b/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, cups, busybox }: + +stdenv.mkDerivation rec { + name = "epson-inkjet-printer-escpr2-${version}"; + version = "1.0.29"; + + src = fetchurl { + url = "https://download3.ebz.epson.net/dsc/f/03/00/09/02/31/a332507b6398c6e2e007c05477dd6c3d5a8e50eb/${name}-1lsb3.2.src.rpm"; + sha256 = "064br52akpw5yrxb2wqw2klv4jrvyipa7w0rjj974xgyi781lqs5"; + }; + + patches = [ ./cups-filter-ppd-dirs.patch ]; + + buildInputs = [ cups busybox ]; + + unpackPhase = '' + rpm2cpio $src | cpio -idmv + + tar xvf ${name}-1lsb3.2.tar.gz + cd ${name} + ''; + + meta = with stdenv.lib; { + homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; + description = "ESC/P-R 2 Driver (generic driver)"; + longDescription = '' + Epson Inkjet Printer Driver 2 (ESC/P-R 2) for Linux and the + corresponding PPD files. + + Refer to the description of epson-escpr for usage. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ ma9e ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix index 4f40c10b0377..01785bd9a27e 100644 --- a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix +++ b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; - homepage = http://www.carpeludum.com/kega-fusion/; + homepage = https://www.carpeludum.com/kega-fusion/; maintainers = with maintainers; [ abbradar ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; diff --git a/nixpkgs/pkgs/misc/emulators/mess/default.nix b/nixpkgs/pkgs/misc/emulators/mess/default.nix index 65867de61a23..fc63bf705f4e 100644 --- a/nixpkgs/pkgs/misc/emulators/mess/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mess/default.nix @@ -18,7 +18,7 @@ let in -stdenv.mkDerivation { +stdenv.mkDerivation { name = "mess-0.${version}"; unpackPhase = @@ -37,11 +37,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - cp mess* $out/bin/mess + cp mess* $out/bin/mess ''; meta = { - homepage = http://www.mess.org/; + homepage = https://www.mess.org/; license = "non-commercial"; description = "Multi Emulator Super System, an emulator of many game consoles and computer systems"; broken = true; diff --git a/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix index b8a896d86836..cfb4e35c2b55 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -31,24 +31,24 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.7.5"; + version = "4.8.0"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "0gsb03dc97hqdkw8kpl5ky53bygfnpxkgn2ry5bfzvfdfva6hk8m"; + sha256 = "0y47mfjkb2viraqrvi8qpjn2935sra81h3l4bvaag737s7zmj0c9"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "4.2"; + version = "4.5"; url = "https://dl.winehq.org/wine/source/4.x/wine-${version}.tar.xz"; - sha256 = "1ysvq2jyvh7r27iwpsrlrwzj672jnrihry91bx3m3fysz3sl3ld1"; + sha256 = "1dy1v27cw9vp2xnr8y4bdcvvw5ivcgpk2375jgn536csbwaxgwjz"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1dhv6y60g64bj3kgfknbfzxfzmy686dh7svxlvi4lfis2faikxmk"; + sha256 = "18xpha7nl3jg7c24cgbncciyyqqb6svsyfp1xk81993wnl6r8abs"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20181203"; - sha256 = "1as5h5xibpplm619b1i73g974p96q2jnd7fqm28xj3zkqy7qjdm3"; + version = "20190310"; + sha256 = "0mqzl7k9q7lfkmk8fk9dfzi2dm45h31mrid9265qh2d56nk28ali"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix b/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix index e63d27ec4039..1199f987bb6a 100644 --- a/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/nixpkgs/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" export LDFLAGS="-lwx_gtk2u_adv-2.9" - configureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`") + wafConfigureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`") ''; NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/nixpkgs/pkgs/misc/jackaudio/default.nix b/nixpkgs/pkgs/misc/jackaudio/default.nix index a47c20184442..556b66befe63 100644 --- a/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/nixpkgs/pkgs/misc/jackaudio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" ''; - configureFlags = [ + wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" ] ++ optional (optDbus != null) "--dbus" diff --git a/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix index ce8bf44bfc05..2cfae05c9242 100644 --- a/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "1qnrq9bhk7csgcxycb8c7975lq0p7cxw29i6sji777zv4hn7442m"; + sha256 = "0n1sjngc82b7wysw5aaiqvllq4c8rx2jj7khw4vrypc40f8ahjs5"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/nixpkgs/pkgs/misc/logging/beats/7.x.nix new file mode 100644 index 000000000000..6d00b02d80e5 --- /dev/null +++ b/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: + +let beat = package : extraArgs : buildGoPackage (rec { + name = "${package}-${version}"; + version = elk7Version; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "0n1sjngc82b7wysw5aaiqvllq4c8rx2jj7khw4vrypc40f8ahjs5"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ package ]; + + meta = with stdenv.lib; { + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = with maintainers; [ fadenb basvandijk ]; + platforms = platforms.linux; + }; + } // extraArgs); +in { + filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat7 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat7 = beat "packetbeat" { + buildInputs = [ libpcap ]; + meta.description = "Network packet analyzer that ships data to Elasticsearch"; + meta.longDescription = '' + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + }; + journalbeat7 = beat "journalbeat" { + meta.description = '' + Journalbeat is an open source data collector to read and forward + journal entries from Linuxes with systemd. + ''; + buildInputs = [ systemd.dev ]; + }; +} diff --git a/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix index 8539db5e0027..404346bba631 100644 --- a/nixpkgs/pkgs/misc/screensavers/pipes/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pipes-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz"; - sha256 = "1v0xhgq30zkfjk9l5g8swpivh7rxfjbzhbjpr2c5c836wgn026fb"; + sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; }; buildInputs = with pkgs; [ bash ]; diff --git a/nixpkgs/pkgs/misc/themes/arc/default.nix b/nixpkgs/pkgs/misc/themes/arc/default.nix index adbee8a09f69..da12255e91ee 100644 --- a/nixpkgs/pkgs/misc/themes/arc/default.nix +++ b/nixpkgs/pkgs/misc/themes/arc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20190213"; + version = "20190330"; src = fetchFromGitHub { owner = "NicoHood"; repo = pname; rev = version; - sha256 = "1qalf61xh6a8yz2a98z3ih0w9ky12v3wc61gdczbfnyfasgzc254"; + sha256 = "16n5svgkpa8azxgyy64zwjjc04r57wfzkdq9igqvbvwkbvx8aa89"; }; nativeBuildInputs = [ @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + # TODO: remove this after update + ln -s 3.30 common/gnome-shell/3.32 ''; preBuild = '' diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index d66a79e4df91..3932a4912426 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-04-04"; + version = "2019-04-13"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "cdf89f8269aec31d0dfddf3a2769027d72d38155"; - sha256 = "13zj7sahhan1w50jkncina979cyk3kca5ly68571bzccyzm8dazi"; + rev = "495bce32e957dcf45d6d6acf183599e18c92b09d"; + sha256 = "0kiflcafiaz3r5a721551n8fa9sx94hwgh5dr50fbgbzjgpshn54"; }; }; @@ -403,12 +403,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-04-02"; + version = "2019-04-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "280ea09f278d7301910e7b6abefccd75400bec0b"; - sha256 = "0dcmbmwh29svin6gn4x5carlgy9plax64p4w0f0cx69440zhl4r0"; + rev = "fbde64c2be0482e9505a3fbdf4cb701f17662e51"; + sha256 = "1z7506ch0b5lim098v4n52fhz7mqxrfgywanavpgppyas496sdp0"; }; }; @@ -494,12 +494,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-03-31"; + version = "2019-04-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "19f1dc07f382534d16e5e21f2dddf5109d64ae68"; - sha256 = "1l9zpvh9hwbd32l2g8h0pq3xh5cixbmqdqznwrksx1da12v2w7aa"; + rev = "5c50f254175ee1e815a47761c50abec861afcc61"; + sha256 = "133zlaha0lvibrcd4ci7h353pgv64yyvvh211g8pdlq8vd9qbrhn"; }; }; @@ -584,12 +584,23 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-03-25"; + version = "2019-04-08"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "5526c8e9345f3c3953757bb13511e4bb49878456"; - sha256 = "18drq44lnh4d0pq6b30jiinlkylaq68llc0gyxvgpy6gy0k77gyk"; + rev = "8d1cfd1b700c9945bf98a29d3713a9f1e0e9e5e6"; + sha256 = "0asm7wvvj3z5zvjm61kj7qg5k8jkqncdrd1snbb34nq4vayr5y7a"; + }; + }; + + far-vim = buildVimPluginFrom2Nix { + pname = "far-vim"; + version = "2019-02-20"; + src = fetchFromGitHub { + owner = "brooth"; + repo = "far.vim"; + rev = "6c095d577220ff362fb04b19fd5a571819efcc56"; + sha256 = "1x8hxzf401s8i06fsx6lysdsl57mds4jxzm9n8xqp8jqml4625l7"; }; }; @@ -849,12 +860,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-03-22"; + version = "2019-04-05"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "f26b2a8802ad47406a0ab1e7b68234fa22d88891"; - sha256 = "01bbs70j5z00rn4bmf05zvl3mavyv8w6faj59z0mldvxnfidw2bb"; + rev = "914754a04e0ea0882b3172230199fd771b02dc95"; + sha256 = "0wj0fgvbvwhgx0ij9lrka5an2xc8gy6pq7add8ildk25fls23ig4"; fetchSubmodules = true; }; }; @@ -971,12 +982,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2019-03-13"; + version = "2019-04-10"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "c5821b1a9b0c0c3abf1d0ba496902bb7dde2bad0"; - sha256 = "1k3b7x9sz7wljrhrnk7w1ss1zh4w7830acsiqzlj4d8j8ck5sc8z"; + rev = "e5a7976ad175251a96c537488d2d9557fafdcc8b"; + sha256 = "0jdhbv56vg53vy5yd4322pjyqaidjj0jdbn1ykvi4scci26rzq35"; }; }; @@ -1103,12 +1114,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-03-28"; + version = "2019-04-08"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "8db90526af3655e32f803e18176150f593cd08a6"; - sha256 = "0vv81hxc2f53299xvb8m0px6f0kpmmr4h5h6h5wzqyg7xixfjg0i"; + rev = "5b9ed55b55009bed806aaef0eb8fa01fee134082"; + sha256 = "0glwy2rrh9f35sya3sffic94fm8j54mhhx7hkin6x0d497jplm6y"; }; }; @@ -1125,12 +1136,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-03-28"; + version = "2019-04-09"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "36c91c3b8f0f731b3ab6a3a01a9eb2e1be15ab86"; - sha256 = "0fkkssy38hcp23mgbwgkcnmhlnxj7iqn2iq39k8g7fbhhmnbixik"; + rev = "9ccc5d6662fb35383fe7fa7ea9e33467d28a0372"; + sha256 = "1j2jr5ilcws1bpbnhch2y6jh6303w305c06rncgawibxyqsxvnmw"; }; }; @@ -1158,12 +1169,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-03-10"; + version = "2019-04-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "00908a8a5f56fad3e6f30b2ed7b825b62294926a"; - sha256 = "0xi3p2lslxil9f93ca3529vvlr4z6znjhyia35f5j0sf1l56r9id"; + rev = "3d3362622ef10deedaea8e026054064bf62aeb33"; + sha256 = "02kvc85yibp1m5b6024z42s94z015czmwhdn7v2glpynj67qv4av"; }; }; @@ -1532,12 +1543,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-03-28"; + version = "2019-04-09"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "2234f0d3f8204b44f30ff6eb3b6f7345c23aef92"; - sha256 = "1s0v14na6vlzazw95ssfcqkpylnqxaj7kh1qyni97ixiqqw7vrjw"; + rev = "9984b9753606fe2c8d7f3d4f9d67c1777a967cd6"; + sha256 = "03vn9rxcsrxnr6y0a6nh5ajl804ha98klk1sms61hlkspxib9il9"; }; }; @@ -1653,12 +1664,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-03-07"; + version = "2019-04-07"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "1089ee5212b833d73c96ca93773b9eca1a0f721b"; - sha256 = "084hm6ash2sgxpa3mgbd919yb775mzdalblnhv4iqc59zlafh78q"; + rev = "9f43dcb5a244faba6aedb6879b75a56c7de4b8ff"; + sha256 = "1cv643znw51hkgzm0w3sbimasf91v59lrf6vdfqvbcym39705wyv"; }; }; @@ -1807,12 +1818,12 @@ let typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2018-10-17"; + version = "2019-04-11"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "0e9d92eead2df21abe342c4341c55536dd36b0af"; - sha256 = "1mf8cwkppfnxgjjgy762m1zbxmqxb9fpgxr6kbcjsi8qhzip0cvd"; + rev = "f50fed442f8e75e714efeaf015225af9eaf67cf4"; + sha256 = "077h668k4z94kvpijmivq3mf6884b96fz5v53rlzxrx80431biww"; }; }; @@ -1838,6 +1849,17 @@ let }; }; + unicode-vim = buildVimPluginFrom2Nix { + pname = "unicode-vim"; + version = "2019-03-08"; + src = fetchFromGitHub { + owner = "chrisbra"; + repo = "unicode.vim"; + rev = "e0a060444af297eef131dd140e55c8c3602a72fd"; + sha256 = "0difrn1p406p9g7xdw4xgmpx8f4ahml5gkmnsx03yv02svlfxp68"; + }; + }; + unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; version = "2019-03-29"; @@ -1849,6 +1871,17 @@ let }; }; + vCoolor-vim = buildVimPluginFrom2Nix { + pname = "vCoolor-vim"; + version = "2018-10-06"; + src = fetchFromGitHub { + owner = "KabbAmine"; + repo = "vCoolor.vim"; + rev = "8fc037e453f4c2274f590bde4f9fb56167b14e57"; + sha256 = "193cjxfha5xcpfjqqpyfa6xidys1zmmmwlcj7w2cxbr5j5bdnybm"; + }; + }; + verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; version = "2019-03-20"; @@ -1862,12 +1895,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-04-02"; + version = "2019-04-07"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "9b856347b905dc616baf02b48d7631bc3084726e"; - sha256 = "0w9aj42hb8x7601gbgf0ggs7p3sm5wrv23bnvrjgdlf3mapg6dwy"; + rev = "34efabac145c06cda8084aea11bf46382a3d2254"; + sha256 = "1qswcnjl60gw8grgy0gym5lmx29rqxhz5p01dibpcv1qq1ij2msg"; }; }; @@ -2093,23 +2126,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-03-26"; + version = "2019-04-09"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "86e73cade71651263715f21e58eed87cfed4518e"; - sha256 = "0xlvnzsnfkzg9qz5n87gvm75xlhgihf3y300zxvsyhk6ihnajyzp"; + rev = "cbf264ff5f323ab8a8cf02f59f79bf858d496047"; + sha256 = "11clk44jpdc4v67hrv0m5isjd4hxxr4figxj1ck0v0bkcd714jcm"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-03-21"; + version = "2019-04-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "78cc30cb90b50fab024098bf2a55a4441665ff03"; - sha256 = "15mddh41vb44p1ppcsk3kb50fhqrlkdv4bmr2r7crny53cjfslh9"; + rev = "01b3098642df1bced40473c924c0b6aa37427fe2"; + sha256 = "14iqcmrsmkf0iv31g5yf3x829bich868qy841xy1812yz9mslrn7"; }; }; @@ -2324,12 +2357,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-04-05"; + version = "2019-04-06"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "3a23ac26fd68a2db158cbe3c2ebbae2c142861ce"; - sha256 = "1n324w9dxp9h7k1bg1hhad5f7pva05kns6mqd5d3yhsidfsxshlb"; + rev = "cdc08fd72ffa2e4754c1ceefccd485f07a735177"; + sha256 = "1fv8ah0lfxn2hs4lzp1zbnmwmy5gzl2fgryawrvi7lyd5gxmqjpb"; }; }; @@ -2445,12 +2478,12 @@ let vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2018-09-09"; + version = "2019-04-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "10da325fb032a1acfa9222d273459f53bad30ba4"; - sha256 = "125n4amz3vmc83yv76vidsnma5w2braa69dcpj858ahnzhh329qj"; + rev = "e066a0999e442d9d96f24ad9d203b1bd030ef72e"; + sha256 = "12n7fzgppiwqhqnxlbxmky1m1flb82kr4zlyggysgzz1lqb122zf"; }; }; @@ -2522,12 +2555,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-04-04"; + version = "2019-04-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "1b3668b89fee230c6025dc47c01c82fc1e282ac0"; - sha256 = "0b2z44cw71c0awlajcsln4b43kchhwlb90l461vq7ipmwp3wm8r1"; + rev = "60eac8c97457af5a96eb06ad4b564e4c813d806e"; + sha256 = "1hqz6hbnvazwq7ngffg638w9qf0b3a0y2wl34ddp5ffkjzxjhr8l"; }; }; @@ -2588,12 +2621,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-03-31"; + version = "2019-04-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "f04098811b8a7aba3dba699ed98f6f6e39b7d7ac"; - sha256 = "01fsyyqlf1kygy4l3kbb1jcydgaqjmhhzbdf2liv3hx42signcqw"; + rev = "473636c94cf0887a39839c82c4dcde0faab34f85"; + sha256 = "1khzkpyg3hvz5brmzbrdxf33fdk62dfrss4q9gsfai61k1inrbfn"; }; }; @@ -2610,12 +2643,12 @@ let vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-04-02"; + version = "2019-04-08"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "1b31eeed2fd672300dc0c52ffbb23397c7243215"; - sha256 = "18i241a6v0mdzyznwr0al00zvnr0rqfz0khpjx730w6vk1whrp52"; + rev = "b67c78ab929d0bd68c5a00df9d9271d0a82e0705"; + sha256 = "1wbinfkrzv9rfr5in7q0y3554gibb1rsv95qa4yinf2qasx78x6f"; }; }; @@ -2908,12 +2941,12 @@ let vim-lawrencium = buildVimPluginFrom2Nix { pname = "vim-lawrencium"; - version = "2018-11-04"; + version = "2019-04-10"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-lawrencium"; - rev = "2e09de2ab8ac7a11387340647670ea6c1e4ef08c"; - sha256 = "17j3wy15rkfx7xwgnmipmg7skmf57rw4xndkjgws6jqm9xgvj6jb"; + rev = "e0c127cb4e4224453cb88faffd4627b7da499bcb"; + sha256 = "1gvvr04x17157iz83rv45nlbj1qaz90j0l96q3fki3h1b0fw0099"; }; }; @@ -2939,6 +2972,17 @@ let }; }; + vim-liquid = buildVimPluginFrom2Nix { + pname = "vim-liquid"; + version = "2016-02-11"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-liquid"; + rev = "209f77c9550a90b0b88492c93852195c171f6ebd"; + sha256 = "1ghspgjr6r0csmqacmsmkvrqvfgplx033yb3qwzddby991fpvfaa"; + }; + }; + vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; version = "2019-03-24"; @@ -2963,12 +3007,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-03-29"; + version = "2019-04-09"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "b02690e167a1b49373245aabbedecd29aa470309"; - sha256 = "0gaqcjdq7rykp4hbac7ibfd3lr19vy9pnzwkn2cmnv18b5sjpbm1"; + rev = "4fd4668966e430946a864eb4e973634b3f506ded"; + sha256 = "0gz1w7lcvy3rv4h4bfk8fdsa0k1nhxfkzrn2ncapkl210gw0v7zq"; }; }; @@ -2985,12 +3029,12 @@ let vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2019-03-26"; + version = "2019-04-12"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "a15334cac67237835e62c9dd1470f6162769779f"; - sha256 = "1bdi69ni1mgc9x67k8l886bch70jhi4hi5ram1habml4vklr82np"; + rev = "f71f25b87df3bd2a5315fdf432f0de3c35434345"; + sha256 = "0ak01032ya2lcsb45q1vm04q4fs5gdwax1y0r581ic1vxspzk7r3"; }; }; @@ -3073,12 +3117,12 @@ let vim-one = buildVimPluginFrom2Nix { pname = "vim-one"; - version = "2018-07-22"; + version = "2019-04-09"; src = fetchFromGitHub { owner = "rakr"; repo = "vim-one"; - rev = "08aca1b5d8cd83106a430f150aa77b4148f6cd5e"; - sha256 = "13ldimmm839s8a96l37s8pjx1rrr0cnkjyfiapp1c1n640qn1rd9"; + rev = "6695e135415c53a8fbe96672e382200aa1ffb4b4"; + sha256 = "0951r9kw23zlwd7fda6ib2d9k0akpfd2hvh82pasgw3ks9v1n2vf"; }; }; @@ -3216,23 +3260,23 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-02-22"; + version = "2019-04-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "d1c19a6fa934d90718c18e40acbec0ad7014e931"; - sha256 = "0adgz8fx1xpaqv9mzz55k51i9f407013z53p6vmw0rh5pz5kc58g"; + rev = "518a3566c32cec35c68749c765127ef6f7703630"; + sha256 = "1zkjazyz1karbqk6cyyw3zmdk6sy6vfs4qrhfbhs5c83gz4jm46r"; }; }; vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { pname = "vim-plugin-AnsiEsc"; - version = "2018-05-10"; + version = "2019-04-07"; src = fetchFromGitHub { owner = "powerman"; repo = "vim-plugin-AnsiEsc"; - rev = "9df135fd4a564559aad0f6d28ae6975678cedcaf"; - sha256 = "06s6fz3jw6pmy08nqzlvzhcgnv2d2p0vs863hqvd39amhg1xa5nf"; + rev = "690f820d20b6e3a79ba20499874eb7333aa4ca5c"; + sha256 = "05sf9xh7zs475kykz1hsp0xp7iiclp7pdiy3bpx7wlfp9z71bd9p"; }; }; @@ -3260,12 +3304,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-02-10"; + version = "2019-04-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "12f3fac55f99952abecac01bebfc83adab98d6da"; - sha256 = "0cxdsa1h9h35gpc7fyyks4xwv277lr6rhwspyzp07zd1ik67jm61"; + rev = "00fbe9b87414e13b11dafb0849b2fde9b9cc35f4"; + sha256 = "06ncrhd0g3q6ps0k0iiqkw7dv70q0rn9109wy1ywvjwpzdpdvvv5"; }; }; @@ -3346,6 +3390,17 @@ let }; }; + vim-rsi = buildVimPluginFrom2Nix { + pname = "vim-rsi"; + version = "2019-03-15"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-rsi"; + rev = "8b7abe2d470b7fffac6562818468e14594735564"; + sha256 = "1fvswbqd51gs4qhcabnz3zdmmlhcijs3pnbp3f2zgfi7lqvjc6s5"; + }; + }; + vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; version = "2019-04-04"; @@ -3467,6 +3522,17 @@ let }; }; + vim-sneak = buildVimPluginFrom2Nix { + pname = "vim-sneak"; + version = "2018-08-29"; + src = fetchFromGitHub { + owner = "justinmk"; + repo = "vim-sneak"; + rev = "91192d8969af1d86c98beff4001612976ea25d7a"; + sha256 = "0nmbrp0ma9s3yfzb8z70l0pcxv8p115zv6fz4injxn1c436x9337"; + }; + }; + vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; version = "2019-01-11"; @@ -3480,12 +3546,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-04-03"; + version = "2019-04-12"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "4214407a5eda0d49ad591e41b6eb91f4682fa81f"; - sha256 = "1jvbjnfwpqc53vp5plwyvqnkabi4h6d67sg4dg3byrfs3d0rpzmx"; + rev = "1ba4a66c11d8fd4309656bc2994d683580d54de3"; + sha256 = "0cdphdscz6hbaj53gras13f1rfhzcrhlwff2rfbx4hxnsqgndph5"; }; }; @@ -3524,12 +3590,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-03-22"; + version = "2019-04-11"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "e4d35cc913336d4e17e147c88120e10f58562b4c"; - sha256 = "1kqx113dmsv8pm88g6lp8ahkyib78zln3iz4cls59r1803q1wf97"; + rev = "0a212847827933436d0b139f37b9825e28e3c0a1"; + sha256 = "08si59jvwlgj1i8z1i0ly439ar75ifrnlraa6nw20n3ii6nwzsvh"; }; }; @@ -3601,12 +3667,12 @@ let vim-tbone = buildVimPluginFrom2Nix { pname = "vim-tbone"; - version = "2018-06-28"; + version = "2019-04-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-tbone"; - rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737"; - sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4"; + rev = "b7f41b10db9ed5e5854fc5fe3a619bc05f2d541a"; + sha256 = "152mklqnqipzz2wwzj0i6s3fm75903flr1dff98nyw4khhm84pn2"; }; }; @@ -3623,12 +3689,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-03-29"; + version = "2019-04-07"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "3c151018ce62b526e0bb4261b416a892c3945dc1"; - sha256 = "0w4lh9l3fh3vfggy6am34vhh1844v3lqhv9fm22y9yvdjf995aa3"; + rev = "9c38bb948e7a08fc35b5235535a27fe45777d0e4"; + sha256 = "0b7n89rnrk70bh67xlb6wm2fpww8s7v86kia29bfirs5mrii3kqf"; }; }; @@ -3865,12 +3931,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-04-02"; + version = "2019-04-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "068ef61e6e9364093272edc4f0cf997a349c0a98"; - sha256 = "1p81l2ckl1s2xddzhd9fxjsv9a6vhz77gn5jxwlp0in284v2lp2i"; + rev = "51892b2b592331ce05b9b95e342cf5312b4f210b"; + sha256 = "1chb8l9w2lnqpnjxy7h4ylmrqlyzfl5l1jj1x42bnc0l3mj62pa0"; }; }; @@ -3997,24 +4063,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-03-31"; + version = "2019-04-13"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "2126e8306cd21a58fb5e089376af8272abe36bb5"; - sha256 = "08pdwq3cw7fszw75450z404ylcb5nni0p350jxsd7bd3vikdfxp9"; + rev = "597e718bd86949cb6ca638a6ae2d288569b1fa11"; + sha256 = "01apq588m66vxbq32d1bb3yx1gg8w55jznnq8jiz2jvy55csh1gs"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-03-19"; + version = "2019-04-10"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "25ebc0b9abb1b135c809ee850085a0305cbc5533"; - sha256 = "0jv8h8wx8486n8add2ispcr7np278rvdndb2az4s72plh59xk05d"; + rev = "9dee2b4e3f5de5f8b9fdc4790eac35eb2c40257a"; + sha256 = "12i3wzcy19c5gc8xc5i0qhjl4wn7jwy2abgbx9x2cbgamjl4yzh0"; fetchSubmodules = true; }; }; diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index c3865fa1e00f..4a4ef14f67c5 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -16,6 +16,9 @@ , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, gometalinter , impl, iferr, gocode, gocode-gomod, go-tools + +# vCoolor dep +, gnome3 }: self: super: { @@ -413,4 +416,27 @@ self: super: { ''; }); + vCoolor-vim = super.vCoolor-vim.overrideAttrs(old: { + # on linux can use either Zenity or Yad. + propagatedBuildInputs = [ gnome3.zenity ]; + meta = { + description = "Simple color selector/picker plugin"; + license = stdenv.lib.licenses.publicDomain; + }; + }); + + unicode-vim = let + unicode-data = fetchurl { + url = http://www.unicode.org/Public/UNIDATA/UnicodeData.txt; + sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; + }; + in super.unicode-vim.overrideAttrs(old: { + + # redirect to /dev/null else changes terminal color + buildPhase = '' + cp "${unicode-data}" autoload/unicode/UnicodeData.txt + echo "Building unicode cache" + ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null + ''; + }); } diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index ba153ea9bb5f..b296cd0a8279 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -21,6 +21,7 @@ bhurlow/vim-parinfer bitc/vim-hdevtools bling/vim-bufferline bronson/vim-trailing-whitespace +brooth/far.vim carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml @@ -32,6 +33,7 @@ chikatoike/sourcemap.vim chrisbra/CheckAttach chrisbra/Recover.vim chrisbra/csv.vim +chrisbra/unicode.vim chrisgeo/sparkup chriskempson/base16-vim christoomey/vim-sort-motion @@ -127,6 +129,8 @@ junegunn/vim-peekaboo junegunn/vim-plug justincampbell/vim-eighties justinmk/vim-dirvish +justinmk/vim-sneak +KabbAmine/vCoolor.vim KabbAmine/zeavim.vim kalbasit/vim-colemak kana/vim-niceblock @@ -303,11 +307,13 @@ tpope/vim-eunuch tpope/vim-fireplace tpope/vim-flagship tpope/vim-fugitive +tpope/vim-liquid tpope/vim-obsession tpope/vim-pathogen tpope/vim-projectionist tpope/vim-repeat tpope/vim-rhubarb +tpope/vim-rsi tpope/vim-scriptease tpope/vim-sensible tpope/vim-sleuth diff --git a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix index 2a9eeae3d579..ca44ccb8cd23 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -68,8 +68,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.21.0"; - sha256 = "0zq81xfj4hyz01kcw131fmql1mfs9yrjzcmw8i0yha0hymrgwngv"; + version = "0.22.1"; + sha256 = "1f79vbp19k1zm2y5djr4vim0h5y5rnm96rg8fx2h9zb8i559230k"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/builder.sh b/nixpkgs/pkgs/os-specific/bsd/netbsd/builder.sh new file mode 100644 index 000000000000..925001567f79 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/builder.sh @@ -0,0 +1,122 @@ +source $stdenv/setup + +# NetBSD makefiles should be able to detect this +# but without they end up using gcc on Darwin stdenv +addMakeFlags() { + export setOutputFlags= + + export LIBCRT0= + export LIBCRTI= + export LIBCRTEND= + export LIBCRTBEGIN= + export LIBC= + export LIBUTIL= + export LIBSSL= + export LIBCRYPTO= + export LIBCRYPT= + export LIBCURSES= + export LIBTERMINFO= + export LIBM= + export LIBL= + + export _GCC_CRTBEGIN= + export _GCC_CRTBEGINS= + export _GCC_CRTEND= + export _GCC_CRTENDS= + export _GCC_LIBGCCDIR= + export _GCC_CRTI= + export _GCC_CRTN= + export _GCC_CRTDIR= + + # Definitions passed to share/mk/*.mk. Should be pretty simple - + # eventually maybe move it to a configure script. + export DESTDIR= + export USETOOLS=never + export NOCLANGERROR=yes + export NOGCCERROR=yes + export LEX=flex + export MKUNPRIVED=yes + export EXTERNAL_TOOLCHAIN=yes + + export INSTALL_FILE="install -U -c" + export INSTALL_DIR="xinstall -U -d" + export INSTALL_LINK="install -U -l h" + export INSTALL_SYMLINK="install -U -l s" + + makeFlags="MACHINE=$MACHINE $makeFlags" + makeFlags="MACHINE_ARCH=$MACHINE_ARCH $makeFlags" + makeFlags="AR=$AR $makeFlags" + makeFlags="CC=$CC $makeFlags" + makeFlags="CPP=$CPP $makeFlags" + makeFlags="CXX=$CXX $makeFlags" + makeFlags="LD=$LD $makeFlags" + makeFlags="STRIP=$STRIP $makeFlags" + + makeFlags="BINDIR=${!outputBin}/bin $makeFlags" + makeFlags="LIBDIR=${!outputLib}/lib $makeFlags" + makeFlags="SHLIBDIR=${!outputLib}/lib $makeFlags" + makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" + makeFlags="INFODIR=${!outputInfo}/share/info $makeFlags" + makeFlags="DOCDIR=${!outputDoc}/share/doc $makeFlags" + makeFlags="LOCALEDIR=${!outputLib}/share/locale $makeFlags" + + # Parallel building. Needs the space. + makeFlags="-j $NIX_BUILD_CORES $makeFlags" +} + +setNetBSDSourceDir() { + # merge together all extra paths + # there should be a better way to do this + sourceRoot=$PWD/$sourceRoot + export NETBSDSRCDIR=$sourceRoot + export BSDSRCDIR=$NETBSDSRCDIR + export _SRC_TOP_=$NETBSDSRCDIR + chmod -R u+w $sourceRoot + for path in $extraPaths; do + cd $path + find . -type d -exec mkdir -p $sourceRoot/\{} \; + find . -type f -exec cp -pr \{} $sourceRoot/\{} \; + chmod -R u+w $sourceRoot + done + + cd $sourceRoot + if [ -d "$NETBSD_PATH" ] + then sourceRoot=$sourceRoot/$NETBSD_PATH + fi +} + +includesPhase() { + if [ -z "${skipIncludesPhase:-}" ]; then + + local flagsArray=( + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + DESTDIR=${!outputInclude} includes + ) + + echoCmd 'includes flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + + moveUsrDir + + fi +} + +moveUsrDir() { + if [ -d $prefix ]; then + # Remove lingering /usr references + if [ -d $prefix/usr ]; then + cd $prefix/usr + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; + fi + + find $prefix -type d -empty -delete + fi +} + +postUnpackHooks+=(setNetBSDSourceDir) +preConfigureHooks+=(addMakeFlags) +preInstallHooks+=(includesPhase) +fixupOutputHooks+=(moveUsrDir) + +genericBuild diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index d7f7c64fc2d6..f93ed5669d00 100644 --- a/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,272 +1,85 @@ -{ stdenv, fetchcvs, lib, groff, mandoc, zlib, buildPackages -, yacc, flex, libressl, bash, less, writeText }: +{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, yacc, flex, bash +, writeText, buildPackages, splicePackages, symlinkJoin }: let - inherit (lib) optionalString replaceStrings; - inherit (stdenv) hostPlatform; - fetchNetBSD = path: version: sha256: fetchcvs { cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; module = "src/${path}"; inherit sha256; - tag = "netbsd-${builtins.replaceStrings ["."] ["-"] version}-RELEASE"; + tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; }; - # Needed to support cross correctly. Splicing only happens when we - # do callPackage, but sense everything is here, it needs to be done - # by hand. All native build inputs should come from here. - nbBuildPackages = buildPackages.netbsd; - - MACHINE_ARCH = { - "i686" = "i386"; - }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + # Splice packages so we get the correct package when using + # nativeBuildInputs... + nbSplicedPackages = splicePackages { + pkgsBuildBuild = buildPackages.buildPackages.netbsd; + pkgsBuildHost = buildPackages.netbsd; + pkgsBuildTarget = {}; + pkgsHostHost = {}; + pkgsHostTarget = netbsd; + pkgsTargetTarget = {}; + }; - MACHINE = { - "x86_64" = "amd64"; - "aarch64" = "evbarm64"; - "i686" = "i386"; - }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + netbsd = with nbSplicedPackages; { - netBSDDerivation = attrs: stdenv.mkDerivation ((rec { - name = "netbsd-${attrs.pname or (baseNameOf attrs.path)}-${attrs.version}"; + mkDerivation = lib.makeOverridable (attrs: let + stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + in stdenv'.mkDerivation ({ + name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; - setOutputFlags = false; - - nativeBuildInputs = [ yacc flex mandoc groff - nbBuildPackages.makeMinimal - nbBuildPackages.stat - nbBuildPackages.install - nbBuildPackages.tsort - nbBuildPackages.lorder ]; - buildInputs = [ nbPackages.compat ]; - installFlags = [ "includes" ]; - # TODO: eventually move this to a make.conf - makeFlags = [ - "MACHINE=${MACHINE}" - "MACHINE_ARCH=${MACHINE_ARCH}" - - "AR=${stdenv.cc.targetPrefix}ar" - "CC=${stdenv.cc.targetPrefix}cc" - "CPP=${stdenv.cc.targetPrefix}cpp" - "CXX=${stdenv.cc.targetPrefix}c++" - "LD=${stdenv.cc.targetPrefix}ld" - "STRIP=${stdenv.cc.targetPrefix}strip" - ] ++ (attrs.makeFlags or []); - - # Definitions passed to share/mk/*.mk. Should be pretty simple - - # eventually maybe move it to a configure script. - # TODO: don’t rely on DESTDIR, instead use prefix - DESTDIR = "$(out)"; - TOOLDIR = "$(out)"; - USETOOLS = "never"; - NOCLANGERROR = "yes"; - NOGCCERROR = "yes"; - LEX = "flex"; - MKUNPRIVED = "yes"; - HOST_SH = "${buildPackages.bash}/bin/sh"; + + nativeBuildInputs = [ makeMinimal install tsort lorder mandoc groff stat ]; + buildInputs = [ compat ]; + # depsBuildBuild = [ buildPackages.stdenv.cc ]; + OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp"; - - MKPIC = if stdenv.isDarwin then "no" else "yes"; - MKRELRO = if stdenv.isDarwin then "no" else "yes"; - - INSTALL_FILE = "install -U -c"; - INSTALL_DIR = "xinstall -U -d"; - INSTALL_LINK = "install -U -l h"; - INSTALL_SYMLINK = "install -U -l s"; - - HOST_CC = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; - HOST_CXX = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; - - # libs will be provided by cc-wrapper - LIBCRT0 = ""; - LIBCRTI = ""; - LIBCRTEND = ""; - LIBCRTBEGIN = ""; - LIBC = ""; - LIBUTIL = ""; - LIBSSL = ""; - LIBCRYPTO = ""; - LIBCRYPT = ""; - LIBCURSES = ""; - LIBTERMINFO = ""; - LIBM = ""; - LIBL = ""; - _GCC_CRTBEGIN = ""; - _GCC_CRTBEGINS = ""; - _GCC_CRTEND = ""; - _GCC_CRTENDS = ""; - _GCC_LIBGCCDIR = ""; - _GCC_CRTI = ""; - _GCC_CRTDIR = ""; - _GCC_CRTN = ""; - - "LIBDO.terminfo" = "_external"; - "LIBDO.curses" = "_external"; - - # all dirs will be prefixed with DESTDIR - BINDIR = "/bin"; - LIBDIR = "/lib"; - SHLIBDIR = "/lib"; - INCSDIR = "/include"; - MANDIR = "/share/man"; - INFODIR = "/share/info"; - DOCDIR = "/share/doc"; - LOCALEDIR = "/share/locale"; - X11BINDIR = "/bin"; - X11USRLIBDIR = "/lib"; - X11MANDIR = "/share/man"; - - # NetBSD makefiles should be able to detect this - # but without they end up using gcc on Darwin stdenv - preConfigure = '' - export HAVE_${if stdenv.cc.isClang then "LLVM" else "GCC"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} - - # Parallel building. Needs the space. - export makeFlags+=" -j $NIX_BUILD_CORES" - ''; + HOST_SH = "${buildPackages.bash}/bin/sh"; - postUnpack = '' - # merge together all extra paths - # there should be a better way to do this - sourceRoot=$PWD/$sourceRoot - export NETBSDSRCDIR=$sourceRoot - export BSDSRCDIR=$NETBSDSRCDIR - export _SRC_TOP_=$NETBSDSRCDIR - chmod -R u+w $sourceRoot - for path in $extraPaths; do - cd $path - find . -type d -exec mkdir -p $sourceRoot/\{} \; - find . -type f -exec cp -pr \{} $sourceRoot/\{} \; - chmod -R u+w $sourceRoot - done - - cd $sourceRoot - if [ -d ${attrs.path} ] - then sourceRoot=$sourceRoot/${attrs.path} - fi - ''; + MACHINE_ARCH = { + "i686" = "i386"; + }.${stdenv'.hostPlatform.parsed.cpu.name} + or stdenv'.hostPlatform.parsed.cpu.name; - preFixup = '' - # Remove lingering /usr references - if [ -d $out/usr ]; then - cd $out/usr - find . -type d -exec mkdir -p $out/\{} \; - find . -type f -exec mv \{} $out/\{} \; - fi + MACHINE = { + "x86_64" = "amd64"; + "aarch64" = "evbarm64"; + "i686" = "i386"; + }.${stdenv'.hostPlatform.parsed.cpu.name} + or stdenv'.hostPlatform.parsed.cpu.name; - find $out -type d -empty -delete - ''; + AR = "${stdenv'.cc.targetPrefix or ""}ar"; + CC = "${stdenv'.cc.targetPrefix or ""}cc"; + CPP = "${stdenv'.cc.targetPrefix or ""}cpp"; + CXX = "${stdenv'.cc.targetPrefix or ""}c++"; + LD = "${stdenv'.cc.targetPrefix or ""}ld"; + STRIP = "${stdenv'.cc.targetPrefix or ""}strip"; + + NETBSD_PATH = attrs.path; + + builder = ./builder.sh; meta = with lib; { maintainers = with maintainers; [matthewbauer]; platforms = platforms.unix; license = licenses.bsd2; }; - }) // (removeAttrs attrs ["makeFlags"])); - - libutil = netBSDDerivation { - path = "lib/libutil"; - version = "8.0"; - sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; - extraPaths = [ - (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") - ]; - }; - - libc = netBSDDerivation { - path = "lib/libc"; - version = "8.0"; - sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; - extraPaths = [ - (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8") - ]; - }; - - make = netBSDDerivation { - path = "usr.bin/make"; - sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; - version = "8.0"; - postPatch = '' - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ - --replace /bin/rm rm - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ - --replace '-Wl,--whole-archive' "" \ - --replace '-Wl,--no-whole-archive' "" \ - --replace '-Wl,--warn-shared-textrel' "" \ - --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - ''; - postInstall = '' - make -C $NETBSDSRCDIR/share/mk FILESDIR=/share/mk install - ''; - extraPaths = [ - (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") - ]; - }; - - libcurses = netBSDDerivation { - path = "lib/libcurses"; - version = "8.0"; - sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; - buildInputs = [ nbPackages.libterminfo ]; - makeFlags = [ "INCSDIR=/include" ]; - NIX_CFLAGS_COMPILE = [ - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-D__warn_references(a,b)=" - ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; - propagatedBuildInputs = [ nbPackages.compat ]; - MKDOC = "no"; # missing vfontedpr - postPatch = '' - substituteInPlace printw.c \ - --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \ - --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' - substituteInPlace scanw.c \ - --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' - ''; - }; - - libedit = netBSDDerivation { - path = "lib/libedit"; - buildInputs = [ nbPackages.libterminfo libcurses ]; - propagatedBuildInputs = [ nbPackages.compat ]; - makeFlags = [ "INCSDIR=/include" ]; - postPatch = '' - sed -i '1i #undef bool_t' el.h - substituteInPlace config.h \ - --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" - ''; - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - ]; - version = "8.0"; - sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; - }; - - nbPackages = rec { + } // lib.optionalAttrs stdenv'.isDarwin { + MKRELRO = "no"; + } // lib.optionalAttrs (stdenv'.cc.isClang or false) { + HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc)); + } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { + HAVE_GCC = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc)); + } // lib.optionalAttrs (attrs.headersOnly or false) { + installPhase = "includesPhase"; + dontBuild = true; + } // attrs)); ## - ## BOOTSTRAPPING + ## START BOOTSTRAPPING ## - makeMinimal = netBSDDerivation rec { + makeMinimal = mkDerivation rec { path = "tools/make"; sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; version = "8.0"; @@ -274,6 +87,8 @@ let buildInputs = []; nativeBuildInputs = []; + skipIncludesPhase = true; + postPatch = '' patchShebangs configure ${make.postPatch} @@ -298,7 +113,7 @@ let extraPaths = [ make.src ] ++ make.extraPaths; }; - compat = if hostPlatform.isNetBSD then null else netBSDDerivation rec { + compat = if stdenv.hostPlatform.isNetBSD then stdenv else mkDerivation rec { path = "tools/compat"; sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3"; version = "8.0"; @@ -309,13 +124,15 @@ let ]; # override defaults to prevent infinite recursion - nativeBuildInputs = [ nbBuildPackages.makeMinimal ]; + nativeBuildInputs = [ makeMinimal ]; buildInputs = [ zlib ]; # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = [ "INSTALL=${buildPackages.coreutils}/bin/install" ]; - installFlags = []; + makeFlags = [ + "INSTALL=${buildPackages.coreutils}/bin/install" + "TOOLDIR=$(out)" + ]; RENAME = "-D"; patches = [ ./compat.patch ]; @@ -352,15 +169,6 @@ let substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ --subst-var-by out $out \ --subst-var-by version ${version} - - # Remove lingering /usr references - if [ -d $out/usr ]; then - cd $out/usr - find . -type d -exec mkdir -p $out/\{} \; - find . -type f -exec mv \{} $out/\{} \; - fi - - find $out -type d -empty -delete ''; extraPaths = [ libc.src libutil.src (fetchNetBSD "include" "8.0" "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq") @@ -369,19 +177,20 @@ let ] ++ libutil.extraPaths ++ libc.extraPaths; }; - # HACK to ensure parent directories exist. This emulates GNU + # HACK: to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. install = let binstall = writeText "binstall" '' #!${stdenv.shell} for last in $@; do true; done mkdir -p $(dirname $last) xinstall "$@" - ''; in netBSDDerivation { + ''; in mkDerivation { path = "usr.bin/xinstall"; version = "8.0"; sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ nbBuildPackages.makeMinimal mandoc groff ]; + nativeBuildInputs = [ makeMinimal mandoc groff ]; + skipIncludesPhase = true; buildInputs = [ compat fts ]; installPhase = '' runHook preInstall @@ -395,7 +204,7 @@ let ''; }; - fts = netBSDDerivation { + fts = mkDerivation { pname = "fts"; path = "include/fts.h"; sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; @@ -407,6 +216,7 @@ let (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "1sjvh9nw3prnk4rmdwrfsxh6gdb9lmilkn46jcfh3q5c8glqzrd7") (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") ]; + skipIncludesPhase = true; buildPhase = '' cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ -o lib/libc/gen/fts.o @@ -428,132 +238,434 @@ let ]; }; - stat = netBSDDerivation { + stat = mkDerivation { path = "usr.bin/stat"; version = "8.0"; sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; - tsort = netBSDDerivation { + tsort = mkDerivation { path = "usr.bin/tsort"; version = "8.0"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; - lorder = netBSDDerivation { + lorder = mkDerivation { path = "usr.bin/lorder"; version = "8.0"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; ## ## END BOOTSTRAPPING ## - mtree = netBSDDerivation { + ## + ## START COMMAND LINE TOOLS + ## + make = mkDerivation { + path = "usr.bin/make"; + sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; + version = "8.0"; + postPatch = '' + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ + --replace /bin/rm rm + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + ''; + postInstall = '' + make -C $NETBSDSRCDIR/share/mk FILESDIR=$out/share/mk install + ''; + extraPaths = [ + (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") + ]; + }; + + mtree = mkDerivation { path = "usr.sbin/mtree"; version = "8.0"; sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid"; extraPaths = [ mknod.src ]; }; - mknod = netBSDDerivation { + mknod = mkDerivation { path = "sbin/mknod"; version = "8.0"; sha256 = "0vq66v0hj0r4z2r2z2d3l3c5vh48pvcdmddc8bhm8hzq2civ5df2"; }; - getent = netBSDDerivation { + getent = mkDerivation { path = "usr.bin/getent"; sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz"; version = "8.0"; patches = [ ./getent.patch ]; }; - getconf = netBSDDerivation { + getconf = mkDerivation { path = "usr.bin/getconf"; sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; version = "8.0"; }; - dict = netBSDDerivation { - path = "share/dict"; + locale = mkDerivation { + path = "usr.bin/locale"; version = "8.0"; - sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l"; - makeFlags = [ "BINDIR=/share" ]; + sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; + patches = [ ./locale.patch ]; + NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; }; - fingerd = netBSDDerivation { - path = "libexec/fingerd"; - sha256 = "0blcahhgyj1lm0mimrbvgmq3wkjvqk5wy85sdvbs99zxg7da1190"; + rpcgen = mkDerivation { + path = "usr.bin/rpcgen"; version = "8.0"; + sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; }; - libterminfo = netBSDDerivation { - path = "lib/libterminfo"; + genassym = mkDerivation { + path = "usr.bin/genassym"; version = "8.0"; - sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; - buildInputs = [ compat tic nbperf ]; - makeFlags = [ "INCSDIR=/include" ]; - postPatch = '' - substituteInPlace term.c --replace /usr/share $out/share - substituteInPlace setupterm.c --replace '#include <curses.h>' 'void use_env(bool);' + sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; + }; - ''; - postInstall = '' - make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share - make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share install - ''; - extraPaths = [ - (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") - ]; + gencat = mkDerivation { + path = "usr.bin/gencat"; + version = "8.0"; + sha256 = "1696lgh2lhz93247lklvpvkd0f5asg6z27w2g4bmpfijlgw2h698"; }; - nbperf = netBSDDerivation { + nbperf = mkDerivation { path = "usr.bin/nbperf"; version = "8.0"; sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb"; }; - tic = netBSDDerivation { + tic = mkDerivation { path = "tools/tic"; version = "8.0"; sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; - buildInputs = [ compat nbperf ]; + buildInputs = [ compat ]; + nativeBuildInputs = [ makeMinimal install mandoc groff nbperf ]; + makeFlags = [ "TOOLDIR=$(out)" ]; extraPaths = [ libterminfo.src (fetchNetBSD "usr.bin/tic" "8.0" "0diirnzmdnpc5bixyb34c9rid9paw2a4zfczqrpqrfvjsf1nnljf") (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp") ]; }; + ## + ## END COMMAND LINE TOOLS + ## + + ## + ## START HEADERS + ## + include = mkDerivation { + path = "include"; + version = "8.0"; + sha256 = "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq"; + nativeBuildInputs = [ makeMinimal install mandoc groff nbperf rpcgen ]; + extraPaths = [ common.src ]; + headersOnly = true; + noCC = true; + # meta.platforms = lib.platforms.netbsd; + makeFlags = [ "RPCGEN_CPP=${buildPackages.gcc-unwrapped}/bin/cpp" ]; + }; + + common = mkDerivation { + path = "common"; + version = "8.0"; + sha256 = "1fsm2b7p7zkhiz523jw75088cq2h39iknp0fp3di9a64bikwbhi1"; + }; + + # The full kernel + sys = mkDerivation { + path = "sys"; + version = "8.0"; + sha256 = "123ilg8fqmp69bw6bs6nh98fpi1v2n9lamrzar61p27ji6sj7g0w"; + propagatedBuildInputs = [ include ]; + #meta.platforms = lib.platforms.netbsd; + extraPaths = [ common.src ]; + MKKMOD = "no"; + }; + + headers = symlinkJoin { + name = "netbsd-headers-8.0"; + paths = [ include ] ++ map (pkg: pkg.override (_: { + installPhase = "includesPhase"; + dontBuild = true; + noCC = true; + meta.platforms = lib.platforms.all; + })) [ sys libpthread ]; + }; + ## + ## END HEADERS + ## + + ## + ## START LIBRARIES + ## + libutil = mkDerivation { + path = "lib/libutil"; + version = "8.0"; + sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; + extraPaths = [ common.src ]; + }; + + libedit = mkDerivation { + path = "lib/libedit"; + version = "8.0"; + sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; + buildInputs = [ libterminfo libcurses ]; + propagatedBuildInputs = [ compat ]; + postPatch = '' + sed -i '1i #undef bool_t' el.h + substituteInPlace config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" + substituteInPlace readline/Makefile --replace /usr/include "$out/include" + ''; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; + }; - misc = netBSDDerivation { - path = "share/misc"; + libterminfo = mkDerivation { + path = "lib/libterminfo"; version = "8.0"; - sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8"; - makeFlags = [ "BINDIR=/share" ]; + sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; + buildInputs = [ compat ]; + postPatch = '' + substituteInPlace term.c --replace /usr/share $out/share + substituteInPlace setupterm.c \ + --replace '#include <curses.h>' 'void use_env(bool);' + ''; + postInstall = '' + make -C $NETBSDSRCDIR/share/terminfo BINDIR=$out/share install + ''; + extraPaths = [ + (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") + ]; }; - locale = netBSDDerivation { - path = "usr.bin/locale"; + libcurses = mkDerivation { + path = "lib/libcurses"; version = "8.0"; - sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; - patches = [ ./locale.patch ]; - NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; + sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; + buildInputs = [ libterminfo ]; + NIX_CFLAGS_COMPILE = [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; + propagatedBuildInputs = [ compat ]; + MKDOC = "no"; # missing vfontedpr + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace printw.c \ + --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ + --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' + substituteInPlace scanw.c \ + --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' + ''; }; - column = netBSDDerivation { + libkern = mkDerivation { + path = "lib/libkern"; + version = "8.0"; + sha256 = "1wirqr9bms69n4b5sr32g1b1k41hcamm7c9n7i8c440m73r92yv4"; + meta.platforms = lib.platforms.netbsd; + }; + + column = mkDerivation { path = "usr.bin/column"; version = "8.0"; sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; }; + libossaudio = mkDerivation { + path = "lib/libossaudio"; + version = "8.0"; + sha256 = "03azp5anavhjr15sinjlik9792lyf7w4zmkcihlkksrywhs05axh"; + meta.platforms = lib.platforms.netbsd; + postPatch = '' + substituteInPlace rpc/Makefile --replace /usr $out + ''; + }; + + librpcsvc = mkDerivation { + path = "lib/librpcsvc"; + version = "8.0"; + sha256 = "14ri9w6gdhsm4id5ck133syyvbmkbknfa8w0xkklm726nskhfkj7"; + makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; + meta.platforms = lib.platforms.netbsd; + }; + + librt = mkDerivation { + path = "lib/librt"; + version = "8.0"; + sha256 = "078qsi4mg1hyyxr1awvjs9b0c2gicg3zw4vl603g1m9vm8gfxw9l"; + meta.platforms = lib.platforms.netbsd; + }; + + libcrypt = mkDerivation { + path = "lib/libcrypt"; + version = "8.0"; + sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; + meta.platforms = lib.platforms.netbsd; + }; + + libpthread = mkDerivation { + path = "lib/libpthread"; + version = "8.0"; + sha256 = "0pcz61klc3ijf5z2zf8s78nj7bwjfblzjllx7vr4z5qv3m0sdb3j"; + meta.platforms = lib.platforms.netbsd; + }; + + libresolv = mkDerivation { + path = "lib/libresolv"; + version = "8.0"; + sha256 = "11vpb3p2343wyrhw4v9gwz7i0lcpb9ysmfs9gsx56b5gkgipdy4v"; + meta.platforms = lib.platforms.netbsd; + }; + + libm = mkDerivation { + path = "lib/libm"; + version = "8.0"; + sha256 = "0i22603cgj6n00gn2m446v4kn1pk109qs1g6ylrslmihfmiy2h1d"; + meta.platforms = lib.platforms.netbsd; + }; + + i18n_module = mkDerivation { + path = "lib/i18n_module"; + version = "8.0"; + sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; + meta.platforms = lib.platforms.netbsd; + }; + + csu = mkDerivation { + path = "lib/csu"; + version = "8.0"; + sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq"; + meta.platforms = lib.platforms.netbsd; + nativeBuildInputs = [ makeMinimal install mandoc groff flex + yacc genassym gencat lorder tsort stat ]; + extraPaths = [ sys.src ld_elf_so.src ]; + }; + + ld_elf_so = mkDerivation { + path = "libexec/ld.elf_so"; + version = "8.0"; + sha256 = "1jmqpi0kg2daiqnvpwdyfy8rpnszxsm70sxizz0r7wn53xjr5hva"; + meta.platforms = lib.platforms.netbsd; + USE_FORT = "yes"; + extraPaths = [ libc.src ] ++ libc.extraPaths; + }; + + libc = mkDerivation { + path = "lib/libc"; + version = "8.0"; + sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; + USE_FORT = "yes"; + MKPROFILE = "no"; + extraPaths = [ common.src i18n_module.src sys.src + ld_elf_so.src libpthread.src libm.src libresolv.src + librpcsvc.src libutil.src librt.src libcrypt.src ]; + buildInputs = [ buildPackages.netbsd.headers csu ]; + nativeBuildInputs = [ makeMinimal install mandoc groff flex + yacc genassym gencat lorder tsort stat ]; + NIX_CFLAGS_COMPILE = "-B${csu}/lib"; + meta.platforms = lib.platforms.netbsd; + SHLIBINSTALLDIR = "$(out)/lib"; + NLSDIR = "$(out)/share/nls"; + makeFlags = [ "FILESDIR=$(out)/var/db"]; + postInstall = '' + pushd ${buildPackages.netbsd.headers} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd + + pushd ${csu} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd + + NIX_CFLAGS_COMPILE+=" -B$out/lib" + NIX_CFLAGS_COMPILE+=" -I$out/include" + NIX_LDFLAGS+=" -L$out/lib" + + make -C $NETBSDSRCDIR/lib/libpthread $makeFlags + make -C $NETBSDSRCDIR/lib/libpthread $makeFlags install + + make -C $NETBSDSRCDIR/lib/libm $makeFlags + make -C $NETBSDSRCDIR/lib/libm $makeFlags install + + make -C $NETBSDSRCDIR/lib/libresolv $makeFlags + make -C $NETBSDSRCDIR/lib/libresolv $makeFlags install + + make -C $NETBSDSRCDIR/lib/librpcsv $makeFlags + make -C $NETBSDSRCDIR/lib/librpcsv $makeFlags install + + make -C $NETBSDSRCDIR/lib/i18n_module $makeFlags + make -C $NETBSDSRCDIR/lib/i18n_module $makeFlags install + + make -C $NETBSDSRCDIR/lib/libutil $makeFlags + make -C $NETBSDSRCDIR/lib/libutil $makeFlags install + + make -C $NETBSDSRCDIR/lib/librt $makeFlags + make -C $NETBSDSRCDIR/lib/librt $makeFlags install + + make -C $NETBSDSRCDIR/lib/libcrypt $makeFlags + make -C $NETBSDSRCDIR/lib/libcrypt $makeFlags install + ''; + postPatch = '' + substituteInPlace sys/Makefile.inc \ + --replace /usr/include/sys/syscall.h ${buildPackages.netbsd.headers}/include/sys/syscall.h + ''; + }; + # + # END LIBRARIES + # + + # + # START MISCELLANEOUS + # + dict = mkDerivation { + path = "share/dict"; + noCC = true; + version = "8.0"; + sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l"; + makeFlags = [ "BINDIR=$(out)/share" ]; + }; + + misc = mkDerivation { + path = "share/misc"; + noCC = true; + version = "8.0"; + sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8"; + makeFlags = [ "BINDIR=$(out)/share" ]; + }; + + man = mkDerivation { + path = "share/man"; + noCC = true; + version = "8.0"; + sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch0"; + makeFlags = [ "FILESDIR=$(out)/share" ]; + }; + # + # END MISCELLANEOUS + # + }; -in nbPackages +in netbsd diff --git a/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix b/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix index db33b78a4aba..3b5e8f1207a2 100644 --- a/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix @@ -52,4 +52,9 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; }; + + meta = { + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + priority = 10; + }; } diff --git a/nixpkgs/pkgs/os-specific/linux/alsa-oss/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-oss/default.nix index 2b8ef40461d0..d3e7dd5fa5da 100644 --- a/nixpkgs/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/alsa-oss/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-oss-1.1.6"; + pname = "alsa-oss"; + version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/oss-lib/${name}.tar.bz2"; - sha256 = "1sj512wyci5qv8cisps96xngh7y9r5mv18ybqnazy18zwr1zgly3"; + url = "mirror://alsa/oss-lib/${pname}-${version}.tar.bz2"; + sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; }; buildInputs = [ alsaLib ncurses libsamplerate ]; diff --git a/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix index 9012f32f31df..90319efd7c78 100644 --- a/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.1.6"; + pname = "alsa-plugins"; + version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/plugins/${name}.tar.bz2"; - sha256 = "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg"; + url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; + sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz"; }; # ToDo: a52, etc.? @@ -14,6 +15,10 @@ stdenv.mkDerivation rec { ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; + configureFlags = [ + "--with-alsalconfdir=${placeholder "out"}/etc/alsa/conf.d" + ]; + meta = with lib; { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; diff --git a/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index 6cb0c123406e..ccad9795301d 100644 --- a/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -82,8 +82,8 @@ let prePatch = prePatchCommon + '' substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site - substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" - substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" ''; inherit patches; diff --git a/nixpkgs/pkgs/os-specific/linux/busybox/clang-cross.patch b/nixpkgs/pkgs/os-specific/linux/busybox/clang-cross.patch new file mode 100644 index 000000000000..b2d696bfd73f --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/busybox/clang-cross.patch @@ -0,0 +1,37 @@ +diff --git a/Makefile b/Makefile +index 6fedcffba..3385836c4 100644 +--- a/Makefile ++++ b/Makefile +@@ -271,8 +271,8 @@ export quiet Q KBUILD_VERBOSE + # Look for make include files relative to root of kernel src + MAKEFLAGS += --include-dir=$(srctree) + +-HOSTCC = gcc +-HOSTCXX = g++ ++HOSTCC = cc ++HOSTCXX = c++ + HOSTCFLAGS := + HOSTCXXFLAGS := + # We need some generic definitions +@@ -289,7 +289,7 @@ MAKEFLAGS += -rR + # Make variables (CC, etc...) + + AS = $(CROSS_COMPILE)as +-CC = $(CROSS_COMPILE)gcc ++CC = $(CROSS_COMPILE)cc + LD = $(CC) -nostdlib + CPP = $(CC) -E + AR = $(CROSS_COMPILE)ar +diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA +index f155108d7..185257064 100644 +--- a/scripts/Makefile.IMA ++++ b/scripts/Makefile.IMA +@@ -39,7 +39,7 @@ ifndef HOSTCC + HOSTCC = cc + endif + AS = $(CROSS_COMPILE)as +-CC = $(CROSS_COMPILE)gcc ++CC = $(CROSS_COMPILE)cc + LD = $(CC) -nostdlib + CPP = $(CC) -E + AR = $(CROSS_COMPILE)ar diff --git a/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/nixpkgs/pkgs/os-specific/linux/busybox/default.nix index 4b2877250821..a0f0a4c47e34 100644 --- a/nixpkgs/pkgs/os-specific/linux/busybox/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/busybox/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patches = [ ./busybox-in-store.patch - ]; + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.targetPlatform) ./clang-cross.patch; postPatch = "patchShebangs ."; diff --git a/nixpkgs/pkgs/os-specific/linux/ffado/default.nix b/nixpkgs/pkgs/os-specific/linux/ffado/default.nix index 027706c25b7b..3b3d56052485 100644 --- a/nixpkgs/pkgs/os-specific/linux/ffado/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ffado/default.nix @@ -1,61 +1,57 @@ -{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python -, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx +{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python3 +, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx3 , glibmm , alsaLib, dbus, dbus_cplusplus -, pyqt4, dbus-python }: -stdenv.mkDerivation rec { - name = "ffado-${version}"; - version = "2.4.0"; +let + inherit (python3.pkgs) pyqt5 dbus-python; + python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]); +in stdenv.mkDerivation rec { + pname = "ffado"; + version = "2.4.1"; src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f"; + sha256 = "0byr3kv58d1ryy60vr69fd868zlfkvl2gq9hl94dqdn485l9pq9y"; }; + patches = [ + # fix installing metainfo file + ./fix-build.patch + ]; + outputs = [ "out" "bin" "dev" ]; - nativeBuildInputs = [ scons pkgconfig which makeWrapper python ]; + nativeBuildInputs = [ scons pkgconfig which makeWrapper python pyqt5 ]; prefixKey = "PREFIX="; sconsFlags = [ "DEBUG=False" "ENABLE_ALL=True" - "SERIALIZE_USE_EXPAT=True" "BUILD_TESTS=False" "WILL_DEAL_WITH_XDG_MYSELF=True" "BUILD_MIXER=True" + "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" + "PYPKGDIR=${placeholder "out"}/${python3.sitePackages}" + "BINDIR=${placeholder "bin"}/bin" + "INCLUDEDIR=${placeholder "dev"}/include" + "PYTHON_INTERPRETER=${python.interpreter}" ]; - configurePhase = '' - mkdir -p $out/lib/udev/rules.d $bin/bin $dev/include \ - $out/lib/${python.libPrefix}/site-packages - sconsFlagsArray+=(UDEVDIR=$out/lib/udev/rules.d) - sconsFlagsArray+=(PYPKGDIR=$out/lib/${python.libPrefix}/site-packages) - sconsFlagsArray+=(BINDIR=$bin/bin) - sconsFlagsArray+=(INCLUDEDIR=$dev/include) - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)" - ''; - buildInputs = [ - expat libraw1394 libconfig libavc1394 libiec61883 dbus dbus_cplusplus - libxmlxx pyqt4 dbus-python glibmm + libraw1394 + libconfig + libavc1394 + libiec61883 + dbus + dbus_cplusplus + libxmlxx3 + python + glibmm ]; - postPatch = '' - sed '1iimport sys' -i SConstruct - ''; - - postInstall = '' - for exe in $bin/bin/ffado-mixer $bin/bin/ffado-diag; do - wrapProgram $exe \ - --prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages \ - --prefix PYTHONPATH : $out/share/libffado/python \ - --prefix PYTHONPATH : ${pyqt4}/lib/${python.libPrefix}/site-packages \ - --prefix PYTHONPATH : ${dbus-python}/lib/${python.libPrefix}/site-packages - done - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.ffado.org; diff --git a/nixpkgs/pkgs/os-specific/linux/ffado/fix-build.patch b/nixpkgs/pkgs/os-specific/linux/ffado/fix-build.patch new file mode 100644 index 000000000000..7e360932613f --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/ffado/fix-build.patch @@ -0,0 +1,26 @@ +From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sun, 3 Mar 2019 11:50:27 +0100 +Subject: [PATCH] Fix build on Nix + +We do not have global /usr. +--- + SConstruct | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index 05755e4b..3fbdc1d8 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -537,7 +537,7 @@ env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env ) + env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env ) + env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env ) + env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env ) +-env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env ) ++env['metainfodir'] = Template( env.destdir + env['SHAREDIR'] + "/metainfo" ).safe_substitute( env ) + + env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) ) + +-- +2.19.2 + diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix index 0c4df18afb39..0d7ce559c66d 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.4.2"; - sha256Hash = "1w39fkasq9314qx141xb8v5qqcfvqbpr3higc4vv8y4b4i58fapi"; + version = "3.5.0"; + sha256Hash = "01gs25pk58nm5il91lgwiivphk38009ihfk5l956zyzmgr9wa9a5"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch index 320c328cbd92..6f938536974a 100644 --- a/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -32,3 +32,13 @@ -fi - - +diff --git a/util/meson.build b/util/meson.build +index aa0e734..06d4378 100644 +--- a/util/meson.build ++++ b/util/meson.build +@@ -1,4 +1,4 @@ +-fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf') ++fuseconf_path = join_paths('/', get_option('sysconfdir'), 'fuse.conf') + + executable('fusermount3', ['fusermount.c', '../lib/mount_util.c'], + include_directories: include_dirs, diff --git a/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index 4d8591a845c8..87f27a2db074 100644 --- a/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf }: stdenv.mkDerivation rec { - name = "iproute2-${version}"; - version = "4.20.0"; + pname = "iproute2"; + version = "5.0.0"; src = fetchurl { - url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "1a7xyvqjxfnm7rk21amm0xgxa38clg7q7cmc4dmlg27q81mambf8"; + url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1fi03lb8dqr8hq633gcqsf6228vsvysxms075j1yyl4nlc17616z"; }; preConfigure = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "SBINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "BASH_COMPDIR=$(out)/share/bash-completion/completions" - "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs + "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs "HDRDIR=$(dev)/include/iproute2" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix b/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix index df9a628f83da..5a086612925d 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix @@ -33,6 +33,10 @@ # NixOS to implement kernel-specific behaviour. features ? {} +, # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is + # automatically extended with extra per-version and per-config values. + randstructSeed ? "" + , # A list of patches to apply to the kernel. Each element of this list # should be an attribute set {name, patch} where `name' is a # symbolic name and `patch' is the actual patch. The patch may @@ -162,7 +166,7 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { - inherit version modDirVersion src kernelPatches stdenv extraMeta configfile; + inherit version modDirVersion src kernelPatches randstructSeed stdenv extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 89639d34a6c3..f49d7de1a53d 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.110"; + version = "4.14.111"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "0wlysm6j8mmfwcja8pxg6a5c611m3x597591hswpm2nwcja3bslr"; + sha256 = "1s56819kkr7h48njk708f9gapy2hr97vxawp5qflv1izamb7s6gq"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index d043a18844b1..85a8ff54df4a 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.33"; + version = "4.19.34"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "14yk5hli62q1g8vghjjghbxjkpxns8zp0l2wmyhlx0v21bx2v89r"; + sha256 = "1k5qhyh7nwfs5pkbrjpxyj6w17424qcmmd9v7jqfbgnx3wm5wyfx"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index f583ced1a631..8923cb158b52 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.167"; + version = "4.9.168"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "130a7z31sdha84w67vfx0j1sq68v15aksfkcshz219p75y561f52"; + sha256 = "07h9xwxpdxb6gm1fy0d8s6p1zalmw3mbzjgd4gipvmzsxwhiqiad"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.0.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.0.nix index 4038a89f6c63..a418e4b4bcc0 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.6"; + version = "5.0.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${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 = "04zl3xqgr6rlkc44raz3rz74ag7l5j16wkvkdmlzrdq7ia6rljly"; + sha256 = "1v2lxwamnfm879a9qi9fwp5zyvlzjw9qa0aizidjbiwz5dk7gq8n"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp.nix index d96853eb7cfc..44499f39cc16 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,7 +1,7 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: let - mptcpVersion = "0.94.3"; - modDirVersion = "4.14.105"; + mptcpVersion = "0.94.4"; + modDirVersion = "4.14.110"; in buildLinux ({ version = "${modDirVersion}-mptcp_v${mptcpVersion}"; @@ -16,7 +16,7 @@ buildLinux ({ owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "1pic86icrlmxajw4hkqyljha8a3k4w9kb5z74xj4yiyapmk9wprm"; + sha256 = "1ng6p1djhm3m5g44yyq7gpqqbzsnhm9rimsafp5g4dx8cm27a70f"; }; structuredExtraConfig = with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; }; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index fde9e560c46f..9b1369351e07 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.1-rc3"; - modDirVersion = "5.1.0-rc3"; + version = "5.1-rc5"; + modDirVersion = "5.1.0-rc5"; extraMeta.branch = "5.1"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1nc5h0rfd40wfp8ld0d6n90haxp4xqcapwkg4vgn2m0c6dcspl2n"; + sha256 = "171caaf8zrjx124431a94sv25c0ka6b3ni194l7fpisn4n3x8y47"; }; # Should the testing kernels ever be built on Hydra? diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 4b570c1fe940..1512f47ade40 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -30,6 +30,9 @@ in { # Manually specified nixexpr representing the config # If unspecified, this will be autodetected from the .config config ? stdenv.lib.optionalAttrs allowImportFromDerivation (readConfig configfile), + # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is + # automatically extended with extra per-version and per-config values. + randstructSeed ? "", # Use defaultMeta // extraMeta extraMeta ? {}, # Whether to utilize the controversial import-from-derivation feature to parse the config @@ -111,7 +114,7 @@ let if [ -f scripts/gcc-plugins/gen-random-seed.sh ]; then substituteInPlace scripts/gcc-plugins/gen-random-seed.sh \ --replace NIXOS_RANDSTRUCT_SEED \ - $(echo ${src} ${configfile} | sha256sum | cut -d ' ' -f 1 | tr -d '\n') + $(echo ${randstructSeed}${src} ${configfile} | sha256sum | cut -d ' ' -f 1 | tr -d '\n') fi ''; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/update.sh b/nixpkgs/pkgs/os-specific/linux/kernel/update.sh index 878c3c14fe47..7a86b05dafca 100755 --- a/nixpkgs/pkgs/os-specific/linux/kernel/update.sh +++ b/nixpkgs/pkgs/os-specific/linux/kernel/update.sh @@ -48,15 +48,12 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do sed -i "s/sha256 = \".*\"/sha256 = \"$HASH\"/g" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Rewrite the expression - sed -i -e '/version = /d' -e '/modDirVersion = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - if grep -q '^[0-9]\+.[0-9]\+$' <<< "$V"; then - sed -i "\#buildLinux (args // rec {#a \ modDirVersion = \"${V}.0\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - fi + sed -i -e '/version = /d' $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE sed -i "\#buildLinux (args // rec {#a \ version = \"$V\";" $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE # Commit the changes git add -u $NIXPKGS/pkgs/os-specific/linux/kernel/$FILE - git commit -m "kernel: $OLDVER -> $V" >/dev/null 2>&1 + git commit -m "linux: $OLDVER -> $V" >/dev/null 2>&1 echo "Updated $OLDVER -> $V" done diff --git a/nixpkgs/pkgs/os-specific/linux/kmod/aggregator.nix b/nixpkgs/pkgs/os-specific/linux/kmod/aggregator.nix index 7d46a13f3562..afa8867dd07e 100644 --- a/nixpkgs/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/nixpkgs/pkgs/os-specific/linux/kmod/aggregator.nix @@ -1,7 +1,7 @@ -{ stdenv, kmod, modules, buildEnv }: +{ stdenv, kmod, modules, buildEnv, name ? "kernel-modules" }: buildEnv { - name = "kernel-modules"; + inherit name; paths = modules; diff --git a/nixpkgs/pkgs/os-specific/linux/kmod/default.nix b/nixpkgs/pkgs/os-specific/linux/kmod/default.nix index 8a09d7fea093..09cb4e11b571 100644 --- a/nixpkgs/pkgs/os-specific/linux/kmod/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kmod/default.nix @@ -6,12 +6,12 @@ let modulesDirs = lib.concatMapStringsSep ":" (x: "${x}/lib/modules") systems; in stdenv.mkDerivation rec { - name = "kmod-${version}"; - version = "25"; + pname = "kmod"; + version = "26"; src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "1kgixs4m3jvwk7fb3d18n6j77qhgi9qfv4csj35rs5ancr4ycrbi"; + url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz"; + sha256 = "17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; diff --git a/nixpkgs/pkgs/os-specific/linux/nmon/default.nix b/nixpkgs/pkgs/os-specific/linux/nmon/default.nix index 3ec0dc45e16d..bb00db9868e4 100644 --- a/nixpkgs/pkgs/os-specific/linux/nmon/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nmon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nmon-${version}"; - version = "16i"; + version = "16j"; src = fetchurl { url = "mirror://sourceforge/nmon/lmon${version}.c"; - sha256 = "0k52nvkfhwq7125gbrz7p56gid4rik59am8w22ja8ihiribdfrmg"; + sha256 = "05a6yc1w421r30qg32a8j0wajjv2ff1mwwsrariv3fz3ng4phf5s"; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index c729a35925fc..13b645c80891 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { beta = stable; stable_418 = generic { - version = "418.43"; - sha256_64bit = "0zrjd8wfc8cknfwiyy3llsnn1mympfxxszz7gzakncp3vs1jrghq"; - settingsSha256 = "1rzxxn7nrhwndl2lgjakxi0rblfkqjyl1n70fl7rcs6g75mi1qsq"; - persistencedSha256 = "14m4x5r0yc23sg4xx523ccfpxsr6dgm2n3xy9zdibl1cpzz50ikc"; + version = "418.56"; + sha256_64bit = "1cg7927g5ml1rwgpydlrjzr55gza5dfkqkch29bbarpzd7dh0mf4"; + settingsSha256 = "1dai4dh6g3arkgicbjwhfr948i1xc13a7s0xcgalan0pn5zd56z6"; + persistencedSha256 = "1r13jjpqg9ri5mw633k01dq2ivblc8nrbsnh7709v1xibaydwnhn"; }; # Last one supporting x86 diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1a08a89dc233..4bbb9d92930e 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -86,7 +86,7 @@ let }; meta = with stdenv.lib; { - homepage = http://www.nvidia.com/object/unix.html; + homepage = https://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index c6993d146f19..38f808cee3ff 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nvidia.com/object/unix.html; + homepage = https://www.nvidia.com/object/unix.html; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix index e2ef51da3803..7106550c39e1 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.nvidia.com/object/unix.html; + homepage = https://www.nvidia.com/object/unix.html; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; diff --git a/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix b/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix index 49171697ffec..4bf1e41bd57b 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nvme-cli-${version}"; - version = "1.7"; + version = "1.8.1"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "1wwr31s337km3v528hvsq72j2ph17fir0j3rr622z74k68pzdh1x"; + sha256 = "0agnxfcwgnnimmxrdpg4lmiqc5ai9b4amk8krriw01lflxi3xzn0"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix b/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix index 6ba4f8d4b064..f9d6dc99db83 100644 --- a/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix +++ b/nixpkgs/pkgs/os-specific/linux/rfkill/udev.nix @@ -27,9 +27,10 @@ let rfkillHook = substituteAll { - inherit (stdenv) shell; - src = ./rfkill-hook.sh; - }; + inherit (stdenv) shell; + isExecutable = true; + src = ./rfkill-hook.sh; + }; in stdenv.mkDerivation { name = "rfkill-udev"; @@ -44,7 +45,6 @@ in stdenv.mkDerivation { mkdir -p "$out/bin/"; cp ${rfkillHook} "$out/bin/rfkill-hook.sh" - chmod +x "$out/bin/rfkill-hook.sh"; ''; meta = { diff --git a/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix index c2fb55b344b4..d5bbe91979ff 100644 --- a/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "roccat-tools-${version}"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { url = "mirror://sourceforge/roccat/${name}.tar.bz2"; - sha256 = "15gxplcm62167xhk65k8v6gg3j6jr0c5a64wlz72y1vfq0ai7qm6"; + sha256 = "0fr1ibgsyx756fz43hxq0cik51rkq1ymgimw8mz2d0jy63d7h48q"; }; postPatch = '' diff --git a/nixpkgs/pkgs/os-specific/linux/service-wrapper/default.nix b/nixpkgs/pkgs/os-specific/linux/service-wrapper/default.nix index 6c9635b3aee4..8adb2e5413c4 100644 --- a/nixpkgs/pkgs/os-specific/linux/service-wrapper/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/service-wrapper/default.nix @@ -7,6 +7,7 @@ in runCommand "${name}" { script = substituteAll { src = ./service-wrapper.sh; + isExecutable = true; inherit (stdenv) shell; inherit coreutils; }; diff --git a/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix b/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix index 27b27ebffdd8..96bffc63a276 100644 --- a/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.1.2"; + name = "sysstat-12.1.3"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "0xiv70x4n24fcycvlq95lqgb3jwjxfzq61bnyqai57x54hhn46yp"; + sha256 = "1am1a6mwi91921rrq8ivgczdsl4gdz91zxkx7vnrzfjm4zw8njam"; }; buildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/os-specific/linux/tomb/default.nix b/nixpkgs/pkgs/os-specific/linux/tomb/default.nix index a43c53e02bbd..d932ebd776bc 100644 --- a/nixpkgs/pkgs/os-specific/linux/tomb/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tomb/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, gettext, zsh, pinentry, cryptsetup, gnupg, makeWrapper }: +{ stdenv, lib, fetchFromGitHub, makeWrapper +, gettext, zsh, pinentry, cryptsetup, gnupg, utillinux, e2fsprogs, sudo +}: stdenv.mkDerivation rec { name = "tomb-${version}"; @@ -11,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1wk1aanzfln88min29p5av2j8gd8vj5afbs2gvarv7lvx1vi7kh1"; }; + buildInputs = [ sudo zsh pinentry ]; + nativeBuildInputs = [ makeWrapper ]; postPatch = '' @@ -19,19 +23,15 @@ stdenv.mkDerivation rec { --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb' ''; - buildPhase = '' - # manually patch the interpreter - sed -i -e "1s|.*|#!${zsh}/bin/zsh|g" tomb - ''; + doInstallCheck = true; + installCheckPhase = "$out/bin/tomb -h"; installPhase = '' install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 - ln -s ${gnupg}/bin/gpg $out/bin/gpg - wrapProgram $out/bin/tomb \ - --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext gnupg pinentry utillinux e2fsprogs ]} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix index 2a9d42988b5b..83674aa64219 100644 --- a/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/v4l-utils/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "v4l-utils-${version}"; - version = "1.16.2"; + version = "1.16.5"; src = fetchurl { url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0iwfdp4ghzd6l9qg5545032vwmqy2rnhk0xf1g9mad67l74hhckc"; + sha256 = "06yz34ncrpxshs9w2nqz62xj4wm7hni1fvjnvjhifl1q20jj907d"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index b34a44715a57..37a2e6369d47 100644 --- a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.7.12"; + version = "3.7.14"; src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz"; - sha256 = "14w7czxqdxgmsqxrvphzpyha1nq3yfhka4vy8wyzwixindgj493q"; + sha256 = "12lx4ij89khg9nfiq5l9bijgm7yjrw9kh7y09wqjhv2ws0mq3437"; }; buildInputs = diff --git a/nixpkgs/pkgs/servers/atlassian/confluence.nix b/nixpkgs/pkgs/servers/atlassian/confluence.nix index f7b39c3cf7c6..ca241192156a 100644 --- a/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.14.2"; + version = "6.15.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; - sha256 = "012lh2838l2n7wkj42isxspxw3ix54467vnzvxbsq8wnf2m367ln"; + sha256 = "01b7k4i38xjjkfjcphylyxhsff6ckgi4nsz6nlw2ax8a3avrmnfd"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/servers/atlassian/crowd.nix b/nixpkgs/pkgs/servers/atlassian/crowd.nix index 2b32357089e0..27856bf2762b 100644 --- a/nixpkgs/pkgs/servers/atlassian/crowd.nix +++ b/nixpkgs/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "3.3.4"; + version = "3.4.3"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "007jyizrkmn97kfkczpsk8128qsd5lj2343vfhd70w82p01qjy21"; + sha256 = "0swp41lr7n318jxl61w5c09485ygn261zc74p7xaisrwmh9ygyzs"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/servers/atlassian/jira.nix b/nixpkgs/pkgs/servers/atlassian/jira.nix index 3c7c0dc6156a..99888c488ac2 100644 --- a/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0cf0j781k23fs3jzrd4ranzvqnhdnza8dbaqxx31dk3p7c7168bw"; + sha256 = "0mi1xknly44haf7gls3k212fx1dsl8k35rq82a1b3zj27kynwqr3"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/servers/coturn/default.nix b/nixpkgs/pkgs/servers/coturn/default.nix index 0c21c475abd7..ad15db070f41 100644 --- a/nixpkgs/pkgs/servers/coturn/default.nix +++ b/nixpkgs/pkgs/servers/coturn/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./pure-configure.patch ]; meta = with stdenv.lib; { - homepage = http://coturn.net/; + homepage = https://coturn.net/; license = with licenses; [ bsd3 ]; description = "A TURN server"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/servers/demoit/default.nix b/nixpkgs/pkgs/servers/demoit/default.nix new file mode 100644 index 000000000000..24eafb987478 --- /dev/null +++ b/nixpkgs/pkgs/servers/demoit/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildGoPackage +, fetchFromGitHub +}: + +buildGoPackage rec { + pname = "demoit"; + version = "unstable-2019-03-29"; + goPackagePath = "github.com/dgageot/demoit"; + + src = fetchFromGitHub { + owner = "dgageot"; + repo = "demoit"; + rev = "ec70fbdf5a5e92fa1c06d8f039f7d388e0237ba2"; + sha256 = "01584cxlnrc928sw7ldmi0sm7gixmwnawy3c5hd79rqkw8r0gbk0"; + }; + + meta = with stdenv.lib; { + description = "Live coding demos without Context Switching"; + homepage = https://github.com/dgageot/demoit; + license = licenses.asl20; + maintainers = [ maintainers.freezeboy ]; + }; +} diff --git a/nixpkgs/pkgs/servers/dns/bind/default.nix b/nixpkgs/pkgs/servers/dns/bind/default.nix index 0183d745990b..39589b3698fb 100644 --- a/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { doCheck = false; # requires root and the net meta = { - homepage = http://www.isc.org/software/bind; + homepage = https://www.isc.org/downloads/bind/; description = "Domain name server"; license = stdenv.lib.licenses.mpl20; diff --git a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index fd5e79b6efb8..9ef49309dbb7 100644 --- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "494ad926705018bd754d96711dc2129f3173f326a0b57d33978090ba4eef87ef"; + sha256 = "b21bf03e5cb6804df4e0e8b3898446349e86ddae5bf110edaf240d0ad1e2a2c6"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/documize-community/default.nix b/nixpkgs/pkgs/servers/documize-community/default.nix new file mode 100644 index 000000000000..4f1a420c9109 --- /dev/null +++ b/nixpkgs/pkgs/servers/documize-community/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoPackage, fetchFromGitHub, go-bindata, go-bindata-assetfs }: + +buildGoPackage rec { + pname = "documize-community"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "documize"; + repo = "community"; + rev = "v${version}"; + sha256 = "09s5js0zb3mh3g5qz8f3l2cqjn01kjb35kinfv932nf2rfyrmyqz"; + }; + + goPackagePath = "github.com/documize/community"; + + buildInputs = [ go-bindata-assetfs go-bindata ]; + + buildPhase = '' + runHook preBuild + + pushd go/src/github.com/documize/community + go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go + popd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $bin/bin + cp go/src/github.com/documize/community/bin/documize $bin/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; + license = licenses.agpl3; + maintainers = with maintainers; [ ma27 ]; + homepage = https://www.documize.com/; + }; +} diff --git a/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix b/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix index f41bb726a28c..978e4fe109c0 100644 --- a/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/nixpkgs/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "pure-ftpd-1.0.47"; + name = "pure-ftpd-1.0.48"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; - sha256 = "1b97ixva8m10vln8xrfwwwzi344bkgxqji26d0nrm1yzylbc6h27"; + sha256 = "1xr1wlf08qaw93irsbdk4kvhqnkvmi6p0jb8kiiz0vr0h92pszxl"; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 26dd0fa877b6..d027cf185e60 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.91.1"; + version = "0.91.3"; components = { "abode" = ps: with ps; [ ]; "abode.alarm_control_panel" = ps: with ps; [ ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 85aa4caf0833..eacfa707ebdb 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -64,6 +64,20 @@ let (mkOverride "colorlog" "4.0.2" "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42") + # required by home-assistant-frontend + (self: super: { + user-agents = super.user-agents.overridePythonAttrs (oldAttrs: rec { + version = "1.1.0"; + src = fetchFromGitHub { + owner = "selwin"; + repo = "python-user-agents"; + rev = "v${version}"; + sha256 = "14kxd780zhp8718xr1z63xffaj3bvxgr4pldh9sv943m4hvi0gw5"; + }; + doCheck = false; # can be dropped for 2.0 + }); + }) + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -97,7 +111,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.91.1"; + hassVersion = "0.91.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -112,7 +126,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1y2sv9qq7zmb85n2f5b3csnc60xi87ccpkmhz8ii9gkjw6swikyh"; + sha256 = "00zzb466xbyz8sxjszkjsgks4smj94qw40agwyfn75ciiib2p8fw"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/http/showoff/Gemfile b/nixpkgs/pkgs/servers/http/showoff/Gemfile new file mode 100644 index 000000000000..cfd295096bc1 --- /dev/null +++ b/nixpkgs/pkgs/servers/http/showoff/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'showoff' diff --git a/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock b/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock new file mode 100644 index 000000000000..ccf0415d440b --- /dev/null +++ b/nixpkgs/pkgs/servers/http/showoff/Gemfile.lock @@ -0,0 +1,73 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + commonmarker (0.18.2) + ruby-enum (~> 0.5) + concurrent-ruby (1.1.5) + daemons (1.3.1) + em-websocket (0.3.8) + addressable (>= 2.1.1) + eventmachine (>= 0.12.9) + eventmachine (1.2.7) + fidget (0.0.6) + ruby-dbus (< 0.15.0) + gli (2.18.0) + htmlentities (4.3.4) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + iso-639 (0.2.8) + json (2.2.0) + mini_portile2 (2.4.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + parslet (1.8.2) + public_suffix (3.0.3) + rack (1.6.11) + rack-contrib (1.8.0) + rack (~> 1.4) + rack-protection (1.5.5) + rack + redcarpet (3.4.0) + ruby-dbus (0.14.1) + ruby-enum (0.7.2) + i18n + showoff (0.20.1) + commonmarker + fidget (>= 0.0.3) + gli (>= 2.0) + htmlentities + i18n + iso-639 + json + nokogiri + parslet + rack-contrib + redcarpet + sinatra (~> 1.3) + sinatra-websocket + thin (~> 1.3) + tilt (>= 2.0.3) + sinatra (1.4.8) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + sinatra-websocket (0.3.1) + em-websocket (~> 0.3.6) + eventmachine + thin (>= 1.3.1, < 2.0.0) + thin (1.7.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + tilt (2.0.9) + +PLATFORMS + ruby + +DEPENDENCIES + showoff + +BUNDLED WITH + 1.16.3 diff --git a/nixpkgs/pkgs/servers/http/showoff/default.nix b/nixpkgs/pkgs/servers/http/showoff/default.nix new file mode 100644 index 000000000000..79b92bdd7c57 --- /dev/null +++ b/nixpkgs/pkgs/servers/http/showoff/default.nix @@ -0,0 +1,16 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "showoff"; + gemdir = ./.; + exes = [ "showoff" ]; + + meta = with lib; { + description = "A slideshow presentation tool with a twist"; + longDescription = "It runs as a web application, with audience interactivity features. This means that your audience can follow along in their own browsers, can download supplemental materials, can participate in quizzes or polls, post questions for the presenter, etc. By default, their slideshows will synchronize with the presenter, but they can switch to self-navigation mode"; + homepage = https://puppetlabs.github.io/showoff/; + license = with licenses; mit; + platforms = platforms.unix; + maintainers = with maintainers; [ mwilsoninsight ]; + }; +} diff --git a/nixpkgs/pkgs/servers/http/showoff/gemset.nix b/nixpkgs/pkgs/servers/http/showoff/gemset.nix new file mode 100644 index 000000000000..334f09e8a0d0 --- /dev/null +++ b/nixpkgs/pkgs/servers/http/showoff/gemset.nix @@ -0,0 +1,231 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + type = "gem"; + }; + version = "2.6.0"; + }; + commonmarker = { + dependencies = ["ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "122dy5mzx4p86flpzyg3raf742zp5ab9bjr7zk29p3ixpncf0rdk"; + type = "gem"; + }; + version = "0.18.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + type = "gem"; + }; + version = "1.1.5"; + }; + daemons = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + type = "gem"; + }; + version = "1.3.1"; + }; + em-websocket = { + dependencies = ["addressable" "eventmachine"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xkb1rc6dd3y5s7qsp4wqrri3n9gwsbvnwwv6xwgp241jxdpp4iq"; + type = "gem"; + }; + version = "0.3.8"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + fidget = { + dependencies = ["ruby-dbus"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04g2846wjlb8ms5041lv37aqs4jzsziwv58bxg7yzc61pdvi4ksb"; + type = "gem"; + }; + version = "0.0.6"; + }; + gli = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133glfzsq67ykmdsgp251s9kddg9x4qki2jpbjv25h3hawlql4hs"; + type = "gem"; + }; + version = "2.18.0"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; + type = "gem"; + }; + version = "1.6.0"; + }; + iso-639 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10k1gpkkbxbasgjzh4hd32ygxzjb5312rphipm46ryxkpx556zzz"; + type = "gem"; + }; + version = "0.2.8"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + type = "gem"; + }; + version = "2.2.0"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + type = "gem"; + }; + version = "2.4.0"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; + type = "gem"; + }; + version = "1.10.1"; + }; + parslet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; + type = "gem"; + }; + version = "1.8.2"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; + type = "gem"; + }; + version = "1.6.11"; + }; + rack-contrib = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l7m0av4pjl5p64l8j7pkip1jwhkp80a8kc2j7b9lrwh04fgx5wx"; + type = "gem"; + }; + version = "1.8.0"; + }; + rack-protection = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + type = "gem"; + }; + version = "1.5.5"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + ruby-dbus = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16lsqdwas6ngyyvq51l7lynj5ayis17zm5hpsg5x3m3n6r5k2gv4"; + type = "gem"; + }; + version = "0.14.1"; + }; + ruby-enum = { + dependencies = ["i18n"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + type = "gem"; + }; + version = "0.7.2"; + }; + showoff = { + dependencies = ["commonmarker" "fidget" "gli" "htmlentities" "i18n" "iso-639" "json" "nokogiri" "parslet" "rack-contrib" "redcarpet" "sinatra" "sinatra-websocket" "thin" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14884kh7vrp5b72dpn7q26h49y7igxqza72girkv1h28qx4kqw4r"; + type = "gem"; + }; + version = "0.20.1"; + }; + sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + type = "gem"; + }; + version = "1.4.8"; + }; + sinatra-websocket = { + dependencies = ["em-websocket" "eventmachine" "thin"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0as52mfw34z3ba6qjab009h2rdn0za0iwrc42kw948hbb8qzcm5m"; + type = "gem"; + }; + version = "0.3.1"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; + type = "gem"; + }; + version = "1.7.2"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + type = "gem"; + }; + version = "2.0.9"; + }; +} \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/nixpkgs/pkgs/servers/hylafaxplus/default.nix index dc53ee36f702..f5876687f8e7 100644 --- a/nixpkgs/pkgs/servers/hylafaxplus/default.nix +++ b/nixpkgs/pkgs/servers/hylafaxplus/default.nix @@ -87,9 +87,28 @@ stdenv.mkDerivation { dontAddPrefix = true; postInstall = ''. ${postInstall}''; postInstallCheck = ''. ${./post-install-check.sh}''; - meta.description = "enterprise-class system for sending and receiving facsimiles"; - meta.homepage = http://hylafax.sourceforge.net; - meta.license = lib.licenses.bsd3; - meta.maintainers = [ lib.maintainers.yarny ]; - meta.platforms = lib.platforms.linux; + meta = { + description = "enterprise-class system for sending and receiving facsimiles"; + downloadPage = https://hylafax.sourceforge.io/download.php; + homepage = https://hylafax.sourceforge.io; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.yarny ]; + platforms = lib.platforms.linux; + longDescription = '' + HylaFAX is a scalable and time-proven solution + for sending and receiving facsimiles via modem(s). + It is based on a client-server architecture, + loosely comparable to CUPS: + A client connects to a server to issue outbound jobs, + the server then chooses a modem to + connect to the receiving fax machine. + The server notifies users about their + outbound jobs as well as about inbound jobs. + HylaFAX+ is a fork of HylaFAX that -- in general -- + contains a superset of the features of + HylaFAX and produces releases more often. + This package contains the client + and the server parts of HylaFAX+. + ''; + }; } diff --git a/nixpkgs/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix index a4940850cc52..30a6aa5aeec6 100644 --- a/nixpkgs/pkgs/servers/jackett/default.nix +++ b/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.846"; + version = "0.11.170"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1y1hqa7w04zs6lhyg8624b5iv8l0ni4v887mckaqqp312xmhniq7"; + sha256 = "1qnlbndls62mvpllg8177l7mihldz5nwig63gfk7in2r0b0477l3"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/lidarr/default.nix b/nixpkgs/pkgs/servers/lidarr/default.nix index 897c061c918d..fb2fd42dd7da 100644 --- a/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/nixpkgs/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lidarr-${version}"; - version = "0.5.0.583"; + version = "0.6.0.815"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz"; - sha256 = "0vqnx8vd7mv4lsl7ffsjanl9pm107bk3ndvfka2ky74qisrqcyz7"; + sha256 = "08aa286y71pzn8wxjiag1bn5303i05jznqwmgrbqfb4jwz94pyjs"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix index a8c09945fa92..756796d62017 100644 --- a/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "0n5abzs2i3mz65p5dwbph5bdamqv28wc1iw4gc4f84m0cda1vs0r"; + sha256 = "120944v0n2qh30ri5604h4xz38jm94f6s00gwhsjvs1sfm6csapz"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/nixpkgs/pkgs/servers/metabase/default.nix b/nixpkgs/pkgs/servers/metabase/default.nix index 0f2f291318c7..f8a5ae31ffef 100644 --- a/nixpkgs/pkgs/servers/metabase/default.nix +++ b/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.30.4"; + version = "0.32.2"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "0mvyl5v798qwdydqsjjq94ihfwi62kq4gprxjg3rcckmjdyx2ycs"; + sha256 = "1df2cvlqm0pz7w5094fv20308m0d2z4szlv46dzsfdw03hny50xn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 7021b2210bd5..6fd416baae83 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.1.1"; + version = "6.1.3"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1n7wr89sbpdi1zpqvmyidp9y0mjdnxgdv7bj6gc9kkp6dskqk1r8"; + sha256 = "0svg1q3h8m3i6snznsx0lwzb7lrv532v0nvpbwr6ydg2gd3aqwih"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0dbqqm3z2z4bxgq9y2lbjx6znjgqmsyz8qih2b4z6j3fvixfa5sw"; + sha256 = "0a7160lmi67pa32q5d6ib14vp5rx7850w0vvfxchmdm08dv3hm7k"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix index 530c4305088b..e104f31a74de 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.15.3"; + version = "0.16.2"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,12 +11,9 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "037wwfadb9rp1592v8bkqcsy9ym4gbhkg3pz6a6fzirg65d29aia"; + sha256 = "0zjyr9964qxv5fsb17qhmxa1v4z0c7va60n05p9w6j2ah4dmcd8q"; }; - # Tests exist, but seem to clash with the firewall. - doCheck = false; - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' -ldflags= -X ${t}.Version=${version} diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 03080376ec2a..548049cdac5d 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -2,8 +2,8 @@ let goPackagePath = "github.com/prometheus/prometheus"; - - generic = { version, sha256, ... }@attrs: +in rec { + buildPrometheus = { version, sha256, doCheck ? true, ... }@attrs: let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in buildGoPackage ({ name = "prometheus-${version}"; @@ -17,8 +17,6 @@ let inherit sha256; }; - doCheck = true; - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' -ldflags= -X ${t}.Version=${version} @@ -43,14 +41,14 @@ let platforms = platforms.unix; }; } // attrs'); -in rec { - prometheus_1 = generic { + + prometheus_1 = buildPrometheus { version = "1.8.2"; sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv"; }; - prometheus_2 = generic { - version = "2.6.0"; - sha256 = "1d9zwzs280pw9zspqwp7xx3ji04lfg2v9l5qhrfy3y633ghcmpxz"; + prometheus_2 = buildPrometheus { + version = "2.8.1"; + sha256 = "0x8w0qdh4lcf19nmdlhvgzpy08c2a932d3k49cjwhi5npcsf858n"; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix index 4c6cc694243d..3c3835913865 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "pushgateway-${version}"; - version = "0.7.0"; + version = "0.8.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "1sczg6vrpxv0jlqhkif8443v7mhbp3lp40g71ndqkf1s669m1pl4"; + sha256 = "1mzwkxnznv6wzy7dc8rksa8gr7z92plrzls8gb8rk432zfqcbv6a"; }; buildUser = "nix@nixpkgs"; diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index d3ddfe26d4a5..ee3b9d818ce1 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "telegraf-${version}"; - version = "1.9.2"; + version = "1.10.2"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = "${version}"; - sha256 = "1416nx7mxa0b3bmnkarksicgvw6wja6s8xrf22yzak38qmmrpz2m"; + sha256 = "0g27yczb49xf8nbhkzx7lv8378613afq9qx1gr5yhlpfrl4sgb69"; }; buildFlagsArray = [ ''-ldflags= diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix index f65115a8622e..2655595ee693 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/deps-1.9.2.nix +++ b/nixpkgs/pkgs/servers/monitoring/telegraf/deps-1.10.2.nix @@ -91,15 +91,6 @@ }; } { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { goPackagePath = "github.com/alecthomas/units"; fetch = { type = "git"; @@ -154,6 +145,15 @@ }; } { + goPackagePath = "github.com/caio/go-tdigest"; + fetch = { + type = "git"; + url = "https://github.com/caio/go-tdigest"; + rev = "f3c8d94f65d3096ac96eda54ffcd10c0fe1477f1"; + sha256 = "0w3imv58rhb34x63w8m0k18yr6bnc2bf2rpz23dh82yvdg57nl6r"; + }; + } + { goPackagePath = "github.com/cenkalti/backoff"; fetch = { type = "git"; @@ -316,6 +316,15 @@ }; } { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; + sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; + }; + } + { goPackagePath = "github.com/go-ini/ini"; fetch = { type = "git"; @@ -329,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/go-logfmt/logfmt"; - rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + rev = "07c9b44f60d7ffdfb7d8efe1ad539965737836dc"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; }; } { @@ -451,6 +460,15 @@ }; } { + goPackagePath = "github.com/harlow/kinesis-consumer"; + fetch = { + type = "git"; + url = "https://github.com/harlow/kinesis-consumer"; + rev = "2f58b136fee036f5de256b81a8461cc724fdf9df"; + sha256 = "1m8ns5gipxxs2fkln494gqy1axhz8393cjan5wkdxc6xfchd0wa5"; + }; + } + { goPackagePath = "github.com/hashicorp/consul"; fetch = { type = "git"; @@ -559,6 +577,15 @@ }; } { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "2de2192f9e35ce981c152a873ed943b93b79ced4"; + sha256 = "014n3pq9b4m2gx7h3ncf5xk7kw8g89yhbvnfc6dqg006r9q26w4w"; + }; + } + { goPackagePath = "github.com/kballard/go-shellquote"; fetch = { type = "git"; @@ -577,6 +604,15 @@ }; } { + goPackagePath = "github.com/kubernetes/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "d41becfba9ee9bf8e55cec1dd3934cd7cfc04b99"; + sha256 = "0d7akj020fahqgmicig39vfbs1nvkxachwbyw8wk2w90pfsicff1"; + }; + } + { goPackagePath = "github.com/leodido/ragel-machinery"; fetch = { type = "git"; @@ -761,8 +797,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + rev = "505eaef017263e299324067d40ca2c48f6a2cf50"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; }; } { @@ -824,8 +860,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "8048a2e9c5773235122027dd585cf821b2af1249"; - sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29"; + rev = "071446942108a03a13cf0717275ad3bdbcb691b4"; + sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp"; }; } { @@ -932,8 +968,17 @@ fetch = { type = "git"; url = "https://github.com/vmware/govmomi"; - rev = "e3a01f9611c32b2362366434bcd671516e78955d"; - sha256 = "0cicd4m8ll7y1n0c97drmvmqwsqaspwpzc6nfp73f887m8ff1xis"; + rev = "3617f28d167d448f93f282a867870f109516d2a5"; + sha256 = "1a82g4vzfgzp8ppcq3dhgv8van85am467ckx788yqk7rj4c3i5ir"; + }; + } + { + goPackagePath = "github.com/wavefronthq/wavefront-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/wavefronthq/wavefront-sdk-go"; + rev = "fa87530cd02a8ad08bd179e1c39fb319a0cc0dae"; + sha256 = "000ynkkpg2m4xynkmdx47asydw66nzp94f276gifws1a90yacay0"; }; } { @@ -976,7 +1021,7 @@ goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://go.googlesource.com/crypto"; + url = "https://github.com/golang/crypto.git"; rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; }; @@ -1000,19 +1045,28 @@ }; } { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://github.com/golang/sync.git"; + rev = "42b317875d0fa942474b76e1b46a6060d720ae6e"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; - sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + rev = "7c4c994c65f702f41ed7d6620a2cb34107576a77"; + sha256 = "19ss1k6id7dc0i61vw9arz03vpvwc2mxwdn99qq2galy0z3b8hbi"; }; } { goPackagePath = "golang.org/x/text"; fetch = { type = "git"; - url = "https://go.googlesource.com/text"; + url = "https://github.com/golang/text.git"; rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; @@ -1054,15 +1108,6 @@ }; } { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { goPackagePath = "gopkg.in/asn1-ber.v1"; fetch = { type = "git"; @@ -1099,6 +1144,15 @@ }; } { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { goPackagePath = "gopkg.in/ldap.v2"; fetch = { type = "git"; @@ -1143,4 +1197,4 @@ sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } -] +] \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/nextcloud/default.nix b/nixpkgs/pkgs/servers/nextcloud/default.nix index d0d0480e5eae..3138cc8ee1e3 100644 --- a/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.5"; + version = "15.0.6"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "125ra0rdgk17d8s80i54w0s58dqvjgkdpcxbczchqd3sg6dqcqa6"; + sha256 = "1k1c0wlrhdpkvwf7iq8yjxd8gqmmj7dyd913rqzrg9jbnvz5jc82"; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix index 6ac087241ce0..eaa85e69bec0 100644 --- a/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix +++ b/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, gawk, bash, getopt, procps -, which, jre, version, sha256, ... +, which, jre, version, sha256, coreutils, ... }: let @@ -43,16 +43,30 @@ stdenv.mkDerivation rec { rmdir $out/doc fi - for cmd in bin/cassandra bin/nodetool bin/sstablekeys \ - bin/sstableloader bin/sstableupgrade \ - tools/bin/cassandra-stress tools/bin/cassandra-stressd \ - tools/bin/sstablemetadata tools/bin/sstableofflinerelevel \ - tools/bin/token-generator tools/bin/sstablelevelreset; do + + for cmd in bin/cassandra \ + bin/nodetool \ + bin/sstablekeys \ + bin/sstableloader \ + bin/sstablescrub \ + bin/sstableupgrade \ + bin/sstableutil \ + bin/sstableverify \ + tools/bin/cassandra-stress \ + tools/bin/cassandra-stressd \ + tools/bin/sstabledump \ + tools/bin/sstableexpiredblockers \ + tools/bin/sstablelevelreset \ + tools/bin/sstablemetadata \ + tools/bin/sstableofflinerelevel \ + tools/bin/sstablerepairedset \ + tools/bin/sstablesplit \ + tools/bin/token-generator; do # check if file exists because some bin tools don't exist across all # cassandra versions if [ -f $out/$cmd ]; then - wrapProgram $out/$cmd \ + makeWrapper $out/$cmd $out/bin/$(${coreutils}/bin/basename "$cmd") \ --suffix-each LD_LIBRARY_PATH : ${libPath} \ --prefix PATH : ${binPath} \ --set JAVA_HOME ${jre} diff --git a/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index a47553b975e3..1bbdc6789529 100644 --- a/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -1,14 +1,14 @@ { lib, buildGoPackage, fetchFromGitHub, }: buildGoPackage rec { - name = "influxdb-${version}"; - version = "1.6.3"; + pname = "influxdb"; + version = "1.7.5"; src = fetchFromGitHub { owner = "influxdata"; - repo = "influxdb"; + repo = pname; rev = "v${version}"; - sha256 = "0xf16liapllk8qnw0vsy1ja4if1xlazwwaa4p0r5j7bny5lxm7zy"; + sha256 = "0gwivazjvxw6fflf2637qn0crq564fjzhncsl3agph5ciqyv48gx"; }; buildFlagsArray = [ ''-ldflags= @@ -19,13 +19,12 @@ buildGoPackage rec { excludedPackages = "test"; - # Generated with dep2nix (for 1.6.3) / nix2go (for 1.4.1). - goDeps = ./. + "/deps-${version}.nix"; + goDeps = ./deps.nix; meta = with lib; { description = "An open-source distributed time series database"; license = licenses.mit; - homepage = https://influxdb.com/; + homepage = https://influxdata.com/; maintainers = with maintainers; [ offline zimbatm ]; }; } diff --git a/nixpkgs/pkgs/servers/nosql/influxdb/deps-1.4.1.nix b/nixpkgs/pkgs/servers/nosql/influxdb/deps-1.4.1.nix deleted file mode 100644 index edda6ff7c7dc..000000000000 --- a/nixpkgs/pkgs/servers/nosql/influxdb/deps-1.4.1.nix +++ /dev/null @@ -1,227 +0,0 @@ -[ - { - goPackagePath = "collectd.org"; - fetch = { - type = "git"; - url = "https://github.com/collectd/go-collectd"; - rev = "e84e8af5356e7f47485bbc95c96da6dd7984a67e"; - sha256 = "0cfxg8iz7bdy3d74cqjns7x7lyrma5lkrqqpqk79a2gk0g2bhmnd"; - }; - } - { - goPackagePath = "github.com/bmizerany/pat"; - fetch = { - type = "git"; - url = "https://github.com/bmizerany/pat"; - rev = "c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c"; - sha256 = "02ayddkp2b22rixw5jldw3kb6762zzkg5zhxwcv9v9yp0x39qw6r"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "4b1ebc1869ad66568b313d0dc410e2be72670dda"; - sha256 = "1narpch9fc2f4yj8asb981gyq7b3z6p41xb635xh2k75yv5g024w"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b"; - sha256 = "1h7dym9fmk7rwrrc26lcwi7wmf4y4rxgg7byivg55yia9wlhy00m"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "24c63f56522a87ec5339cc3567883f1039378fdb"; - sha256 = "1xjb3cj9qa66dk6sfrlggfm4a66qirqrp4qds90xzjj5sx51j4zk"; - }; - } - { - goPackagePath = "github.com/dgryski/go-bits"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-bits"; - rev = "2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef"; - sha256 = "08mxwa4c77dgpvz2ygwd0pc929qxwff95y680mjjgbvj8yifiag2"; - }; - } - { - goPackagePath = "github.com/dgryski/go-bitstream"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-bitstream"; - rev = "7d46cd22db7004f0cceb6f7975824b560cf0e486"; - sha256 = "1k9l16y7l2mkfvnp2ydv9cqly8179wqd20am4zy0q77qcsawkksx"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9"; - sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; - sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; - }; - } - { - goPackagePath = "github.com/influxdata/influxql"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/influxql"; - rev = "3921ab7858b6af8443fe0bef06b52608be72852c"; - sha256 = "182ja5a9njlklavh5hzf7p06913pznp7j3chkrp0qwxj3jxysi2d"; - }; - } - { - goPackagePath = "github.com/influxdata/usage-client"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/usage-client"; - rev = "6d3895376368aa52a3a81d2a16e90f0f52371967"; - sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl"; - }; - } - { - goPackagePath = "github.com/influxdata/yamux"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/yamux"; - rev = "1f58ded512de5feabbe30b60c7d33a7a896c5f16"; - sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx"; - }; - } - { - goPackagePath = "github.com/influxdata/yarpc"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/yarpc"; - rev = "036268cdec22b7074cd6d50cc6d7315c667063c7"; - sha256 = "12xxwr451ya5h7kv7lg6lnwk04xazyxzv2g7bcgx9zifafxlhpxf"; - }; - } - { - goPackagePath = "github.com/jwilder/encoding"; - fetch = { - type = "git"; - url = "https://github.com/jwilder/encoding"; - rev = "27894731927e49b0a9023f00312be26733744815"; - sha256 = "0g4sdc5wj50js2hhrdcb7iik3wpd87gc0ivy4gwn49m8nxlpl7w3"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "88609521dc4b6c858fd4c98b628147da928ce4ac"; - sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "1612a298117663d7bc9a760ae20d383413859798"; - sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl"; - }; - } - { - goPackagePath = "github.com/retailnext/hllpp"; - fetch = { - type = "git"; - url = "https://github.com/retailnext/hllpp"; - rev = "38a7bb71b483e855d35010808143beaf05b67f9d"; - sha256 = "0zpq5yjqprzdw9ll6g9sqp8nzwkhjh4ngzhx5mxahmpajgnzz7a8"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20"; - sha256 = "1j3sqsmq8v40dp1qcv2dsy3aq3yl088hpd4fnrrnnl53g3a18p4d"; - }; - } - { - goPackagePath = "github.com/uber-go/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "74ca5ec650841aee9f289dce76e928313a37cbc6"; - sha256 = "14a4k5z4p2iig6sf7as5ps1frdyzcr67b9bff0by4z1vg4nrxi7h"; - }; - } - { - goPackagePath = "github.com/uber-go/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "fbae0281ffd546fa6d1959fec6075ac5da7fb577"; - sha256 = "0ys6cb2h3r0vbly36v8zqkqsfc5y7fjsw2qmvx5fvjh35ih4w738"; - }; - } - { - goPackagePath = "github.com/xlab/treeprint"; - fetch = { - type = "git"; - url = "https://github.com/xlab/treeprint"; - rev = "06dfc6fa17cdde904617990a0c2d89e3e332dbb3"; - sha256 = "04v2glr8wsgs8gr5qbcxyqn9s6569lmgqb7rcs6bkmdnr79xpwl5"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd"; - sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "1e2299c37cc91a509f1b12369872d27be0ce98a6"; - sha256 = "1nh8v330pcwgk3h6nvfi12rlydl16v9ajv4s1giyx8wnfq8h6fm1"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; - sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; - }; - } -] diff --git a/nixpkgs/pkgs/servers/nosql/influxdb/deps-1.6.3.nix b/nixpkgs/pkgs/servers/nosql/influxdb/deps-1.6.3.nix deleted file mode 100644 index a2f4dfaeb8d6..000000000000 --- a/nixpkgs/pkgs/servers/nosql/influxdb/deps-1.6.3.nix +++ /dev/null @@ -1,444 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "collectd.org"; - fetch = { - type = "git"; - url = "https://github.com/collectd/go-collectd"; - rev = "2ce144541b8903101fb8f1483cc0497a68798122"; - sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; - }; - } - { - goPackagePath = "github.com/RoaringBitmap/roaring"; - fetch = { - type = "git"; - url = "https://github.com/RoaringBitmap/roaring"; - rev = "d6540aab65a17321470b1661bfc52da1823871e9"; - sha256 = "1lsrz7j55blalpp95vgz214b35sjf8nfmrw3fxybdl4xipk2ssdj"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/bmizerany/pat"; - fetch = { - type = "git"; - url = "https://github.com/bmizerany/pat"; - rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00"; - sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "5c37fe3735342a2e0d01c87a907579987c8936cc"; - sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/dgryski/go-bitstream"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-bitstream"; - rev = "9f22ccc24718d9643ac427c8c897ae1a01575783"; - sha256 = "0x3hbsrn7qafhhjz6lgyc1pd1p5kgkrkbccvsr6yygkl785h5lhn"; - }; - } - { - goPackagePath = "github.com/glycerine/go-unsnap-stream"; - fetch = { - type = "git"; - url = "https://github.com/glycerine/go-unsnap-stream"; - rev = "62a9a9eb44fd8932157b1a8ace2149eff5971af6"; - sha256 = "1ray7p4q3vv5zn9w5xs7m9kjh68b2ck98nh25mxhfiwl9jxkabrc"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; - sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "925541529c1fa6821df4e44ce2723319eb2be768"; - sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; - sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "3af367b6b30c263d47e8895973edcca9a49cf029"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/influxdata/influxql"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/influxql"; - rev = "a7267bff5327e316e54c54342b0bc9598753e3d5"; - sha256 = "0mqc9xki5l9yfbb0dqjb417cmv3pca1bj71m90dkshladr2wlcg3"; - }; - } - { - goPackagePath = "github.com/influxdata/usage-client"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/usage-client"; - rev = "6d3895376368aa52a3a81d2a16e90f0f52371967"; - sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl"; - }; - } - { - goPackagePath = "github.com/influxdata/yamux"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/yamux"; - rev = "1f58ded512de5feabbe30b60c7d33a7a896c5f16"; - sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx"; - }; - } - { - goPackagePath = "github.com/influxdata/yarpc"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/yarpc"; - rev = "f0da2db138cad2fb425541938fc28dd5a5bc6918"; - sha256 = "1g71flc8s8xas7vmaiwv0425paii1akc7jsdqsgxkhyfxx2gvib0"; - }; - } - { - goPackagePath = "github.com/jsternberg/zap-logfmt"; - fetch = { - type = "git"; - url = "https://github.com/jsternberg/zap-logfmt"; - rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6"; - sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx"; - }; - } - { - goPackagePath = "github.com/jwilder/encoding"; - fetch = { - type = "git"; - url = "https://github.com/jwilder/encoding"; - rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09"; - sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf"; - sha256 = "00h2lpqcyc3pg2xk3q4a9cgyv0vkn15bx0hb725j5zbkr9vah23x"; - }; - } - { - goPackagePath = "github.com/klauspost/cpuid"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/cpuid"; - rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da"; - sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4"; - }; - } - { - goPackagePath = "github.com/klauspost/crc32"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/crc32"; - rev = "cb6bfca970f6908083f26f39a79009d608efd5cd"; - sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n"; - }; - } - { - goPackagePath = "github.com/klauspost/pgzip"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/pgzip"; - rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506"; - sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; - sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; - }; - } - { - goPackagePath = "github.com/mschoch/smat"; - fetch = { - type = "git"; - url = "https://github.com/mschoch/smat"; - rev = "90eadee771aeab36e8bf796039b8c261bebebe4f"; - sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "328fceb7548c744337cd010914152b74eaf4c4ab"; - sha256 = "1w6s42n9glqwif6awyiapr7sh1wjvkxan41qhc1yi555byyw200k"; - }; - } - { - goPackagePath = "github.com/paulbellamy/ratecounter"; - fetch = { - type = "git"; - url = "https://github.com/paulbellamy/ratecounter"; - rev = "524851a93235ac051e3540563ed7909357fe24ab"; - sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "6106ee4fe3e8435f18cd10e34557e5e50f0e792a"; - sha256 = "178s1amw5r60lywgmh24pd2ljim0b05fdfsm4c8px22fkycmn1qr"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212"; - sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "e4aa40a9169a88835b849a6efb71e05dc04b88f0"; - sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "54d17b57dd7d4a3aa092476596b3f8a933bde349"; - sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr"; - }; - } - { - goPackagePath = "github.com/retailnext/hllpp"; - fetch = { - type = "git"; - url = "https://github.com/retailnext/hllpp"; - rev = "101a6d2f8b52abfc409ac188958e7e7be0116331"; - sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1"; - sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; - }; - } - { - goPackagePath = "github.com/willf/bitset"; - fetch = { - type = "git"; - url = "https://github.com/willf/bitset"; - rev = "d860f346b89450988a379d7d705e83c58d1ea227"; - sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0"; - }; - } - { - goPackagePath = "github.com/xlab/treeprint"; - fetch = { - type = "git"; - url = "https://github.com/xlab/treeprint"; - rev = "f3a15cfd24bf976c724324cb6846a8b54b88b639"; - sha256 = "0fgbdyk2mfj5vh8902sga33w5gw7q0f1if4nqx631ca33fd6pfbn"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "8474b86a5a6f79c443ce4b2992817ff32cf208b8"; - sha256 = "166shnjw8rvjvksymi2gqw1ygsbxlq15xb10j2dx5rwy4y4asq8x"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "35aad584952c3e7020db7b839f6b102de6271f89"; - sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c3a3ad6d03f7a915c0f7e194b7152974bb73d287"; - sha256 = "0x18275g5xlaw55bpx8hdna66d2hpbcw6hs0pxf1kmvfds6gzn6n"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "92b859f39abd2d91a854c9f9c4621b2f5054a92d"; - sha256 = "1nzbay48k53pxa1sh102v571k6pa57540p0bzcil4qgan47yxba6"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d8e400bc7db4870d786864138af681469693d18c"; - sha256 = "08d23f9gjarp63dw0wj54nlqh3x2lqnchzkw8n5d7ik3wy7qy4yf"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "26559e0f760e39c24d730d3224364aef164ee23f"; - sha256 = "00fx6m59cjbi7y0ri4a57q1zs6r310xbg5yqns5kfm2cax0dkmnf"; - }; - } -] \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/nosql/influxdb/deps.nix b/nixpkgs/pkgs/servers/nosql/influxdb/deps.nix new file mode 100644 index 000000000000..e00a985fd8d3 --- /dev/null +++ b/nixpkgs/pkgs/servers/nosql/influxdb/deps.nix @@ -0,0 +1,840 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "collectd.org"; + fetch = { + type = "git"; + url = "https://github.com/collectd/go-collectd"; + rev = "2ce144541b8903101fb8f1483cc0497a68798122"; + sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; + sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "c7af12943936e8c39859482e61f0574c2fd7fc75"; + sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; + }; + } + { + goPackagePath = "github.com/RoaringBitmap/roaring"; + fetch = { + type = "git"; + url = "https://github.com/RoaringBitmap/roaring"; + rev = "3d677d3262197ee558b85029301eb69b8239f91a"; + sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9"; + }; + } + { + goPackagePath = "github.com/alecthomas/kingpin"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/apache/arrow"; + fetch = { + type = "git"; + url = "https://github.com/apache/arrow"; + rev = "f5df77359953ed06e1dce47edffc03340e2ff3ea"; + sha256 = "12lygmhrchpf46jzyf0gnbfq3bf9ha68iajbnzflqf6k78jf6dj7"; + }; + } + { + goPackagePath = "github.com/apex/log"; + fetch = { + type = "git"; + url = "https://github.com/apex/log"; + rev = "941dea75d3ebfbdd905a5d8b7b232965c5e5c684"; + sha256 = "0cavvljwrxhxpsf6wdfncswamsqvpkah2pmnm6g94iq6l16lkbix"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "dd947f47decb37a7c3bee72501bfc790701ab5ad"; + sha256 = "1l4lxxlw0x2lkkr2m78p67ncr7dbv9a5ij8ahwa8hqm2sv0zsc5d"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/blakesmith/ar"; + fetch = { + type = "git"; + url = "https://github.com/blakesmith/ar"; + rev = "8bd4349a67f2533b078dbc524689d15dba0f4659"; + sha256 = "1rdbn3v9vv3cs6indgrf9agydcbaspyc21fi0mpxlksva1sci99j"; + }; + } + { + goPackagePath = "github.com/bmizerany/pat"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/pat"; + rev = "6226ea591a40176dd3ff9cd8eff81ed6ca721a00"; + sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; + sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; + }; + } + { + goPackagePath = "github.com/c-bata/go-prompt"; + fetch = { + type = "git"; + url = "https://github.com/c-bata/go-prompt"; + rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0"; + sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj"; + }; + } + { + goPackagePath = "github.com/caarlos0/ctrlc"; + fetch = { + type = "git"; + url = "https://github.com/caarlos0/ctrlc"; + rev = "70dc48d5d792f20f684a8f1d29bbac298f4b2ef4"; + sha256 = "1xqlagjzwvfls17vn5zlmw58g4ha60hvpjpj7nbd9mn87yd2h22j"; + }; + } + { + goPackagePath = "github.com/campoy/unique"; + fetch = { + type = "git"; + url = "https://github.com/campoy/unique"; + rev = "88950e537e7e644cd746a3102037b5d2b723e9f5"; + sha256 = "1cf0mfdxx68ak8i3x5z50nhr29ivpssg2sg73krdpxs2qjzwji90"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "5c37fe3735342a2e0d01c87a907579987c8936cc"; + sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/dgryski/go-bitstream"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-bitstream"; + rev = "3522498ce2c8ea06df73e55df58edfbfb33cfdd6"; + sha256 = "1lr0qjdddxdiwfs530saglk4q5395i4n3w8h8k5j8nsjj8k3na7f"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; + sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; + }; + } + { + goPackagePath = "github.com/glycerine/go-unsnap-stream"; + fetch = { + type = "git"; + url = "https://github.com/glycerine/go-unsnap-stream"; + rev = "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126"; + sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "7b294651033cd7d9e7f0d9ffa1b75ed1e198e737"; + sha256 = "0y6qzla90zd6dhs04vclrg46rwlsy9zlqi0y6y2k1pdxn2cbblhb"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "d523deb1b23d913de5bdada721a6071e71283618"; + sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; + sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "3af367b6b30c263d47e8895973edcca9a49cf029"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "dd29b543e14c33e6373773f2c5ea008b29aeac95"; + sha256 = "0sk67d9zdn420h2g4l3wib28zqr3ihbg6dj382cwmns7yska58lp"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "44c6ddd0a2342c386950e880b658017258da92fc"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { + goPackagePath = "github.com/goreleaser/goreleaser"; + fetch = { + type = "git"; + url = "https://github.com/goreleaser/goreleaser"; + rev = "f99940ff5397b099bf606cf1323c00c63afcd153"; + sha256 = "1mh4j0vdyxhr7fmwva59p0wrsrk318c2fbgzf1vqbgs8iwibs739"; + }; + } + { + goPackagePath = "github.com/goreleaser/nfpm"; + fetch = { + type = "git"; + url = "https://github.com/goreleaser/nfpm"; + rev = "de75d679901371e3ed0c0a606e160539d5a4b45e"; + sha256 = "1dbw458xndgj9k5dvffrqkz7cq6rcmflvsvzd8adsg24a3mk3qgy"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + }; + } + { + goPackagePath = "github.com/influxdata/flux"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/flux"; + rev = "8c9d0ad49204d3bbb171e96d872cf663ee7f1b4d"; + sha256 = "0yamrzqjs6giwqq0ljf2dscarqw6851cw3iya8cya0x5plyd810c"; + }; + } + { + goPackagePath = "github.com/influxdata/influxql"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/influxql"; + rev = "c661ab7db8ad858626cc7a2114e786f4e7463564"; + sha256 = "1j73aj312laqmi20fbinx0aal82ncpqbj5dgs41br0j7fkvi6873"; + }; + } + { + goPackagePath = "github.com/influxdata/line-protocol"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/line-protocol"; + rev = "32c6aa80de5eb09d190ad284a8214a531c6bce57"; + sha256 = "0wvd6lplbvmz2lznvy4zz3fmxiqc43cgr4vppp1xi38j1iwq0349"; + }; + } + { + goPackagePath = "github.com/influxdata/platform"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/platform"; + rev = "0f79e4ea3248354c789cba274542e0a8e55971db"; + sha256 = "16d9g7vgy30zahhj066kz7akahvpknq3ljk2fzvczjsm59ih8rjk"; + }; + } + { + goPackagePath = "github.com/influxdata/roaring"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/roaring"; + rev = "fc520f41fab6dcece280e8d4853d87a09a67f9e0"; + sha256 = "0jr9r5q4s5bz4kbqndrlm5aikls4kqbl955qbsh6bpbmxdsamcsr"; + }; + } + { + goPackagePath = "github.com/influxdata/tdigest"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/tdigest"; + rev = "a7d76c6f093a59b94a01c6c2b8429122d444a8cc"; + sha256 = "02jxrb2d1n6zflwa7jhgid5344l6zj4gxg4kis20v7xa6iqrj1ni"; + }; + } + { + goPackagePath = "github.com/influxdata/usage-client"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/usage-client"; + rev = "6d3895376368aa52a3a81d2a16e90f0f52371967"; + sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/jsternberg/zap-logfmt"; + fetch = { + type = "git"; + url = "https://github.com/jsternberg/zap-logfmt"; + rev = "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6"; + sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx"; + }; + } + { + goPackagePath = "github.com/jwilder/encoding"; + fetch = { + type = "git"; + url = "https://github.com/jwilder/encoding"; + rev = "b4e1701a28efcc637d9afcca7d38e495fe909a09"; + sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg"; + }; + } + { + goPackagePath = "github.com/kevinburke/go-bindata"; + fetch = { + type = "git"; + url = "https://github.com/kevinburke/go-bindata"; + rev = "06af60a4461b70d84a2b173d92f9f425d78baf55"; + sha256 = "0k9bpx6vqsr53bzj7k78rjalybpwbs86zdks6v7jqkwsrx4j7a07"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/klauspost/compress"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/compress"; + rev = "b939724e787a27c0005cabe3f78e7ed7987ac74f"; + sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s"; + }; + } + { + goPackagePath = "github.com/klauspost/cpuid"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/cpuid"; + rev = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da"; + sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4"; + }; + } + { + goPackagePath = "github.com/klauspost/crc32"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/crc32"; + rev = "cb6bfca970f6908083f26f39a79009d608efd5cd"; + sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n"; + }; + } + { + goPackagePath = "github.com/klauspost/pgzip"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/pgzip"; + rev = "0bf5dcad4ada2814c3c00f996a982270bb81a506"; + sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + }; + } + { + 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 = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; + sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; + }; + } + { + goPackagePath = "github.com/mattn/go-tty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-tty"; + rev = "13ff1204f104d52c3f7645ec027ecbcf9026429e"; + sha256 = "1c9vzrq7r5skq0cz9alkix9n1cp6h7wybdwrg0f1vzvxj26qr7yq"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-zglob"; + rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"; + sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; + }; + } + { + 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/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + { + goPackagePath = "github.com/mna/pigeon"; + fetch = { + type = "git"; + url = "https://github.com/mna/pigeon"; + rev = "9df264905d4734c0133161d8c67828ff522b154a"; + sha256 = "120m90lig5984wd2k7x2fclx5vb64lxmx4j3065pp0q1fqjif87z"; + }; + } + { + goPackagePath = "github.com/mschoch/smat"; + fetch = { + type = "git"; + url = "https://github.com/mschoch/smat"; + rev = "90eadee771aeab36e8bf796039b8c261bebebe4f"; + sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "bd9c3193394760d98b2fa6ebb2291f0cd1d06a7d"; + sha256 = "11ad6yhi1fi7ybg6jj18kw5pl12zhvvcrkjqbz6rspawb5qrlq1g"; + }; + } + { + goPackagePath = "github.com/paulbellamy/ratecounter"; + fetch = { + type = "git"; + url = "https://github.com/paulbellamy/ratecounter"; + rev = "524851a93235ac051e3540563ed7909357fe24ab"; + sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "8c1271fcf47f341a9e6771872262870e1ad7650c"; + sha256 = "15swk6y173sdav3gzxk0rj2z17khsyc8wljk6gk3w4fq9wnziggd"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; + sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pkg/term"; + fetch = { + type = "git"; + url = "https://github.com/pkg/term"; + rev = "bffc007b7fd5a70e20e28f5b7649bb84671ef436"; + sha256 = "0c9xnx7dyw7j890nm9av5fjpqjb129z7vbg3lw554vwnckc84x54"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "661e31bf844dfca9aeba15f27ea8aa0d485ad212"; + sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; + sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"; + sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f"; + }; + } + { + goPackagePath = "github.com/retailnext/hllpp"; + fetch = { + type = "git"; + url = "https://github.com/retailnext/hllpp"; + rev = "101a6d2f8b52abfc409ac188958e7e7be0116331"; + sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + { + goPackagePath = "github.com/segmentio/kafka-go"; + fetch = { + type = "git"; + url = "https://github.com/segmentio/kafka-go"; + rev = "c6db9435477f3cb658e2dd0fa93e02118c870251"; + sha256 = "17zdj0i429a0wmwj8rm4j0hmxsv8kbql67s5iv78hac6rcys7bj2"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8c9545af88b134710ab1cd196795e7f2388358d7"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1"; + sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; + }; + } + { + goPackagePath = "github.com/willf/bitset"; + fetch = { + type = "git"; + url = "https://github.com/willf/bitset"; + rev = "d860f346b89450988a379d7d705e83c58d1ea227"; + sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0"; + }; + } + { + goPackagePath = "github.com/xlab/treeprint"; + fetch = { + type = "git"; + url = "https://github.com/xlab/treeprint"; + rev = "d6fb6747feb6e7cfdc44682a024bddf87ef07ec2"; + sha256 = "1ln6p8va53sxrhyy0gfanskzzc30c55l6nk1f0bin91jlr2mxn4n"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "1ea20fb1cbb1cc08cbd0d913a96dead89aa18289"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a"; + sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; + }; + } + { + goPackagePath = "go.uber.org/zap"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/zap"; + rev = "4d45f9617f7d90f7a663ff21c7a4321dbe78098b"; + sha256 = "0fpgcbqv8inx70jmnrv0zay7mjj8rwwcvd3ivqwy1wmrmkm8jjmj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; + sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; + sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "c57b0facaced709681d9f90397429b9430a74754"; + sha256 = "044rx9vkkwpp7d23gdk3k4yb7k28kcy34y83pjb1gwndhhh019w1"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; + sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; + sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "45ff765b4815d34d8b80220fd05c79063b185ce1"; + sha256 = "0pirpy0xcks294zd629x6p5yxwcpz1xbxbg6hy5xpxqq2v24nxqr"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06"; + sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "fedd2861243fd1a8152376292b921b394c7bef7e"; + sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; + sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "d73ab98e7c39fdcf9ba65062e43d34310f198353"; + sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7"; + }; + } +] \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/nosql/neo4j/default.nix b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix index 0781e66f0069..73ec5038fe3d 100644 --- a/nixpkgs/pkgs/servers/nosql/neo4j/default.nix +++ b/nixpkgs/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1shkffikl9mrjg1kq2s2ylgf4691f9fv53d3x4qk2a6m4y1y9dnl"; + sha256 = "0fqp3k0gr5qb2a7ck093fw581db9fmfvhsich740d588ik749jbh"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/nixpkgs/pkgs/servers/nosql/redis/default.nix b/nixpkgs/pkgs/servers/nosql/redis/default.nix index d6cade72a87e..16f21391dee1 100644 --- a/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "5.0.3"; + version = "5.0.4"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "00iyv4ybcgm5xxcm85lg1p99q7xijm05cpadlxa65chpz3fv9472"; + sha256 = "1pc7r4lbvhiyln7y529798nv8lxasky6sgspw49hkxi3bbzwxs9w"; }; buildInputs = [ lua ]; diff --git a/nixpkgs/pkgs/servers/plex/default.nix b/nixpkgs/pkgs/servers/plex/default.nix index 9a4f96c46ba8..5c69ecd39f82 100644 --- a/nixpkgs/pkgs/servers/plex/default.nix +++ b/nixpkgs/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.15.2.793"; - vsnHash = "782228f99"; - sha256 = "0yxxyczcgbk79bhnbbqpsj6vg1hi2pbf88r29dmskr664a5s0sk7"; + version = "1.15.3.876"; + vsnHash = "ad6e39743"; + sha256 = "01g7wccm01kg3nhf3qrmwcn20nkpv0bqz6zqv2gq5v03ps58h6g5"; }; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch b/nixpkgs/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch new file mode 100644 index 000000000000..96710d6162d7 --- /dev/null +++ b/nixpkgs/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch @@ -0,0 +1,27 @@ +From c1832eabb99cec47f1714f696275285e1e28da34 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Tue, 2 Apr 2019 16:20:50 +0200 +Subject: [PATCH] Don't resolve symlinks when trying to find INSTALL_PATH + +Nix specific patch. This behavior breaks roundcube setups where plugins +are in a store path with symlinks to the actual source. +--- + bin/update.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/update.sh b/bin/update.sh +index 08e3bb5..b2ad498 100755 +--- a/bin/update.sh ++++ b/bin/update.sh +@@ -19,7 +19,7 @@ + +-----------------------------------------------------------------------+ + */ + +-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' ); ++define('INSTALL_PATH', __DIR__ . '/../' ); + + require_once INSTALL_PATH . 'program/include/clisetup.php'; + +-- +2.19.2 + diff --git a/nixpkgs/pkgs/servers/roundcube/default.nix b/nixpkgs/pkgs/servers/roundcube/default.nix index cda5ae1d6c55..4d8f034c51ee 100644 --- a/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/nixpkgs/pkgs/servers/roundcube/default.nix @@ -1,14 +1,21 @@ -{ lib, stdenv, fetchzip, buildEnv, roundcube, roundcubePlugins }: -let - version = "1.3.8"; -in -fetchzip rec { - name= "roundcube-${version}"; +{ lib, fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }: - url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1lhwr13bglm8rqgamnb480b07wpqhw9bskjj2xxb0x8kdjly29ks"; +stdenv.mkDerivation rec { + pname = "roundcube"; + version = "1.3.9"; - extraPostFetch = '' + src = fetchurl { + url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; + sha256 = "1b91amcpzb7935hpm67iqw92bl5r1a0rkfrc8gfm8w9sngzv8vbj"; + }; + + patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; + + dontBuild = true; + + installPhase = '' + mkdir $out + cp -r * $out/ ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php rm -rf $out/installer ''; diff --git a/nixpkgs/pkgs/servers/rt/default.nix b/nixpkgs/pkgs/servers/rt/default.nix index 4653946270cd..b2e40a8ede0e 100644 --- a/nixpkgs/pkgs/servers/rt/default.nix +++ b/nixpkgs/pkgs/servers/rt/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { name = "rt-${version}"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; - sha256 = "1cddgp3j7qm7r3v5j1l1hl6i6laxa64f4nalaarj094hmhyb92kk"; + sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl"; }; patches = [ ./override-generated.patch ]; diff --git a/nixpkgs/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch b/nixpkgs/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch new file mode 100644 index 000000000000..7c973e5bd26a --- /dev/null +++ b/nixpkgs/pkgs/servers/samba/4.x-fix-makeflags-parsing.patch @@ -0,0 +1,11 @@ +--- a/buildtools/wafsamba/samba_utils.py 2019-04-08 01:13:47.525306574 +0000 ++++ b/buildtools/wafsamba/samba_utils.py 2019-04-08 01:14:34.805245676 +0000 +@@ -495,7 +495,7 @@ + Logs.zones = ['runner'] + if Logs.verbose > 2: + Logs.zones = ['*'] +- elif opt[0].isupper() and opt.find('=') != -1: ++ elif opt[0] and opt.find('=') != -1: + # this allows us to set waf options on the make command line + # for example, if you do "make FOO=blah", then we set the + # option 'FOO' in Options.options, to blah. If you look in wafsamba/wscript diff --git a/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch b/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch index 7e3652dbe7b7..6576a43322e5 100644 --- a/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch +++ b/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch @@ -1,15 +1,18 @@ -diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript ---- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300 -+++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300 -@@ -416,11 +416,3 @@ +--- a/dynconfig/wscript 2018-12-23 20:28:42.908832206 -0800 ++++ b/dynconfig/wscript 2018-12-23 20:31:55.568835627 -0800 +@@ -419,15 +419,3 @@ public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir), header_path='samba', cflags=cflags) - - # install some extra empty directories -- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}"); -- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}") -- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}"); +- bld.INSTALL_DIR("${CONFIGDIR}") +- bld.INSTALL_DIR("${LOGFILEBASE}") +- bld.INSTALL_DIR("${PRIVILEGED_SOCKET_DIR}") +- bld.INSTALL_DIR("${PRIVATE_DIR}", 0o700) +- bld.INSTALL_DIR("${BINDDNS_DIR}", 0o770) +- bld.INSTALL_DIR("${STATEDIR}") +- bld.INSTALL_DIR("${CACHEDIR}") - - # these might be on non persistent storage - bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}") diff --git a/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install.patch b/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install.patch index 1c360f6b2c77..820470f939e7 100644 --- a/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install.patch +++ b/nixpkgs/pkgs/servers/samba/4.x-no-persistent-install.patch @@ -1,7 +1,6 @@ -diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript ---- samba-4.4.6/ctdb/wscript 2016-09-22 09:42:48.000000000 +0300 -+++ samba-4.4.6-new/ctdb/wscript 2016-10-15 23:31:13.932088237 +0300 -@@ -581,7 +581,7 @@ +--- a/ctdb/wscript 2019-01-15 02:07:00.000000000 -0800 ++++ b/ctdb/wscript 2019-01-20 20:21:08.800187459 -0800 +@@ -814,7 +814,7 @@ for t in etc_subdirs: files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir) for fmode in files: @@ -9,14 +8,14 @@ diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript + bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0], destname=fmode[0], chmod=fmode[1]) - bld.SAMBA_GENERATOR('ctdb-functions', -@@ -601,23 +601,19 @@ + # If this is a direct install and there are no event scripts +@@ -852,24 +852,20 @@ ] for t in etc_scripts: - bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t, + bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t, - destname=t, chmod=0755) + destname=t, chmod=MODE_755) bld.SAMBA_GENERATOR('ctdb-sudoers', source='config/ctdb.sudoers', @@ -26,14 +25,15 @@ diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript + bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers', destname='ctdb') -- bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README', -+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/notify.d', 'config/notify.d.README', +- bld.INSTALL_FILES('${CTDB_ETCDIR}/events/notification', ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/events/notification', + 'config/notification.README', destname='README') -- bld.install_dir(bld.env.CTDB_LOGDIR) -- bld.install_dir(bld.env.CTDB_RUNDIR) -- bld.install_dir(bld.env.CTDB_VARDIR) +- bld.INSTALL_DIR(bld.env.CTDB_LOGDIR) +- bld.INSTALL_DIR(bld.env.CTDB_RUNDIR) +- bld.INSTALL_DIR(bld.env.CTDB_VARDIR) - - # Unit tests - ctdb_unit_tests = [ - 'db_hash_test', + for d in ['volatile', 'persistent', 'state']: + bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d)) + diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix index 53bfa6df8dc3..7d1289ffdea2 100644 --- a/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/nixpkgs/pkgs/servers/samba/4.x.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl , fetchpatch -, docbook_xml_dtd_42, readline, talloc +, docbook_xml_dtd_42, readline , popt, iniparser, libbsd, libarchive, libiconv, gettext , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs -, gnutls, ncurses, libunwind, systemd +, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme , enableLDAP ? false , enablePrinting ? false @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.12"; + version = "4.10.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0jmg39xigrh48j39r4f1390kmr1p3xbfxzfabln4b0r9qdmki70f"; + sha256 = "112yizx9cpjhi8c7mh9znqg0c9dkj3383hwr8dhgpykl3g2zv347"; }; outputs = [ "out" "dev" "man" ]; @@ -33,30 +33,19 @@ stdenv.mkDerivation rec { [ ./4.x-no-persistent-install.patch ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch - - # conditionall disable MacOS incompatible tests - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/samba-team/samba/pull/107.patch"; - sha256 = "0r6q34vjj0bdzmcbnrkad9rww58k4krbwicv4gs1g3dj49skpvd6"; - }) - - (fetchpatch { - name = "CVE-2019-3824.patch"; - url = "https://attachments.samba.org/attachment.cgi?id=14859"; - sha256 = "02qf3zr55mzbimqdv01k3b22jjb084vfr5zabapyr5h1f588mw0q"; - }) + ./4.x-fix-makeflags-parsing.patch ]; buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* - docbook_xml_dtd_45 */ readline talloc popt iniparser + docbook_xml_dtd_45 */ readline popt iniparser jansson libbsd libarchive zlib fam libiconv gettext libunwind krb5Full ] ++ optionals stdenv.isLinux [ libaio systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi - ++ optional enableDomainController gnutls + ++ optionals enableDomainController [ gnutls gpgme lmdb ] ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optional (enableGlusterFS && stdenv.isLinux) glusterfs @@ -69,6 +58,8 @@ stdenv.mkDerivation rec { # Fix the XML Catalog Paths sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py + + patchShebangs ./buildtools/bin ''; configureFlags = @@ -87,8 +78,9 @@ stdenv.mkDerivation rec { ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; - # To build in parallel. - buildPhase = "python buildtools/bin/waf build -j $NIX_BUILD_CORES"; + preBuild = '' + export MAKEFLAGS="-j $NIX_BUILD_CORES" + ''; # Some libraries don't have /lib/samba in RPATH but need it. # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \; @@ -111,5 +103,6 @@ stdenv.mkDerivation rec { description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; + maintainers = with maintainers; [ aneeshusa ]; }; } diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/default.nix b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix index d22395e0133a..df7324a73f49 100644 --- a/nixpkgs/pkgs/servers/search/elasticsearch/default.nix +++ b/nixpkgs/pkgs/servers/search/elasticsearch/6.x.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation (rec { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; sha256 = if enableUnfree - then "096i8xiy7mfwlslym9mkjb2f5vqdcqhk65583526rcybqxc2zkqp" - else "0j3q02c4rw8272w07hm64sk5ssmj4gj8s3qigsbrq5pgf8b03fvs"; + then "1qh6iz3qhw8zcvxfss5w3h89zarwvk6dp5bbbag7c30kh94gkqvv" + else "13v8qpslanfn5w81qvbg0aqh510yfbl3x59kisvdkz9ifhjbcavi"; }; patches = [ ./es-home-6.x.patch ]; postPatch = '' substituteInPlace bin/elasticsearch-env --replace \ - "ES_CLASSPATH=\"\$ES_HOME/lib/\*\"" \ + "ES_CLASSPATH=\"\$ES_HOME/lib/*\"" \ "ES_CLASSPATH=\"$out/lib/*\"" substituteInPlace bin/elasticsearch-cli --replace \ - "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/\*\"" \ - "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/\*\"" + "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/*\"" \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" ''; buildInputs = [ makeWrapper jre_headless utillinux ] diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix b/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix new file mode 100644 index 000000000000..7ea33935faa5 --- /dev/null +++ b/nixpkgs/pkgs/servers/search/elasticsearch/7.x.nix @@ -0,0 +1,83 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre_headless +, utillinux +, autoPatchelfHook +, zlib +}: + +with stdenv.lib; +let + info = splitString "-" stdenv.hostPlatform.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = + if enableUnfree + then { + "x86_64-linux" = "1fi57xqwgxx0ivjyfvaybzz2k457qw59fn9qr26d86lnkigfxpk8"; + "x86_64-darwin" = "06hj96d4vl9q24dfx8ffydfs7qd440ys29654jgqp8sp7js7hjxp"; + } + else { + "x86_64-linux" = "1jrcdxm1swf8ahkv3h7kyzzhdq9nwwfhimpflzdq2d831fx525y8"; + "x86_64-darwin" = "119ym2d5fqwba3aq2izh5qj8vxawb7hf183cgg00s1sm1mm8lviv"; + }; +in +stdenv.mkDerivation (rec { + version = elk7Version; + name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + }; + + patches = [ ./es-home-6.x.patch ]; + + postPatch = '' + substituteInPlace bin/elasticsearch-env --replace \ + "ES_CLASSPATH=\"\$ES_HOME/lib/*\"" \ + "ES_CLASSPATH=\"$out/lib/*\"" + + substituteInPlace bin/elasticsearch-cli --replace \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/*\"" \ + "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" + ''; + + buildInputs = [ makeWrapper jre_headless utillinux ] + ++ optional enableUnfree zlib; + + installPhase = '' + mkdir -p $out + cp -R bin config lib modules plugins $out + + chmod +x $out/bin/* + + wrapProgram $out/bin/elasticsearch \ + --prefix PATH : "${utillinux}/bin/" \ + --set JAVA_HOME "${jre_headless}" + + wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" + ''; + + passthru = { inherit enableUnfree; }; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + license = if enableUnfree then licenses.elastic else licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ apeschar basvandijk ]; + }; +} // optionalAttrs enableUnfree { + dontPatchELF = true; + nativeBuildInputs = [ autoPatchelfHook ]; + runtimeDependencies = [ zlib ]; + postFixup = '' + for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do + echo "patching $exe..." + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" + done + ''; +}) diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix b/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix index 4451b0104464..0cb1dd5bfc17 100644 --- a/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix +++ b/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix @@ -27,7 +27,7 @@ in { version = "${elk6Version}"; src = fetchurl { url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip"; - sha256 = "0299ldqwjn1gn44yyjiqjrxvs6mlclhzl1dbn6xlgg1a2lkaal4v"; + sha256 = "0mf8lpf40bjpzfj9lkhrg7c3xinzvg7aby3vd6h92g9i676xs8ri"; }; meta = with stdenv.lib; { homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; @@ -42,7 +42,7 @@ in { version = "${elk6Version}"; src = pkgs.fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip"; - sha256 = "1mg9knbc4r21kaiqnmkd8nzf2i23w5zxqnxyz484q0l2jf4hlkq1"; + sha256 = "05z4vmi29fzfqzid7fdh6h6pjwgd1dz1mhhjgjz9plpvpzymjiln"; }; meta = with stdenv.lib; { homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; @@ -54,10 +54,10 @@ in { search_guard = esPlugin rec { name = "elastic-search-guard-${version}"; pluginName = "search-guard"; - version = "${elk6Version}-23.2"; + version = "${elk6Version}-24.3"; src = fetchurl rec { url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip"; - sha256 = "05310wyxzhylxr0dfgzr10pb0pak30ry8r97g49n6iqj8dw3csnb"; + sha256 = "17gif45fbi4vj9qrzv075fkr7d2sp0naa5bjjj9gvfgqyl2flj7g"; }; meta = with stdenv.lib; { homepage = https://github.com/floragunncom/search-guard; diff --git a/nixpkgs/pkgs/servers/search/solr/8.x.nix b/nixpkgs/pkgs/servers/search/solr/8.x.nix new file mode 100644 index 000000000000..00821e6e40ae --- /dev/null +++ b/nixpkgs/pkgs/servers/search/solr/8.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "solr"; + version = "8.0.0"; + + src = fetchurl { + url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; + sha256 = "04hxj7nfmbh5wfqkq1p5q2ncxszwm80l218vfdy93aw0p79r4qqf"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out $out/bin + + cp -r bin/solr bin/post $out/bin/ + cp -r contrib $out/ + cp -r dist $out/ + cp -r example $out/ + cp -r server $out/ + + wrapProgram $out/bin/solr --set JAVA_HOME "${jre}" + wrapProgram $out/bin/post --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.lib; { + homepage = https://lucene.apache.org/solr/; + description = "Open source enterprise search platform from the Apache Lucene project"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.rickynils maintainers.domenkozar maintainers.aanderse ]; + }; + +} diff --git a/nixpkgs/pkgs/servers/serviio/default.nix b/nixpkgs/pkgs/servers/serviio/default.nix index 876cc01592e9..5c4a35431436 100644 --- a/nixpkgs/pkgs/servers/serviio/default.nix +++ b/nixpkgs/pkgs/servers/serviio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "serviio-${version}"; - version = "1.9"; + version = "1.10.1"; src = fetchurl { url = "http://download.serviio.org/releases/${name}-linux.tar.gz"; - sha256 = "0vi9dwpdrk087gpi0xib0hwpvdmaf9g99nfdfx2r3wmmdzw7wysl"; + sha256 = "0gxa29mzwvr0xvvi2qizyvf68ma5s3405q58f1pcgadbb68jwx6q"; }; phases = ["unpackPhase" "installPhase"]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix index b42a494ff106..6e62aee13752 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -157,33 +157,33 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.20"; + version = "9.4.21"; psqlSchema = "9.4"; - sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; + sha256 = "01k0s3a7qy8639zsjp1bjbfnnymyl0rgyylrjbkm81m0779b8j80"; this = self.postgresql_9_4; inherit self; }; postgresql_9_5 = self.callPackage generic { - version = "9.5.15"; + version = "9.5.16"; psqlSchema = "9.5"; - sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; + sha256 = "0cg10ri0475vg1c8k1sb5qi4i64hiv9k7crmg15qvvnwsjanqmx4"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.11"; + version = "9.6.12"; psqlSchema = "9.6"; - sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; + sha256 = "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.6"; + version = "10.7"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; + sha256 = "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz"; this = self.postgresql_10; inherit self; }; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 959c2c382524..494e6dbac4f4 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,19 +1,20 @@ { stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { - name = "pg_cron-${version}"; - version = "1.1.2"; + pname = "pg_cron"; + version = "1.1.4"; buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "citusdata"; - repo = "pg_cron"; + repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0n74dx1wkg9qxvjhnx03028465ap3p97v2kzqww833dws1wqk5m1"; + sha256 = "0wkqgrm3v999hjcc82h24jv1pib6f6bw8jsv83hgk6g3iv6xsjg9"; }; installPhase = '' + mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 mkdir -p $out/{lib,share/extension} cp *.so $out/lib @@ -23,9 +24,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Run Cron jobs through PostgreSQL"; - homepage = https://www.citusdata.com/; + homepage = https://github.com/citusdata/pg_cron; maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.postgresql; }; } diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix new file mode 100644 index 000000000000..722c70b2e89a --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost, gmp, cgal, mpfr }: + +stdenv.mkDerivation rec { + pname = "pgrouting"; + version = "2.6.2"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ postgresql boost gmp cgal mpfr ]; + + src = fetchFromGitHub { + owner = "pgRouting"; + repo = pname; + rev = "v${version}"; + sha256 = "09xy5pmiwq0lxf2m8p4q5r892mfmn32vf8m75p84jnz4707z1l0j"; + }; + + installPhase = '' + mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653 + install -D lib/*.so -t $out/lib + install -D sql/pgrouting--${version}.sql -t $out/share/extension + install -D sql/common/pgrouting.control -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality"; + homepage = https://pgrouting.org/; + maintainers = [ maintainers.steve-chavez ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index d78707fc65f9..7308c8c9389e 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -9,19 +9,21 @@ , json_c , pkgconfig , file +, protobufc }: stdenv.mkDerivation rec { name = "postgis-${version}"; - version = "2.5.1"; + version = "2.5.2"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv"; + sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn"; }; - buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; + buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]; + nativeBuildInputs = [ perl pkgconfig ]; dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library @@ -59,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Geographic Objects for PostgreSQL"; - homepage = http://postgis.refractions.net; + homepage = https://postgis.net/; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index 2d0c699c12ea..70579ee292a2 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -36,4 +36,6 @@ self: super: { tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { }; tds_fdw = super.callPackage ./ext/tds_fdw.nix { }; + + pgrouting = super.callPackage ./ext/pgrouting.nix { }; } diff --git a/nixpkgs/pkgs/servers/squid/4.nix b/nixpkgs/pkgs/servers/squid/4.nix index 4b6f710242a0..ca8019d5bc45 100644 --- a/nixpkgs/pkgs/servers/squid/4.nix +++ b/nixpkgs/pkgs/servers/squid/4.nix @@ -2,11 +2,11 @@ , expat, libxml2, openssl }: stdenv.mkDerivation rec { - name = "squid-4.4"; + name = "squid-4.6"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "10pfx44mps5ng1806rqdwx8jv8b2n25kjvx37dcd4x2mgzdfc1a9"; + sha256 = "0h9x63h0ljz4w1arj1rqhcyiwiqn89fdy1f6qi153454sgjssnq1"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/tautulli/default.nix b/nixpkgs/pkgs/servers/tautulli/default.nix index 5dcd958b799f..63882766b3bc 100644 --- a/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/nixpkgs/pkgs/servers/tautulli/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - version = "2.1.26"; + version = "2.1.28"; pname = "Tautulli"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "1gq13dazbqbzdb0wfw87maprr9nva357zdj8x0lfrbasi3h5522q"; + sha256 = "0yq2dqljfc7ci1n8c8szpylxcimhbfjr46m24hnsqp623w2gvm46"; }; buildPhase = ":"; diff --git a/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix index 1d523351d1eb..469d5fb73f93 100644 --- a/nixpkgs/pkgs/servers/traefik/default.nix +++ b/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.7.9"; + version = "1.7.10"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "0lncygkqws5jvbhpx2qlr18y8b325y9a6690ll9azlphxydrv44m"; + sha256 = "1bfnwrwr27hywlv09a4z8ma70af6p6l3jcdpf8wg3aw5brznv9cq"; }; buildInputs = [ go-bindata bash ]; diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/default.nix b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/default.nix index e4899597de4f..fa636601ec24 100644 --- a/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-6_x, phantomjs2, which }: +{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-8_x, phantomjs2, which }: let nodePackages = import ./node.nix { @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - buildInputs = [ nodejs-6_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [ + buildInputs = [ nodejs-8_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [ "blint-^1" "node-static-0.6.0" "rollup-^0.41.0" diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh index c42da7340c31..7a9fa8cb1cf1 100755 --- a/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh +++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix -6 -i deps.json \ +node2nix -8 -i deps.json \ -e ../../../../development/node-packages/node-env.nix \ --no-copy-node-env \ -c node.nix diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix index a2d475d5831a..8059c901a954 100644 --- a/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix +++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix @@ -13,13 +13,13 @@ let sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; }; }; - "acorn-5.7.1" = { + "acorn-5.7.3" = { name = "acorn"; packageName = "acorn"; - version = "5.7.1"; + version = "5.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; - sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; "acorn-jsx-3.0.1" = { @@ -40,13 +40,13 @@ let sha1 = "48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"; }; }; - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; "align-text-0.1.4" = { @@ -148,13 +148,13 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "big.js-3.2.0" = { + "big.js-5.2.2" = { name = "big.js"; packageName = "big.js"; - version = "3.2.0"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; - sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; + url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; "brace-expansion-1.1.11" = { @@ -238,22 +238,13 @@ let sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; "concat-map-0.0.1" = { @@ -337,13 +328,13 @@ let sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; }; }; - "es6-promise-4.2.4" = { + "es6-promise-4.2.6" = { name = "es6-promise"; packageName = "es6-promise"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; - sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz"; + sha512 = "aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="; }; }; "escape-string-regexp-1.0.5" = { @@ -391,13 +382,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -427,13 +418,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "fs-extra-1.0.0" = { @@ -454,13 +445,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "graceful-fs-4.1.11" = { + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; "har-schema-2.0.0" = { @@ -472,13 +463,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.1.0" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.0"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz"; - sha512 = "+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-ansi-2.0.0" = { @@ -598,13 +589,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -616,13 +607,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-0.5.1" = { + "json5-1.0.1" = { name = "json5"; packageName = "json5"; - version = "0.5.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; "jsonfile-2.4.0" = { @@ -679,13 +670,13 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; - "loader-utils-1.1.0" = { + "loader-utils-1.2.3" = { name = "loader-utils"; packageName = "loader-utils"; - version = "1.1.0"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; - sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; + sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; }; }; "longest-1.0.1" = { @@ -715,22 +706,22 @@ let sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"; }; }; - "mime-db-1.35.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.35.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz"; - sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.19" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.19"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz"; - sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "minimatch-3.0.4" = { @@ -859,13 +850,13 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; - "psl-1.1.29" = { + "psl-1.1.31" = { name = "psl"; packageName = "psl"; - version = "1.1.29"; + version = "1.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz"; - sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; }; }; "punycode-1.4.1" = { @@ -877,6 +868,15 @@ let 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=="; + }; + }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -985,13 +985,13 @@ let sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; }; }; - "sshpk-1.14.2" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "string_decoder-1.1.1" = { @@ -1093,6 +1093,15 @@ let sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }; }; + "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=="; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -1186,7 +1195,7 @@ in sha512 = "6RwH3oJYMujQNd38WWU+jUSRqWfECrmpfL8o3fn3Q3fE9nn5iAktLZJHGEHqeecownbZZwZneTLbaNbIWwU9/A=="; }; dependencies = [ - sources."acorn-5.7.1" + sources."acorn-5.7.3" sources."ansi-styles-1.0.0" sources."chalk-0.4.0" sources."has-color-0.1.7" @@ -1200,7 +1209,7 @@ in homepage = http://github.com/marijnh/blint; }; production = true; - bypassCache = false; + bypassCache = true; }; "node-static-0.6.0" = nodeEnv.buildNodePackage { name = "node-static"; @@ -1216,7 +1225,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "phantomjs-prebuilt-^2.1.12" = nodeEnv.buildNodePackage { name = "phantomjs-prebuilt"; @@ -1227,7 +1236,7 @@ in sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -1236,28 +1245,27 @@ in sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" sources."extend-3.0.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."fs-extra-1.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.1.0" + sources."har-validator-5.1.3" sources."hasha-2.2.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -1268,14 +1276,14 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -1286,21 +1294,26 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."psl-1.1.29" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.88.0" sources."request-progress-2.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."throttleit-1.0.0" - sources."tough-cookie-2.4.3" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -1314,7 +1327,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-^0.41.0" = nodeEnv.buildNodePackage { name = "rollup"; @@ -1335,7 +1348,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-plugin-buble-^0.15.0" = nodeEnv.buildNodePackage { name = "rollup-plugin-buble"; @@ -1375,7 +1388,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "rollup-watch-^3.2.0" = nodeEnv.buildNodePackage { name = "rollup-watch"; @@ -1395,7 +1408,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uglify-js-^2.8.15" = nodeEnv.buildNodePackage { name = "uglify-js"; @@ -1430,7 +1443,7 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "url-loader-^0.5.7" = nodeEnv.buildNodePackage { name = "url-loader"; @@ -1441,11 +1454,12 @@ in sha512 = "B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q=="; }; dependencies = [ - sources."big.js-3.2.0" + sources."big.js-5.2.2" sources."emojis-list-2.1.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" sources."mime-1.3.6" + sources."minimist-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -1454,6 +1468,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node.nix b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node.nix index 85aedb8a5a4c..7f95c2b88019 100644 --- a/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node.nix +++ b/nixpkgs/pkgs/servers/web-apps/codimd/CodeMirror/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/default.nix b/nixpkgs/pkgs/servers/web-apps/codimd/default.nix index d5e84cce9849..79ad58dddd8d 100644 --- a/nixpkgs/pkgs/servers/web-apps/codimd/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/codimd/default.nix @@ -1,9 +1,26 @@ { stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper -, fetchpatch, nodejs-6_x, phantomjs2, runtimeShell }: +, fetchpatch, nodejs-8_x, phantomjs2, runtimeShell }: let - nodePackages = import ./node.nix { - inherit pkgs; - system = stdenv.system; + nodePackages = let + # Some packages fail to install with ENOTCACHED due to a mistakenly added + # package-lock.json that bundles optional dependencies not resolved with `node2nix. + # See also https://github.com/svanderburg/node2nix/issues/134 + dontInstall = n: v: + if builtins.match ".*babel.*" n == null + then v + else v.override { dontNpmInstall = true; }; + + packages = stdenv.lib.mapAttrs (dontInstall) ( + import ./node.nix { + inherit pkgs; + system = stdenv.system; + } + ); + in packages // { + "js-url-^2.3.0" = packages."js-url-^2.3.0".overrideAttrs (_: { + # Don't download chromium (this isn't needed anyway for our case). + PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "1"; + }); }; addPhantomjs = (pkgs: @@ -14,12 +31,17 @@ let drvName = drv: (builtins.parseDrvName drv).name; linkNodeDeps = ({ pkg, deps, name ? "" }: - nodePackages.${pkg}.override (oldAttrs: { - postInstall = stdenv.lib.concatStringsSep "\n" (map (dep: '' - ln -s ${nodePackages.${dep}}/lib/node_modules/${drvName dep} \ - $out/lib/node_modules/${if name != "" then name else drvName pkg}/node_modules - '') deps - ); + let + targetModule = if name != "" then name else drvName pkg; + in nodePackages.${pkg}.override (oldAttrs: { + postInstall = '' + mkdir -p $out/lib/node_modules/${targetModule}/node_modules + ${stdenv.lib.concatStringsSep "\n" (map (dep: '' + ln -s ${nodePackages.${dep}}/lib/node_modules/${drvName dep} \ + $out/lib/node_modules/${targetModule}/node_modules/${drvName dep} + '') deps + )} + ''; }) ); @@ -43,8 +65,6 @@ let linkNodeDeps args ) [ { pkg = "select2-^3.5.2-browserify"; deps = [ "url-loader-^0.5.7" ]; } - { pkg = "js-sequence-diagrams-^1000000.0.6"; - deps = [ "lodash-^4.17.4" ]; } { pkg = "ionicons-~2.0.1"; deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; } { pkg = "font-awesome-^4.7.0"; @@ -66,18 +86,34 @@ let name = "codimd-env"; paths = pkgsWithPhantomjs ++ pkgsWithExtraDeps ++ [ codemirror + + # `js-sequence-diagrams` has been removed from the registry + # and replaced by a security holding package (the tarballs weren't published by + # upstream as upstream only supports bower, + # see https://github.com/bramp/js-sequence-diagrams/issues/212). + # + # As the tarballs are still there, we build this manually for now until codimd's upstream + # has resolved the issue. + (import ./js-sequence-diagrams { + inherit pkgs; + nodejs = nodejs-8_x; + extraNodePackages = { + lodash = nodePackages."lodash-^4.17.4"; + eve = nodePackages."eve-^0.5.4"; + }; + }) ] ++ filterNodePackagesToList [ "bootstrap" "codemirror-git+https://github.com/hackmdio/CodeMirror.git" "font-awesome" "ionicons" - "js-sequence-diagrams" "js-url" "markdown-it" "markdown-pdf" -"node-uuid" + "node-uuid" "raphael-git+https://github.com/dmitrybaranovskiy/raphael" "select2-browserify" + "url-loader" ] nodePackages; }; @@ -107,7 +143,7 @@ stdenv.mkDerivation rec { inherit name version src; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ nodejs-6_x ]; + buildInputs = [ nodejs-8_x ]; NODE_PATH = "${nodeEnv}/lib/node_modules"; @@ -118,6 +154,12 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # due to the `dontNpmInstall` workaround, `node_modules/.bin` isn't created anymore. + substituteInPlace package.json \ + --replace "webpack --config" "${nodejs-8_x}/bin/node ./node_modules/webpack/bin/webpack.js --config" + ''; + buildPhase = '' ln -s ${nodeEnv}/lib/node_modules node_modules npm run build @@ -127,7 +169,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cat > $out/bin/codimd <<EOF #!${runtimeShell} - ${nodejs-6_x}/bin/node $out/app.js + ${nodejs-8_x}/bin/node $out/app.js EOF cp -R {app.js,bin,lib,locales,package.json,public} $out/ ''; @@ -150,7 +192,7 @@ stdenv.mkDerivation rec { description = "Realtime collaborative markdown notes on all platforms"; license = licenses.agpl3; homepage = https://github.com/hackmdio/codimd; - maintainers = with maintainers; [ willibutz ]; + maintainers = with maintainers; [ willibutz ma27 ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/deps.json b/nixpkgs/pkgs/servers/web-apps/codimd/deps.json index c7cf790fe58e..18eedabdc8e5 100644 --- a/nixpkgs/pkgs/servers/web-apps/codimd/deps.json +++ b/nixpkgs/pkgs/servers/web-apps/codimd/deps.json @@ -71,7 +71,6 @@ , { "jquery-mousewheel": "^3.1.13" } , { "jquery-ui": "^1.12.1" } , { "js-cookie": "^2.1.3" } -, { "js-sequence-diagrams": "^1000000.0.6" } , { "js-url": "^2.3.0" } , { "js-yaml": "^3.7.0" } , { "jsdom-nogyp": "^0.8.3" } diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/generate.sh b/nixpkgs/pkgs/servers/web-apps/codimd/generate.sh index 6d2bf29532e9..0089c750dcc8 100755 --- a/nixpkgs/pkgs/servers/web-apps/codimd/generate.sh +++ b/nixpkgs/pkgs/servers/web-apps/codimd/generate.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix -6 -i deps.json \ +node2nix -8 -i deps.json \ -e ../../../development/node-packages/node-env.nix \ --no-copy-node-env \ -c node.nix diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/js-sequence-diagrams/default.nix b/nixpkgs/pkgs/servers/web-apps/codimd/js-sequence-diagrams/default.nix new file mode 100644 index 000000000000..04dc2d6054a3 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/codimd/js-sequence-diagrams/default.nix @@ -0,0 +1,33 @@ +{ pkgs, nodejs, extraNodePackages }: + +let + nodeEnv = import ../../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in + nodeEnv.buildNodePackage { + name = "js-sequence-diagrams"; + packageName = "js-sequence-diagrams"; + version = "1000000.0.6"; + src = pkgs.fetchFromGitHub { + owner = "Moeditor"; + repo = "js-sequence-diagrams"; + rev = "4d46bc6229a3f93c9bcad561cab4924034f5456d"; + sha256 = "09ri5cx5yq87p3nla06gs0xb2gifmsy0xhs0s5524xr4ya6pnivv"; + }; + dependencies = [ ]; + dontNpmInstall = true; + meta = { + description = "Fucks NPM and draws simple SVG sequence diagrams from textual representation of the diagram"; + homepage = "https://github.com/Moeditor/js-sequence-diagrams#readme"; + license = "BSD-2-Clause"; + }; + production = true; + bypassCache = true; + + postInstall = builtins.concatStringsSep "\n" (pkgs.lib.mapAttrsToList ( + name: pkg: "ln -s ${pkg}/lib/node_modules/${name} $out/lib/node_modules/${name}" + ) extraNodePackages); + } diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/node-packages.nix b/nixpkgs/pkgs/servers/web-apps/codimd/node-packages.nix index 414cf6c31589..6cbd64609716 100644 --- a/nixpkgs/pkgs/servers/web-apps/codimd/node-packages.nix +++ b/nixpkgs/pkgs/servers/web-apps/codimd/node-packages.nix @@ -4,6 +4,24 @@ let sources = { + "@textlint/ast-node-types-4.2.1" = { + name = "_at_textlint_slash_ast-node-types"; + packageName = "@textlint/ast-node-types"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.2.1.tgz"; + sha512 = "Pqg1LTJpF929Ovi/lCaPqlyz8yDwBFbQulC0jyQcbRAoTxYS4AZMc48Ug2yk0so5hISQXKrlAxyVBmBVl9EKGA=="; + }; + }; + "@textlint/markdown-to-ast-6.0.9" = { + name = "_at_textlint_slash_markdown-to-ast"; + packageName = "@textlint/markdown-to-ast"; + version = "6.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.0.9.tgz"; + sha512 = "hfAWBvTeUGh5t5kTn2U3uP3qOSM1BSrxzl1jF3nn0ywfZXpRBZr5yRjXnl4DzIYawCtZOshmRi/tI3/x4TE1jQ=="; + }; + }; "@types/body-parser-1.17.0" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -22,31 +40,40 @@ let sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg=="; }; }; - "@types/events-1.2.0" = { + "@types/estree-0.0.39" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.39"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; + sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; + }; + }; + "@types/events-3.0.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; - version = "1.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz"; - sha512 = "KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA=="; + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.16.0" = { + "@types/express-4.16.1" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.16.0"; + version = "4.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.16.0.tgz"; - sha512 = "TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.16.1.tgz"; + sha512 = "V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg=="; }; }; - "@types/express-serve-static-core-4.16.0" = { + "@types/express-serve-static-core-4.16.2" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.0"; + version = "4.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz"; - sha512 = "lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.2.tgz"; + sha512 = "qgc8tjnDrc789rAQed8NoiFLV5VGcItA4yWNFphqGU0RcuuQngD00g3LHhWIK3HQ2XeDgVCmlNPDlqi3fWBHnQ=="; }; }; "@types/geojson-1.0.6" = { @@ -67,40 +94,49 @@ let sha512 = "FSj24s1WsFEfOy8taIKp2DokSZfFkjWYZb88AS5eDj3WTocZ+4DnHjhzrXEs048WQ5mfOLJXMOAnc0kSnHh5Lw=="; }; }; - "@types/mime-2.0.0" = { + "@types/mime-2.0.1" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.0"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz"; + sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; + }; + }; + "@types/node-10.14.4" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz"; - sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz"; + sha512 = "DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg=="; }; }; - "@types/node-7.0.68" = { + "@types/node-11.13.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "7.0.68"; + version = "11.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-7.0.68.tgz"; - sha512 = "ym3LNHwJQU0XDyPrTK6NHJTH5YmGKKe0k56in6pg+Wx4HD8fiKrt8xute6/unHvHujCfzmOQTGz1NoEKgFF5Mw=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.13.0.tgz"; + sha512 = "rx29MMkRdVmzunmiA4lzBYJNnXsW/PhG4kMBy2ATsYaDjGGR75dCFEVVROKpNwlVdcUX3xxlghKQOeDPBJobng=="; }; }; - "@types/passport-0.3.5" = { + "@types/passport-1.0.0" = { name = "_at_types_slash_passport"; packageName = "@types/passport"; - version = "0.3.5"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/passport/-/passport-0.3.5.tgz"; - sha512 = "J7mdY1nnhjdbkXT84S3WsyrTtDf2KqUJ9JW3Y9vxA5GuXlejIuvwHw9A2TdNklAqPG2Q0TWqlsA2a2GIeV1jYA=="; + url = "https://registry.npmjs.org/@types/passport/-/passport-1.0.0.tgz"; + sha512 = "R2FXqM+AgsMIym0PuKj08Ybx+GR6d2rU3b1/8OcHolJ+4ga2pRPX105wboV6hq1AJvMo2frQzYKdqXS5+4cyMw=="; }; }; - "@types/range-parser-1.2.2" = { + "@types/range-parser-1.2.3" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.2.tgz"; - sha512 = "HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; + sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; "@types/serve-static-1.13.2" = { @@ -166,13 +202,31 @@ let sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; }; }; - "acorn-5.7.1" = { + "acorn-5.7.3" = { name = "acorn"; packageName = "acorn"; - version = "5.7.1"; + version = "5.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; + }; + }; + "acorn-6.1.1" = { + name = "acorn"; + packageName = "acorn"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; + sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; + }; + }; + "acorn-dynamic-import-4.0.0" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; - sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; + sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="; }; }; "acorn-globals-3.1.0" = { @@ -193,13 +247,13 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; - "acorn-object-spread-1.0.0" = { - name = "acorn-object-spread"; - packageName = "acorn-object-spread"; - version = "1.0.0"; + "acorn-jsx-5.0.1" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz"; - sha1 = "48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz"; + sha512 = "HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg=="; }; }; "after-0.8.2" = { @@ -211,6 +265,15 @@ let sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; + "agent-base-4.2.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz"; + sha512 = "JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg=="; + }; + }; "ajv-4.11.8" = { name = "ajv"; packageName = "ajv"; @@ -220,22 +283,13 @@ let sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; }; }; - "ajv-5.5.2" = { - name = "ajv"; - packageName = "ajv"; - version = "5.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; - }; - }; - "ajv-6.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "6.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz"; - sha512 = "hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; "ajv-keywords-1.5.1" = { @@ -247,15 +301,6 @@ let sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; - "ajv-keywords-3.2.0" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz"; - sha1 = "e86b819c602cf8821ad637413698f1dec021847a"; - }; - }; "align-text-0.1.4" = { name = "align-text"; packageName = "align-text"; @@ -571,15 +616,6 @@ let sha512 = "wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="; }; }; - "arrify-1.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; - }; - }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -688,22 +724,22 @@ let sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; - "async-2.6.1" = { + "async-2.6.2" = { name = "async"; packageName = "async"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; - sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; + url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; + sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; }; - "async-each-1.0.1" = { + "async-each-1.0.2" = { name = "async-each"; packageName = "async-each"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"; - sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz"; + sha512 = "6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg=="; }; }; "async-limiter-1.0.0" = { @@ -724,13 +760,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.1.1" = { + "atob-2.1.2" = { name = "atob"; packageName = "atob"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz"; - sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a"; + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; "autolinker-0.15.3" = { @@ -769,13 +805,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; "babel-code-frame-6.26.0" = { @@ -1264,13 +1300,22 @@ let sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; - "basic-auth-2.0.0" = { + "base64url-3.0.1" = { + name = "base64url"; + packageName = "base64url"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz"; + sha512 = "ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="; + }; + }; + "basic-auth-2.0.1" = { name = "basic-auth"; packageName = "basic-auth"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz"; - sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -1327,6 +1372,15 @@ let 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=="; + }; + }; "bignumber.js-4.1.0" = { name = "bignumber.js"; packageName = "bignumber.js"; @@ -1336,13 +1390,13 @@ let sha512 = "eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA=="; }; }; - "binary-extensions-1.11.0" = { + "binary-extensions-1.13.1" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "1.11.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz"; - sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; "bl-1.2.2" = { @@ -1363,13 +1417,13 @@ let sha512 = "6RwH3oJYMujQNd38WWU+jUSRqWfECrmpfL8o3fn3Q3fE9nn5iAktLZJHGEHqeecownbZZwZneTLbaNbIWwU9/A=="; }; }; - "blob-0.0.4" = { + "blob-0.0.5" = { name = "blob"; packageName = "blob"; - version = "0.0.4"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; - sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; + url = "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz"; + sha512 = "gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="; }; }; "block-elements-1.2.0" = { @@ -1390,22 +1444,22 @@ let sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2"; }; }; - "bluebird-3.5.1" = { + "bluebird-3.5.4" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.1"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz"; + sha512 = "FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="; }; }; - "body-parser-1.18.2" = { + "body-parser-1.18.3" = { name = "body-parser"; packageName = "body-parser"; - version = "1.18.2"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"; + sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4"; }; }; "boolbase-1.0.0" = { @@ -1498,13 +1552,13 @@ let sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9"; }; }; - "buble-0.15.2" = { + "buble-0.19.7" = { name = "buble"; packageName = "buble"; - version = "0.15.2"; + version = "0.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/buble/-/buble-0.15.2.tgz"; - sha1 = "547fc47483f8e5e8176d82aa5ebccb183b02d613"; + url = "https://registry.npmjs.org/buble/-/buble-0.19.7.tgz"; + sha512 = "YLgWxX/l+NnfotydBlxqCMPR4FREE4ubuHphALz0FxQ7u2hp3BzxTKQ4nKpapOaRJfEm1gukC68KnT2OymRK0g=="; }; }; "buffer-4.9.1" = { @@ -1516,13 +1570,13 @@ let sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "buffer-5.2.0" = { + "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz"; - sha512 = "nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; "buffer-alloc-1.2.0" = { @@ -1579,15 +1633,6 @@ let sha1 = "22a936901e3029afcd7547eb4487ceb697a3bf08"; }; }; - "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"; @@ -1705,13 +1750,13 @@ let sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"; }; }; - "caniuse-db-1.0.30000874" = { + "caniuse-db-1.0.30000957" = { name = "caniuse-db"; packageName = "caniuse-db"; - version = "1.0.30000874"; + version = "1.0.30000957"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000874.tgz"; - sha1 = "49edc0262efdc6c49d4d962bb16d1f0c790fa44e"; + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000957.tgz"; + sha512 = "13rVZZO/75kPKJhJsi86lPUme7zlvfGDnnvSYx3TA+kYQxLtGywth5+81pyVZDjUfYyzatwA/yjv6DNsh66gmQ=="; }; }; "caseless-0.12.0" = { @@ -1723,15 +1768,6 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "ccount-1.0.3" = { - name = "ccount"; - packageName = "ccount"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz"; - sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw=="; - }; - }; "center-align-0.1.3" = { name = "center-align"; packageName = "center-align"; @@ -1759,13 +1795,13 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "chalk-2.4.1" = { + "chalk-2.4.2" = { name = "chalk"; packageName = "chalk"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; - sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; "character-entities-1.2.2" = { @@ -1777,15 +1813,6 @@ let sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="; }; }; - "character-entities-html4-1.1.2" = { - name = "character-entities-html4"; - packageName = "character-entities-html4"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; - sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw=="; - }; - }; "character-entities-legacy-1.1.2" = { name = "character-entities-legacy"; packageName = "character-entities-legacy"; @@ -1813,13 +1840,13 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chownr-1.0.1" = { + "chownr-1.1.1" = { name = "chownr"; packageName = "chownr"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; - sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; + sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; }; }; "circular-json-0.3.3" = { @@ -1849,13 +1876,13 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; - "clean-css-4.1.11" = { + "clean-css-4.2.1" = { name = "clean-css"; packageName = "clean-css"; - version = "4.1.11"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz"; - sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz"; + sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; }; }; "cli-1.0.1" = { @@ -1894,13 +1921,13 @@ let sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; }; }; - "clipboard-2.0.1" = { + "clipboard-2.0.4" = { name = "clipboard"; packageName = "clipboard"; - version = "2.0.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.1.tgz"; - sha512 = "7yhQBmtN+uYZmfRjjVjKa0dZdWuabzpSKGtyQZN+9C8xlC788SSJjOHWh7tzurfwTqTD5UDYAhIv5fRJg3sHjQ=="; + url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz"; + sha512 = "Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ=="; }; }; "cliui-2.1.0" = { @@ -2011,22 +2038,22 @@ let sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764"; }; }; - "color-convert-1.9.2" = { + "color-convert-1.9.3" = { name = "color-convert"; packageName = "color-convert"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz"; - sha512 = "3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg=="; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; - "color-name-1.1.1" = { + "color-name-1.1.3" = { name = "color-name"; packageName = "color-name"; - version = "1.1.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz"; - sha1 = "4b1415304cf50028ea81643643bd82ea05803689"; + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; "color-string-0.3.0" = { @@ -2074,31 +2101,49 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "combined-stream-1.0.6" = { + "colors-1.3.3" = { + name = "colors"; + packageName = "colors"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz"; + sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; + }; + }; + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; + }; + }; + "commander-2.17.1" = { + name = "commander"; + packageName = "commander"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; - "commander-2.14.1" = { + "commander-2.19.0" = { name = "commander"; packageName = "commander"; - version = "2.14.1"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; - sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; + url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"; + sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; }; }; - "commander-2.16.0" = { + "commander-2.20.0" = { name = "commander"; packageName = "commander"; - version = "2.16.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz"; - sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="; + url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"; + sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="; }; }; "commondir-1.0.1" = { @@ -2146,13 +2191,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.14" = { + "compressible-2.0.16" = { name = "compressible"; packageName = "compressible"; - version = "2.0.14"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz"; - sha1 = "326c5f507fbb055f54116782b969a81b67a29da7"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz"; + sha512 = "JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA=="; }; }; "concat-map-0.0.1" = { @@ -2173,13 +2218,13 @@ let sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; - "config-chain-1.1.11" = { + "config-chain-1.1.12" = { name = "config-chain"; packageName = "config-chain"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz"; - sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2"; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; "console-browserify-1.1.0" = { @@ -2245,13 +2290,13 @@ let sha512 = "lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ=="; }; }; - "convert-source-map-1.5.1" = { + "convert-source-map-1.6.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz"; - sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz"; + sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A=="; }; }; "cookie-0.3.1" = { @@ -2299,13 +2344,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-2.5.7" = { + "core-js-2.6.5" = { name = "core-js"; packageName = "core-js"; - version = "2.5.7"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz"; - sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz"; + sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="; }; }; "core-util-is-1.0.2" = { @@ -2398,22 +2443,22 @@ let sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; }; }; - "css-selector-tokenizer-0.7.0" = { + "css-selector-tokenizer-0.7.1" = { name = "css-selector-tokenizer"; packageName = "css-selector-tokenizer"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz"; - sha1 = "e6988474ae8c953477bf5e7efecfceccd9cf4c86"; + url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz"; + sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA=="; }; }; - "css-what-2.1.0" = { + "css-what-2.1.3" = { name = "css-what"; packageName = "css-what"; - version = "2.1.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz"; - sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd"; + url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; + sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; }; }; "cssesc-0.1.0" = { @@ -2461,13 +2506,13 @@ let sha1 = "2682709b5902e7212df529116ff788cd5b254894"; }; }; - "cssom-0.3.4" = { + "cssom-0.3.6" = { name = "cssom"; packageName = "cssom"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz"; - sha512 = "+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog=="; + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz"; + sha512 = "DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="; }; }; "cssstyle-0.2.37" = { @@ -2587,6 +2632,24 @@ let sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; + "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=="; + }; + }; "debug-log-1.0.1" = { name = "debug-log"; packageName = "debug-log"; @@ -2650,13 +2713,13 @@ let sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; }; }; - "define-properties-1.1.2" = { + "define-properties-1.1.3" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; - sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "define-property-0.2.5" = { @@ -2704,15 +2767,6 @@ let sha512 = "2kjwuGGonL7gWE1XU4Fv79+vVzpoQCl0V+boMwWtOQJV2AGDabCwez++nB1Nli/8BabAfZQ/UuHPlp6AymKdWw=="; }; }; - "del-2.2.2" = { - name = "del"; - packageName = "del"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-2.2.2.tgz"; - sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -2740,22 +2794,22 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "depd-1.1.1" = { + "depd-1.1.2" = { name = "depd"; packageName = "depd"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; - sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; - "depd-1.1.2" = { + "depd-2.0.0" = { name = "depd"; packageName = "depd"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; "deprecated-0.0.1" = { @@ -2812,13 +2866,13 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; - "dir-glob-2.0.0" = { + "dir-glob-2.2.2" = { name = "dir-glob"; packageName = "dir-glob"; - version = "2.0.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz"; - sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag=="; + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; }; }; "dns-lookup-all-1.0.2" = { @@ -2857,22 +2911,22 @@ let sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; }; }; - "dom-converter-0.1.4" = { + "dom-converter-0.2.0" = { name = "dom-converter"; packageName = "dom-converter"; - version = "0.1.4"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz"; - sha1 = "a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"; + url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; + sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; }; }; - "dom-serializer-0.1.0" = { + "dom-serializer-0.1.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz"; + sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="; }; }; "domain-browser-1.2.0" = { @@ -2884,31 +2938,13 @@ let sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; - "domelementtype-1.1.3" = { + "domelementtype-1.3.1" = { name = "domelementtype"; packageName = "domelementtype"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - }; - "domelementtype-1.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; - }; - }; - "domhandler-2.1.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.1.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz"; - sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; "domhandler-2.3.0" = { @@ -2929,15 +2965,6 @@ let sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; }; }; - "domutils-1.1.6" = { - name = "domutils"; - packageName = "domutils"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz"; - sha1 = "bddc3de099b9a2efacc51c623f28f416ecc57485"; - }; - }; "domutils-1.5.1" = { name = "domutils"; packageName = "domutils"; @@ -3001,13 +3028,13 @@ let sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; }; }; - "duplexify-3.6.0" = { + "duplexify-3.7.1" = { name = "duplexify"; packageName = "duplexify"; - version = "3.6.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz"; - sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ=="; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; "eachr-2.0.4" = { @@ -3037,13 +3064,22 @@ let sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg=="; }; }; - "editorconfig-0.13.3" = { + "editions-2.1.3" = { + name = "editions"; + packageName = "editions"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz"; + sha512 = "xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw=="; + }; + }; + "editorconfig-0.15.3" = { name = "editorconfig"; packageName = "editorconfig"; - version = "0.13.3"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz"; - sha512 = "WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ=="; + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; + sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; }; }; "ee-first-1.1.1" = { @@ -3064,13 +3100,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.55" = { + "electron-to-chromium-1.3.124" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.55"; + version = "1.3.124"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz"; - sha1 = "f150e10b20b77d9d41afcca312efe0c3b1a7fdce"; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz"; + sha512 = "glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w=="; }; }; "emoji-regex-6.1.3" = { @@ -3136,13 +3172,13 @@ let sha512 = "hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg=="; }; }; - "engine.io-parser-2.1.2" = { + "engine.io-parser-2.1.3" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz"; - sha512 = "dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz"; + sha512 = "6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA=="; }; }; "enhanced-resolve-0.9.1" = { @@ -3163,13 +3199,22 @@ let sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; }; }; - "entities-1.1.1" = { + "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=="; + }; + }; + "errlop-1.1.1" = { + name = "errlop"; + packageName = "errlop"; version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + url = "https://registry.npmjs.org/errlop/-/errlop-1.1.1.tgz"; + sha512 = "WX7QjiPHhsny7/PQvrhS5VMizXXKoKCS3udaBp8gjlARdbn+XmK300eKBAAN0hGyRaTCtRpOaxK+xFVPUJ3zkw=="; }; }; "errno-0.1.7" = { @@ -3190,31 +3235,31 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.12.0" = { + "es-abstract-1.13.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz"; - sha512 = "C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz"; + sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="; }; }; - "es-to-primitive-1.1.1" = { + "es-to-primitive-1.2.0" = { name = "es-to-primitive"; packageName = "es-to-primitive"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; - sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.45" = { + "es5-ext-0.10.49" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.45"; + version = "0.10.49"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz"; - sha512 = "FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz"; + sha512 = "3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg=="; }; }; "es6-error-2.1.1" = { @@ -3244,13 +3289,22 @@ let sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; }; }; - "es6-promise-4.2.4" = { + "es6-promise-4.2.6" = { name = "es6-promise"; packageName = "es6-promise"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; - sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz"; + sha512 = "aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="; + }; + }; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; }; "es6-set-0.1.5" = { @@ -3298,13 +3352,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-1.11.0" = { + "escodegen-1.11.1" = { name = "escodegen"; packageName = "escodegen"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz"; - sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; + sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; }; }; "escope-3.6.0" = { @@ -3433,13 +3487,13 @@ let sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; }; }; - "estree-walker-0.2.1" = { + "estree-walker-0.6.0" = { name = "estree-walker"; packageName = "estree-walker"; - version = "0.2.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz"; - sha1 = "bdafe8095383d8414d5dc2ecf4c9173b6db9412e"; + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz"; + sha512 = "peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw=="; }; }; "esutils-2.0.2" = { @@ -3460,16 +3514,6 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "eve-git://github.com/adobe-webplatform/eve.git#eef80ed" = { - name = "eve"; - packageName = "eve"; - version = "0.4.1"; - src = fetchgit { - url = "git://github.com/adobe-webplatform/eve.git"; - rev = "eef80ed8d188423c2272746fb8ae5cc8dad84cb1"; - sha256 = "2b86ece1177813f6ee1eb6b0cc0e85cfdaca208eb46aa911dd802263e2d9b003"; - }; - }; "eve-raphael-0.5.0" = { name = "eve-raphael"; packageName = "eve-raphael"; @@ -3488,13 +3532,13 @@ let sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; - "eventemitter2-0.4.14" = { + "eventemitter2-5.0.1" = { name = "eventemitter2"; packageName = "eventemitter2"; - version = "0.4.14"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; - sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz"; + sha1 = "6197a095d5fb6b57e8942f6fd7eaad63a09c9452"; }; }; "events-1.1.1" = { @@ -3587,15 +3631,6 @@ let sha512 = "ngXzTfoRGG7fYens3/RMb6yYoVLvLMfmsSllP/mZPxNHgFq41TmPSLF/nLY7fwoclI2vElvAmILFWGUYqdjfCg=="; }; }; - "extend-1.2.1" = { - name = "extend"; - packageName = "extend"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - }; "extend-3.0.0" = { name = "extend"; packageName = "extend"; @@ -3704,22 +3739,13 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; }; - "fancy-log-1.3.2" = { + "fancy-log-1.3.3" = { name = "fancy-log"; packageName = "fancy-log"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; - sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; - }; - }; - "fast-deep-equal-1.1.0" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz"; + sha512 = "k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw=="; }; }; "fast-deep-equal-2.0.1" = { @@ -3749,13 +3775,22 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fastparse-1.1.1" = { + "fastparse-1.1.2" = { name = "fastparse"; packageName = "fastparse"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz"; - sha1 = "d1e2643b38a94d7583b479060e6c4affc94071f8"; + url = "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz"; + sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; + }; + }; + "fault-1.0.2" = { + name = "fault"; + packageName = "fault"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fault/-/fault-1.0.2.tgz"; + sha512 = "o2eo/X2syzzERAtN5LcGbiVQ0WwZSlN3qLtadwAz3X8Bu+XWD16dja/KMsjZLiQr+BLGPDnHGkc4yUJf1Xpkpw=="; }; }; "fd-slicer-1.0.1" = { @@ -3767,6 +3802,15 @@ let sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; }; }; + "feature-policy-0.2.0" = { + name = "feature-policy"; + packageName = "feature-policy"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/feature-policy/-/feature-policy-0.2.0.tgz"; + sha512 = "2hGrlv6efG4hscYVZeaYjpzpT6I2OZgYqE2yDUzeAcKj2D1SH0AsEzqJNXzdoglEddcIXQQYop3lD97XpG75Jw=="; + }; + }; "figures-1.7.0" = { name = "figures"; packageName = "figures"; @@ -3893,13 +3937,13 @@ let sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; }; }; - "fined-1.1.0" = { + "fined-1.1.1" = { name = "fined"; packageName = "fined"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; - sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; + url = "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz"; + sha512 = "jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g=="; }; }; "first-chunk-stream-1.0.0" = { @@ -3911,22 +3955,22 @@ let sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; }; }; - "flagged-respawn-1.0.0" = { + "flagged-respawn-1.0.1" = { name = "flagged-respawn"; packageName = "flagged-respawn"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; - sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz"; + sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; - "flat-cache-1.3.0" = { + "flat-cache-1.3.4" = { name = "flat-cache"; packageName = "flat-cache"; - version = "1.3.0"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz"; - sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481"; + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz"; + sha512 = "VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg=="; }; }; "flatten-1.0.2" = { @@ -3938,13 +3982,13 @@ let sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; }; }; - "flush-write-stream-1.0.3" = { + "flush-write-stream-1.1.1" = { name = "flush-write-stream"; packageName = "flush-write-stream"; - version = "1.0.3"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz"; - sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw=="; + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; "for-in-1.0.2" = { @@ -3974,15 +4018,6 @@ let sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; }; }; - "foreach-2.0.5" = { - name = "foreach"; - packageName = "foreach"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; - sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; - }; - }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -4010,13 +4045,22 @@ let sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "format-0.2.2" = { + name = "format"; + packageName = "format"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/format/-/format-0.2.2.tgz"; + sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; }; }; "formidable-1.0.17" = { @@ -4145,13 +4189,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.2.4" = { + "fsevents-1.2.7" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.4"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz"; - sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz"; + sha512 = "Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw=="; }; }; "function-bind-1.1.1" = { @@ -4181,13 +4225,13 @@ let sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; }; }; - "generate-function-2.0.0" = { + "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; - version = "2.0.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; + sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; }; }; "generate-object-property-1.2.0" = { @@ -4289,13 +4333,13 @@ let sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; }; }; - "glob-7.1.2" = { + "glob-7.1.3" = { name = "glob"; packageName = "glob"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; "glob-base-0.3.0" = { @@ -4388,15 +4432,6 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; - "globby-5.0.0" = { - name = "globby"; - packageName = "globby"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz"; - sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; - }; - }; "globby-7.1.1" = { name = "globby"; packageName = "globby"; @@ -4415,13 +4450,13 @@ let sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; }; }; - "glogg-1.0.1" = { + "glogg-1.0.2" = { name = "glogg"; packageName = "glogg"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz"; - sha512 = "ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw=="; + url = "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz"; + sha512 = "5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA=="; }; }; "good-listener-1.2.2" = { @@ -4451,22 +4486,22 @@ let sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818"; }; }; - "graceful-fs-4.1.11" = { + "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; - "graphlib-2.1.5" = { + "graphlib-2.1.7" = { name = "graphlib"; packageName = "graphlib"; - version = "2.1.5"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; - sha512 = "XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA=="; + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz"; + sha512 = "TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w=="; }; }; "graphlibrary-2.2.0" = { @@ -4478,40 +4513,31 @@ let sha512 = "XTcvT55L8u4MBZrM37zXoUxsgxs/7sow7YSygd9CIwfWTVO8RVu7AYXhhCiTuFEf+APKgx6Jk4SuQbYR0vYKmQ=="; }; }; - "grunt-contrib-jshint-1.1.0" = { + "grunt-contrib-jshint-2.1.0" = { name = "grunt-contrib-jshint"; packageName = "grunt-contrib-jshint"; - version = "1.1.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.1.0.tgz"; - sha1 = "369d909b2593c40e8be79940b21340850c7939ac"; + url = "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-2.1.0.tgz"; + sha512 = "65S2/C/6RfjY/umTxfwXXn+wVvaYmykHkHSsW6Q6rhkbv3oudTEgqnFFZvWzWCoHUb+3GMZLbP3oSrNyvshmIQ=="; }; }; - "grunt-contrib-qunit-2.0.0" = { + "grunt-contrib-qunit-3.1.0" = { name = "grunt-contrib-qunit"; packageName = "grunt-contrib-qunit"; - version = "2.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-2.0.0.tgz"; - sha1 = "54a51b4b2c84fee62c3b7e00145c928d1ec2b7ec"; + url = "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-3.1.0.tgz"; + sha512 = "mdk8UltH6mxCD63E0hTXMAts42DOi4z4bBBrY7qnuHiShflMF7IueSMYe0zWaZ2dO8mgujh57Zfny2EbigJhRg=="; }; }; - "grunt-contrib-uglify-3.4.0" = { + "grunt-contrib-uglify-4.0.1" = { name = "grunt-contrib-uglify"; packageName = "grunt-contrib-uglify"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-3.4.0.tgz"; - sha512 = "UXsTpeP0pytpTYlmll3RDndsRXfdwmrf1tI/AtD/PrArQAzGmKMvj83aVt3D8egWlE6KqPjsJBLCCvfC52LI/A=="; - }; - }; - "grunt-lib-phantomjs-1.1.0" = { - name = "grunt-lib-phantomjs"; - packageName = "grunt-lib-phantomjs"; - version = "1.1.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-1.1.0.tgz"; - sha1 = "9e9edcdd9fd2dd40e0c181c94371d572aa5eead2"; + url = "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-4.0.1.tgz"; + sha512 = "dwf8/+4uW1+7pH72WButOEnzErPGmtUvc8p08B0eQS/6ON0WdeQu0+WFeafaPTbbY1GqtS25lsHWaDeiTQNWPg=="; }; }; "gulp-3.9.1" = { @@ -4586,13 +4612,13 @@ let sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; - "har-validator-5.0.3" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.0.3"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -4667,6 +4693,15 @@ let sha1 = "6414c82913697da51590397dafb12f22967811ce"; }; }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -4739,13 +4774,13 @@ let sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; }; }; - "he-1.1.1" = { + "he-1.2.0" = { name = "he"; packageName = "he"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "helmet-crossdomain-0.3.0" = { @@ -4775,13 +4810,13 @@ let sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; }; }; - "highlight.js-9.12.0" = { + "highlight.js-9.15.6" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.12.0"; + version = "9.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz"; - sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz"; + sha512 = "zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ=="; }; }; "hoek-2.16.3" = { @@ -4802,13 +4837,13 @@ let sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "hooker-0.2.3" = { @@ -4838,22 +4873,22 @@ let sha1 = "10e142264e76215a5d30c44ec43de64dee6d1672"; }; }; - "hsts-2.1.0" = { + "hsts-2.2.0" = { name = "hsts"; packageName = "hsts"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hsts/-/hsts-2.1.0.tgz"; - sha512 = "zXhh/DqgrTXJ7erTN6Fh5k/xjMhDGXCqdYN3wvxUvGUQvnxcFfUd8E+6vLg/nk3ss1TYMb+DhRl25fYABioTvA=="; + url = "https://registry.npmjs.org/hsts/-/hsts-2.2.0.tgz"; + sha512 = "ToaTnQ2TbJkochoVcdXYm4HOCliNozlviNsg+X2XQLQvZNI/kCHR9rZxVYpJB3UPcHz80PgxRyWQ7PdU1r+VBQ=="; }; }; - "html-comment-regex-1.1.1" = { + "html-comment-regex-1.1.2" = { name = "html-comment-regex"; packageName = "html-comment-regex"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz"; - sha1 = "668b93776eaae55ebde8f3ad464b307a4963625e"; + url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; + sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; }; }; "html-encoding-sniffer-1.0.2" = { @@ -4865,22 +4900,22 @@ let sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; }; }; - "html-minifier-3.5.19" = { + "html-minifier-3.5.21" = { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.19"; + version = "3.5.21"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz"; - sha512 = "Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA=="; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz"; + sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; }; }; - "htmlparser2-3.3.0" = { + "htmlparser2-3.10.1" = { name = "htmlparser2"; packageName = "htmlparser2"; - version = "3.3.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz"; - sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe"; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; }; }; "htmlparser2-3.8.3" = { @@ -4901,15 +4936,6 @@ let sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; }; }; - "http-errors-1.6.2" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; - sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; - }; - }; "http-errors-1.6.3" = { name = "http-errors"; packageName = "http-errors"; @@ -4946,13 +4972,13 @@ let sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; }; }; - "iconv-lite-0.4.19" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.19"; + "https-proxy-agent-2.2.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz"; + sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ=="; }; }; "iconv-lite-0.4.23" = { @@ -4964,6 +4990,15 @@ let sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; }; }; + "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-replace-symbols-1.1.0" = { name = "icss-replace-symbols"; packageName = "icss-replace-symbols"; @@ -4973,13 +5008,13 @@ let sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; }; }; - "ieee754-1.1.12" = { + "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; - sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; "ieee754-1.1.8" = { @@ -4991,13 +5026,13 @@ let sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; - "ienoopen-1.0.0" = { + "ienoopen-1.1.0" = { name = "ienoopen"; packageName = "ienoopen"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz"; - sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b"; + url = "https://registry.npmjs.org/ienoopen/-/ienoopen-1.1.0.tgz"; + sha512 = "MFs36e/ca6ohEKtinTJ5VvAJ6oDRAYFdYXweUnGY9L9vcoqFOU4n2ZhmJ0C4z/cwGZ3YIQRSB3XZ1+ghZkY5NQ=="; }; }; "iferr-0.1.5" = { @@ -5153,13 +5188,13 @@ let sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; }; }; - "interpret-1.1.0" = { + "interpret-1.2.0" = { name = "interpret"; packageName = "interpret"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; + sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; }; }; "invariant-2.2.4" = { @@ -5270,15 +5305,6 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; @@ -5441,13 +5467,13 @@ let sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; }; }; - "is-glob-4.0.0" = { + "is-glob-4.0.1" = { name = "is-glob"; packageName = "is-glob"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz"; - sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; "is-hexadecimal-1.0.2" = { @@ -5468,13 +5494,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.17.2" = { + "is-my-json-valid-2.19.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.17.2"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz"; - sha512 = "IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz"; + sha512 = "mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q=="; }; }; "is-number-2.1.0" = { @@ -5504,33 +5530,6 @@ let sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="; }; }; - "is-path-cwd-1.0.0" = { - name = "is-path-cwd"; - packageName = "is-path-cwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; - }; - }; - "is-path-in-cwd-1.0.1" = { - name = "is-path-in-cwd"; - packageName = "is-path-in-cwd"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ=="; - }; - }; - "is-path-inside-1.0.1" = { - name = "is-path-inside"; - packageName = "is-path-inside"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; - }; - }; "is-plain-obj-1.1.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -5630,13 +5629,13 @@ let sha1 = "cf61090da0d9efbcab8722deba6f032208dbb0e9"; }; }; - "is-symbol-1.0.1" = { + "is-symbol-1.0.2" = { name = "is-symbol"; packageName = "is-symbol"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; - sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; }; }; "is-typedarray-1.0.0" = { @@ -5666,6 +5665,15 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; + "is-whitespace-character-1.0.2" = { + name = "is-whitespace-character"; + packageName = "is-whitespace-character"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz"; + sha512 = "SzM+T5GKUCtLhlHFKt2SDAX2RFzfS6joT91F2/WSi9LxgFdsnhfPK/UIA+JhRR2xuyLdrCys2PiFDrtn1fU5hQ=="; + }; + }; "is-windows-0.2.0" = { name = "is-windows"; packageName = "is-windows"; @@ -5684,6 +5692,15 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; + "is-word-character-1.0.2" = { + name = "is-word-character"; + packageName = "is-word-character"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.2.tgz"; + sha512 = "T3FlsX8rCHAH8e7RE7PfOPZVFQlcV3XRF9eOOBQ1uf70OxO7CjjSOjeImMPCADBdYWcStAbVbYvJ1m2D3tb+EA=="; + }; + }; "isarray-0.0.1" = { name = "isarray"; packageName = "isarray"; @@ -5756,22 +5773,22 @@ let sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; }; }; - "js-base64-2.4.8" = { + "js-base64-2.5.1" = { name = "js-base64"; packageName = "js-base64"; - version = "2.4.8"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz"; - sha512 = "hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz"; + sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; - "js-beautify-1.7.5" = { + "js-beautify-1.9.1" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.7.5"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz"; - sha512 = "9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.1.tgz"; + sha512 = "oxxvVZdOdUfzk8IOLBF2XUZvl2GoBEfA+b0of4u2EBY/46NlXasi8JdFvazA5lCrf9/lQhTjyVy2QCUW7iq0MQ=="; }; }; "js-string-escape-1.0.1" = { @@ -5792,13 +5809,13 @@ let sha1 = "9866df395102130e38f7f996bceb65443209c25b"; }; }; - "js-yaml-3.12.0" = { + "js-yaml-3.13.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; }; "js-yaml-3.5.5" = { @@ -5855,13 +5872,13 @@ let sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; }; }; - "jshint-2.9.6" = { + "jshint-2.10.2" = { name = "jshint"; packageName = "jshint"; - version = "2.9.6"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz"; - sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz"; + sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA=="; }; }; "json-edm-parser-0.1.2" = { @@ -5891,15 +5908,6 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; - }; - }; "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -5945,6 +5953,15 @@ let 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=="; + }; + }; "jsonfile-2.4.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -6098,13 +6115,13 @@ let sha1 = "f2b842be0b86da3352798505b31ebcae590d77d0"; }; }; - "ldapauth-fork-4.0.2" = { + "ldapauth-fork-4.2.0" = { name = "ldapauth-fork"; packageName = "ldapauth-fork"; - version = "4.0.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-4.0.2.tgz"; - sha512 = "YoPHsyfV6L/4SO5EMi/Jk1xUMaY+ANlR4Yp+WIsqGkWOLPKkuzRYB4s/IsdKBeb3sdwVCw+q/YN9eoa1dXmQdA=="; + url = "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-4.2.0.tgz"; + sha512 = "DFYhOO9UPX/fIUnwAjJ4zCq2osR3pyS9TK24oBRLHj7+iw9OAbckHLcdDkgI//IajUEsF6Ngz0uXod6A88L2HA=="; }; }; "ldapjs-1.0.2" = { @@ -6134,13 +6151,13 @@ let sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; }; }; - "linkify-it-2.0.3" = { + "linkify-it-2.1.0" = { name = "linkify-it"; packageName = "linkify-it"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz"; - sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f"; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz"; + sha512 = "4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg=="; }; }; "load-json-file-2.0.0" = { @@ -6170,13 +6187,13 @@ let sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; }; }; - "loader-utils-1.1.0" = { + "loader-utils-1.2.3" = { name = "loader-utils"; packageName = "loader-utils"; - version = "1.1.0"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; - sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; + sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; }; }; "locate-path-2.0.0" = { @@ -6197,22 +6214,13 @@ let sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; }; }; - "lodash-3.10.1" = { - name = "lodash"; - packageName = "lodash"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; - }; - }; - "lodash-4.17.10" = { + "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; "lodash._basecopy-3.0.1" = { @@ -6503,15 +6511,6 @@ let sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; }; }; - "longest-streak-1.0.0" = { - name = "longest-streak"; - packageName = "longest-streak"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz"; - sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"; - }; - }; "loose-envify-1.4.0" = { name = "loose-envify"; packageName = "loose-envify"; @@ -6539,22 +6538,22 @@ let sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; }; }; - "lru-cache-3.2.0" = { + "lru-cache-4.1.5" = { name = "lru-cache"; packageName = "lru-cache"; - version = "3.2.0"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz"; - sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "lru-cache-4.1.3" = { + "lru-cache-5.1.1" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.1.3"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz"; - sha512 = "fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; "lru-queue-0.1.0" = { @@ -6566,13 +6565,13 @@ let sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; }; }; - "magic-string-0.14.0" = { + "magic-string-0.25.2" = { name = "magic-string"; packageName = "magic-string"; - version = "0.14.0"; + version = "0.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.14.0.tgz"; - sha1 = "57224aef1701caeed273b17a39a956e72b172462"; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz"; + sha512 = "iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg=="; }; }; "make-dir-1.3.0" = { @@ -6620,22 +6619,13 @@ let sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; }; }; - "markdown-table-0.4.0" = { - name = "markdown-table"; - packageName = "markdown-table"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; - sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; - }; - }; - "markdown-to-ast-3.4.0" = { - name = "markdown-to-ast"; - packageName = "markdown-to-ast"; - version = "3.4.0"; + "markdown-escapes-1.0.2" = { + name = "markdown-escapes"; + packageName = "markdown-escapes"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz"; - sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; + url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.2.tgz"; + sha512 = "lbRZ2mE3Q9RtLjxZBZ9+IMl68DKIXaVAhwvwn9pmjnPLS0h/6kyBMgNhqi1xFJ/2yv6cSyv0jbiZavZv93JkkA=="; }; }; "marked-0.3.19" = { @@ -6665,13 +6655,13 @@ let sha1 = "dbeda5b06b3249973c6df6170fde2386f0afd893"; }; }; - "math-random-1.0.1" = { + "math-random-1.0.4" = { name = "math-random"; packageName = "math-random"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz"; - sha1 = "8b3aac588b8a66e4975e3cdea67f7bb329601fac"; + url = "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz"; + sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; }; }; "maxmin-2.1.0" = { @@ -6719,13 +6709,13 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; - "memoizee-0.4.12" = { + "memoizee-0.4.14" = { name = "memoizee"; packageName = "memoizee"; - version = "0.4.12"; + version = "0.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.12.tgz"; - sha512 = "sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg=="; + url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz"; + sha512 = "/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg=="; }; }; "memory-fs-0.2.0" = { @@ -6827,22 +6817,31 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.35.0" = { + "mime-2.4.1" = { + name = "mime"; + packageName = "mime"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz"; + sha512 = "VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ=="; + }; + }; + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.35.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz"; - sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.19" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.19"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz"; - sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "mimic-fn-1.2.0" = { @@ -6908,22 +6907,22 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.3.3" = { + "minipass-2.3.5" = { name = "minipass"; packageName = "minipass"; - version = "2.3.3"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz"; - sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz"; + sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA=="; }; }; - "minizlib-1.1.0" = { + "minizlib-1.2.1" = { name = "minizlib"; packageName = "minizlib"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; - sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz"; + sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA=="; }; }; "mississippi-2.0.0" = { @@ -6953,22 +6952,22 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "moment-2.22.2" = { + "moment-2.24.0" = { name = "moment"; packageName = "moment"; - version = "2.22.2"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; - sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; - "moment-timezone-0.5.21" = { + "moment-timezone-0.5.23" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.21"; + version = "0.5.23"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.21.tgz"; - sha512 = "j96bAh4otsgj3lKydm3K7kdtA3iKf2m6MY2iSYCzCm5a1zmHo1g+aK3068dDEeocLZQIS9kU8bsdQHLqEvgW0A=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.23.tgz"; + sha512 = "WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w=="; }; }; "move-concurrently-1.0.1" = { @@ -6989,6 +6988,15 @@ let 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=="; + }; + }; "multipipe-0.1.2" = { name = "multipipe"; packageName = "multipipe"; @@ -6998,13 +7006,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "mustache-2.3.0" = { + "mustache-3.0.1" = { name = "mustache"; packageName = "mustache"; - version = "2.3.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz"; - sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; + url = "https://registry.npmjs.org/mustache/-/mustache-3.0.1.tgz"; + sha512 = "jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA=="; }; }; "mute-stream-0.0.5" = { @@ -7034,6 +7042,15 @@ let sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; }; }; + "nan-2.13.2" = { + name = "nan"; + packageName = "nan"; + version = "2.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz"; + sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; + }; + }; "nanomatch-1.2.13" = { name = "nanomatch"; packageName = "nanomatch"; @@ -7043,13 +7060,13 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; - "natives-1.1.4" = { + "natives-1.1.6" = { name = "natives"; packageName = "natives"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz"; - sha512 = "Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg=="; + url = "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz"; + sha512 = "6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA=="; }; }; "natural-compare-1.4.0" = { @@ -7070,13 +7087,13 @@ let sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; }; }; - "needle-2.2.1" = { + "needle-2.2.4" = { name = "needle"; packageName = "needle"; - version = "2.2.1"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; - sha512 = "t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q=="; + url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz"; + sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA=="; }; }; "negotiator-0.6.1" = { @@ -7088,6 +7105,15 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; + "neo-async-2.6.0" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz"; + sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA=="; + }; + }; "next-tick-1.0.0" = { name = "next-tick"; packageName = "next-tick"; @@ -7115,13 +7141,13 @@ let sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980"; }; }; - "node-forge-0.7.5" = { + "node-forge-0.7.6" = { name = "node-forge"; packageName = "node-forge"; - version = "0.7.5"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz"; - sha512 = "MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="; + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz"; + sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; "node-libs-browser-0.7.0" = { @@ -7133,22 +7159,22 @@ let sha1 = "3e272c0819e308935e26674408d7af0e1491b83b"; }; }; - "node-pre-gyp-0.10.3" = { + "node-pre-gyp-0.11.0" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.10.3"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz"; - sha512 = "d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz"; + sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "node-static-0.6.0" = { + "node-static-0.7.11" = { name = "node-static"; packageName = "node-static"; - version = "0.6.0"; + version = "0.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/node-static/-/node-static-0.6.0.tgz"; - sha1 = "e8543a897f3c82048220b39569284d44796eb1e2"; + url = "https://registry.npmjs.org/node-static/-/node-static-0.7.11.tgz"; + sha512 = "zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ=="; }; }; "nomnom-1.8.1" = { @@ -7178,13 +7204,13 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "normalize-package-data-2.4.0" = { + "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "normalize-path-2.1.1" = { @@ -7214,22 +7240,22 @@ let sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; }; }; - "npm-bundled-1.0.3" = { + "npm-bundled-1.0.6" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.0.3"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; - sha512 = "ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; + sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.1.11" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.11"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz"; - sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npm-run-path-2.0.2" = { @@ -7250,13 +7276,13 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; - "nth-check-1.0.1" = { + "nth-check-1.0.2" = { name = "nth-check"; packageName = "nth-check"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"; - sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; "num2fraction-1.2.2" = { @@ -7313,6 +7339,15 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; + "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-3.0.0" = { name = "object-assign"; packageName = "object-assign"; @@ -7358,13 +7393,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-keys-1.0.12" = { + "object-keys-1.1.0" = { name = "object-keys"; packageName = "object-keys"; - version = "1.0.12"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz"; - sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="; + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz"; + sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="; }; }; "object-visit-1.0.1" = { @@ -7421,13 +7456,13 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; - "on-headers-1.0.1" = { + "on-headers-1.0.2" = { name = "on-headers"; packageName = "on-headers"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; - sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; }; "once-1.3.3" = { @@ -7453,7 +7488,7 @@ let packageName = "onetime"; version = "1.1.0"; src = fetchurl { - url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; @@ -7547,6 +7582,15 @@ let sha1 = "d0a33eefe61a205facb90092e826598d5245ce76"; }; }; + "p-each-series-1.0.0" = { + name = "p-each-series"; + packageName = "p-each-series"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz"; + sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"; + }; + }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -7574,6 +7618,15 @@ let sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; }; }; + "p-reduce-1.0.0" = { + name = "p-reduce"; + packageName = "p-reduce"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz"; + sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; + }; + }; "p-try-1.0.0" = { name = "p-try"; packageName = "p-try"; @@ -7583,15 +7636,6 @@ let sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; }; - "package-1.0.1" = { - name = "package"; - packageName = "package"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/package/-/package-1.0.1.tgz"; - sha1 = "d25a1f99e2506dcb27d6704b83dca8a312e4edcc"; - }; - }; "packet-reader-0.3.1" = { name = "packet-reader"; packageName = "packet-reader"; @@ -7628,13 +7672,13 @@ let sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; }; - "parse-entities-1.1.2" = { + "parse-entities-1.2.1" = { name = "parse-entities"; packageName = "parse-entities"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz"; - sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg=="; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.1.tgz"; + sha512 = "NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg=="; }; }; "parse-filepath-1.0.2" = { @@ -7673,6 +7717,15 @@ let sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; }; + "parse-node-version-1.0.1" = { + name = "parse-node-version"; + packageName = "parse-node-version"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"; + sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="; + }; + }; "parse-passwd-1.0.0" = { name = "parse-passwd"; packageName = "parse-passwd"; @@ -7745,13 +7798,13 @@ let sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; }; }; - "passport-oauth2-1.4.0" = { + "passport-oauth2-1.5.0" = { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; - sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; + sha512 = "kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ=="; }; }; "passport-strategy-1.0.0" = { @@ -7817,13 +7870,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-parse-1.0.5" = { + "path-parse-1.0.6" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-root-0.1.1" = { @@ -7961,15 +8014,6 @@ let sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; }; }; - "phantom-4.0.12" = { - name = "phantom"; - packageName = "phantom"; - version = "4.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/phantom/-/phantom-4.0.12.tgz"; - sha512 = "Tz82XhtPmwCk1FFPmecy7yRGZG2btpzY2KI9fcoPT7zT9det0CcMyfBFPp1S8DqzsnQnm8ZYEfdy528mwVtksA=="; - }; - }; "phantomjs-prebuilt-2.1.16" = { name = "phantomjs-prebuilt"; packageName = "phantomjs-prebuilt"; @@ -8078,6 +8122,15 @@ let sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; }; }; + "pop-iterate-1.0.1" = { + name = "pop-iterate"; + packageName = "pop-iterate"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; + sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; + }; + }; "posix-character-classes-0.1.1" = { name = "posix-character-classes"; packageName = "posix-character-classes"; @@ -8258,13 +8311,13 @@ let sha1 = "b2c6a98c0072cf91b932d1a496508114311735bf"; }; }; - "postcss-modules-extract-imports-1.2.0" = { + "postcss-modules-extract-imports-1.2.1" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz"; - sha1 = "66140ecece38ef06bf0d3e355d69bf59d141ea85"; + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz"; + sha512 = "6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw=="; }; }; "postcss-modules-local-by-default-1.2.0" = { @@ -8375,13 +8428,13 @@ let sha1 = "981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"; }; }; - "postcss-value-parser-3.3.0" = { + "postcss-value-parser-3.3.1" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"; - sha1 = "87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"; + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; + sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; "postcss-zindex-2.2.0" = { @@ -8393,13 +8446,13 @@ let sha1 = "d2109ddc055b91af67fc4cb3b025946639d2af22"; }; }; - "postgres-array-1.0.2" = { + "postgres-array-1.0.3" = { name = "postgres-array"; packageName = "postgres-array"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.2.tgz"; - sha1 = "8e0b32eb03bf77a5c0a7851e0441c169a256a238"; + url = "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.3.tgz"; + sha512 = "5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ=="; }; }; "postgres-bytea-1.0.0" = { @@ -8411,22 +8464,22 @@ let sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; }; }; - "postgres-date-1.0.3" = { + "postgres-date-1.0.4" = { name = "postgres-date"; packageName = "postgres-date"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz"; - sha1 = "e2d89702efdb258ff9d9cee0fe91bd06975257a8"; + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz"; + sha512 = "bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA=="; }; }; - "postgres-interval-1.1.2" = { + "postgres-interval-1.2.0" = { name = "postgres-interval"; packageName = "postgres-interval"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.2.tgz"; - sha512 = "fC3xNHeTskCxL1dC8KOtxXt7YeFmlbTYtn7ul8MkVERuTmf7pI4DrkAxcw3kh1fQ9uz4wQmd03a1mRiXUZChfQ=="; + url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; + sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; "precond-0.2.3" = { @@ -8537,6 +8590,15 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; + "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-7.3.1" = { name = "promise"; packageName = "promise"; @@ -8573,6 +8635,15 @@ let sha512 = "5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA=="; }; }; + "proxy-from-env-1.0.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; + sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + }; + }; "prr-1.0.1" = { name = "prr"; packageName = "prr"; @@ -8591,13 +8662,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.1.29" = { + "psl-1.1.31" = { name = "psl"; packageName = "psl"; - version = "1.1.29"; + version = "1.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz"; - sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; }; }; "pump-2.0.1" = { @@ -8645,6 +8716,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "puppeteer-1.14.0" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.14.0.tgz"; + sha512 = "SayS2wUX/8LF8Yo2Rkpc5nkAu4Jg3qu+OLTDSOZtisVQMB2Z5vjlY2TdPi/5CgZKiZroYIiyUN3sRX63El9iaw=="; + }; + }; "q-1.5.1" = { name = "q"; packageName = "q"; @@ -8654,6 +8734,15 @@ let sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; }; }; + "q-2.0.3" = { + name = "q"; + packageName = "q"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz"; + sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; + }; + }; "qs-2.3.3" = { name = "qs"; packageName = "qs"; @@ -8672,15 +8761,6 @@ let sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "qs-6.5.1" = { - name = "qs"; - packageName = "qs"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="; - }; - }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -8726,13 +8806,13 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "randomatic-3.0.0" = { + "randomatic-3.1.1" = { name = "randomatic"; packageName = "randomatic"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz"; - sha512 = "VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA=="; + url = "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz"; + sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; }; }; "range-parser-1.2.0" = { @@ -8744,15 +8824,6 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "raphael-2.1.4" = { - name = "raphael"; - packageName = "raphael"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/raphael/-/raphael-2.1.4.tgz"; - sha1 = "b09ca664ad048b814bb2ff5d4d1e75838cab9c97"; - }; - }; "raphael-2.2.7" = { name = "raphael"; packageName = "raphael"; @@ -8762,15 +8833,6 @@ let sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810"; }; }; - "raw-body-2.3.2" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; - }; - }; "raw-body-2.3.3" = { name = "raw-body"; packageName = "raw-body"; @@ -8861,13 +8923,22 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readdirp-2.1.0" = { + "readable-stream-3.3.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz"; + sha512 = "EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw=="; + }; + }; + "readdirp-2.2.1" = { name = "readdirp"; packageName = "readdirp"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"; - sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; "readline2-1.0.1" = { @@ -8942,6 +9013,15 @@ let sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; }; }; + "regenerate-unicode-properties-8.0.2" = { + name = "regenerate-unicode-properties"; + packageName = "regenerate-unicode-properties"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz"; + sha512 = "SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ=="; + }; + }; "regenerator-runtime-0.10.5" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -9005,6 +9085,15 @@ let sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240"; }; }; + "regexpu-core-4.5.4" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "4.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz"; + sha512 = "BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ=="; + }; + }; "regjsgen-0.2.0" = { name = "regjsgen"; packageName = "regjsgen"; @@ -9014,6 +9103,15 @@ let sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7"; }; }; + "regjsgen-0.5.0" = { + name = "regjsgen"; + packageName = "regjsgen"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz"; + sha512 = "RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA=="; + }; + }; "regjsparser-0.1.5" = { name = "regjsparser"; packageName = "regjsparser"; @@ -9023,6 +9121,15 @@ let sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"; }; }; + "regjsparser-0.6.0" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz"; + sha512 = "RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ=="; + }; + }; "relateurl-0.2.7" = { name = "relateurl"; packageName = "relateurl"; @@ -9032,31 +9139,22 @@ let sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; }; }; - "remark-5.1.0" = { - name = "remark"; - packageName = "remark"; - version = "5.1.0"; + "remark-frontmatter-1.3.1" = { + name = "remark-frontmatter"; + packageName = "remark-frontmatter"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz"; - sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"; + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.1.tgz"; + sha512 = "Zj/fDMYnSVgMCeKp8fXIhtMoZq4G6E1dnwfMoO8fVXrm/+oVSiN8YMREtwN2cctgK9EsnYSeS1ExX2hcX/fE1A=="; }; }; - "remark-parse-1.1.0" = { + "remark-parse-5.0.0" = { name = "remark-parse"; packageName = "remark-parse"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz"; - sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21"; - }; - }; - "remark-stringify-1.1.0" = { - name = "remark-stringify"; - packageName = "remark-stringify"; - version = "1.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz"; - sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz"; + sha512 = "b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA=="; }; }; "remarkable-1.7.1" = { @@ -9077,22 +9175,22 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "renderkid-2.0.1" = { + "renderkid-2.0.3" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz"; - sha1 = "898cabfc8bede4b7b91135a3ffd323e58c0db319"; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz"; + sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA=="; }; }; - "repeat-element-1.1.2" = { + "repeat-element-1.1.3" = { name = "repeat-element"; packageName = "repeat-element"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; - sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; }; }; "repeat-string-1.6.1" = { @@ -9122,6 +9220,15 @@ let sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; }; }; + "replace-ext-1.0.0" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz"; + sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; + }; + }; "request-2.81.0" = { name = "request"; packageName = "request"; @@ -9131,13 +9238,13 @@ let sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "request-2.87.0" = { + "request-2.88.0" = { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; "request-progress-2.0.1" = { @@ -9185,13 +9292,13 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "resolve-1.8.1" = { + "resolve-1.10.0" = { name = "resolve"; packageName = "resolve"; - version = "1.8.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; - sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz"; + sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; }; }; "resolve-dir-0.1.1" = { @@ -9275,13 +9382,13 @@ let sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; }; }; - "rimraf-2.6.2" = { + "rimraf-2.6.3" = { name = "rimraf"; packageName = "rimraf"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; }; }; "ripemd160-0.2.0" = { @@ -9293,40 +9400,40 @@ let sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce"; }; }; - "rollup-0.41.6" = { + "rollup-0.66.6" = { name = "rollup"; packageName = "rollup"; - version = "0.41.6"; + version = "0.66.6"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-0.41.6.tgz"; - sha1 = "e0d05497877a398c104d816d2733a718a7a94e2a"; + url = "https://registry.npmjs.org/rollup/-/rollup-0.66.6.tgz"; + sha512 = "J7/SWanrcb83vfIHqa8+aVVGzy457GcjA6GVZEnD0x2u4OnOd0Q1pCrEoNe8yLwM6z6LZP02zBT2uW0yh5TqOw=="; }; }; - "rollup-plugin-buble-0.15.0" = { + "rollup-plugin-buble-0.19.6" = { name = "rollup-plugin-buble"; packageName = "rollup-plugin-buble"; - version = "0.15.0"; + version = "0.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-buble/-/rollup-plugin-buble-0.15.0.tgz"; - sha1 = "83c3e89c7fd2266c7918f41ba3980313519c7fd0"; + url = "https://registry.npmjs.org/rollup-plugin-buble/-/rollup-plugin-buble-0.19.6.tgz"; + sha512 = "El5Fut4/wEO17ZN/n9BZvqd7DXXB2WbJr/DKvr89LXChC/cHllE0XwiUDeAalrTkgr0WrnyLDTCQvEv+cGywWQ=="; }; }; - "rollup-pluginutils-1.5.2" = { + "rollup-pluginutils-2.6.0" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; - version = "1.5.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz"; - sha1 = "1e156e778f94b7255bfa1b3d0178be8f5c552408"; + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz"; + sha512 = "aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ=="; }; }; - "rollup-watch-3.2.2" = { + "rollup-watch-4.3.1" = { name = "rollup-watch"; packageName = "rollup-watch"; - version = "3.2.2"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-watch/-/rollup-watch-3.2.2.tgz"; - sha1 = "5e574232e9ef36da9177f46946d8080cb267354b"; + url = "https://registry.npmjs.org/rollup-watch/-/rollup-watch-4.3.1.tgz"; + sha512 = "6yjnIwfjpSrqA8IafyIu7fsEyeImNR4aDjA1bQ7KWeVuiA+Clfsx8+PGQkyABWIQzmauQ//tIJ5wAxLXsXs8qQ=="; }; }; "run-async-0.1.0" = { @@ -9365,15 +9472,6 @@ let sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; }; }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="; - }; - }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -9455,15 +9553,6 @@ let sha1 = "6ce03f54a090b668e3cbedbf20edf9e310593e72"; }; }; - "schema-utils-0.4.5" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz"; - sha512 = "yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA=="; - }; - }; "select-1.1.2" = { name = "select"; packageName = "select"; @@ -9491,13 +9580,13 @@ let sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; }; }; - "semver-5.5.0" = { + "semver-5.7.0" = { name = "semver"; packageName = "semver"; - version = "5.5.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; - sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; }; }; "send-0.16.2" = { @@ -9518,13 +9607,13 @@ let sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; }; }; - "serialize-javascript-1.5.0" = { + "serialize-javascript-1.6.1" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz"; - sha512 = "Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz"; + sha512 = "A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw=="; }; }; "series-stream-1.0.1" = { @@ -9554,15 +9643,6 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "set-immediate-shim-1.0.1" = { - name = "set-immediate-shim"; - packageName = "set-immediate-shim"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; - sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; - }; - }; "set-value-0.4.3" = { name = "set-value"; packageName = "set-value"; @@ -9590,15 +9670,6 @@ let sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; - "setprototypeof-1.0.3" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; - }; - }; "setprototypeof-1.1.0" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -9779,15 +9850,6 @@ let sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106"; }; }; - "source-list-map-2.0.0" = { - name = "source-list-map"; - packageName = "source-list-map"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"; - sha512 = "I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A=="; - }; - }; "source-map-0.4.4" = { name = "source-map"; packageName = "source-map"; @@ -9842,6 +9904,15 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; + "sourcemap-codec-1.4.4" = { + name = "sourcemap-codec"; + packageName = "sourcemap-codec"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz"; + sha512 = "CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg=="; + }; + }; "sparkles-1.0.1" = { name = "sparkles"; packageName = "sparkles"; @@ -9851,22 +9922,22 @@ let sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="; }; }; - "spdx-correct-3.0.0" = { + "spdx-correct-3.1.0" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; - sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; }; - "spdx-exceptions-2.1.0" = { + "spdx-exceptions-2.2.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; - sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -9878,13 +9949,13 @@ let sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; }; }; - "spdx-license-ids-3.0.0" = { + "spdx-license-ids-3.0.4" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.0"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; - sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz"; + sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="; }; }; "split-1.0.1" = { @@ -9923,13 +9994,13 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; - "sprintf-js-1.1.1" = { + "sprintf-js-1.1.2" = { name = "sprintf-js"; packageName = "sprintf-js"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz"; - sha1 = "36be78320afe5801f6cea3ee78b6e5aab940ea0c"; + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; "sqlstring-2.3.1" = { @@ -9941,13 +10012,13 @@ let sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40"; }; }; - "sshpk-1.14.2" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "ssri-5.3.0" = { @@ -9977,6 +10048,15 @@ let sha1 = "e0e86959ea0786425d3383e40c1bf70d2f985579"; }; }; + "state-toggle-1.0.1" = { + name = "state-toggle"; + packageName = "state-toggle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.1.tgz"; + sha512 = "Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og=="; + }; + }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -10004,13 +10084,13 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; - "stream-browserify-2.0.1" = { + "stream-browserify-2.0.2" = { name = "stream-browserify"; packageName = "stream-browserify"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; - sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; "stream-consume-0.1.1" = { @@ -10067,13 +10147,13 @@ let sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; }; }; - "string-natural-compare-2.0.2" = { + "string-natural-compare-2.0.3" = { name = "string-natural-compare"; packageName = "string-natural-compare"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-2.0.2.tgz"; - sha1 = "c5ce4e278ab5d1265ae6fc55435aeb7b76fcb001"; + url = "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-2.0.3.tgz"; + sha512 = "4Kcl12rNjc+6EKhY8QyDVuQTAlMWwRiNbsxnVwBUKFr7dYPQuXVrtNU4sEkjF9LHY0AY6uVbB3ktbkIH4LC+BQ=="; }; }; "string-width-1.0.2" = { @@ -10112,13 +10192,13 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "stringify-entities-1.3.2" = { - name = "stringify-entities"; - packageName = "stringify-entities"; - version = "1.3.2"; + "string_decoder-1.2.0" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz"; - sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A=="; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"; + sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w=="; }; }; "stringstream-0.0.6" = { @@ -10238,13 +10318,13 @@ let sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; - "supports-color-5.4.0" = { + "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; - sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; "svgo-0.7.2" = { @@ -10283,22 +10363,22 @@ let sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; }; }; - "tar-4.4.6" = { + "tar-4.4.8" = { name = "tar"; packageName = "tar"; - version = "4.4.6"; + version = "4.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz"; - sha512 = "tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz"; + sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ=="; }; }; - "tar-stream-1.6.1" = { + "tar-stream-1.6.2" = { name = "tar-stream"; packageName = "tar-stream"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz"; - sha512 = "IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA=="; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz"; + sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; }; }; "taskgroup-4.3.1" = { @@ -10310,15 +10390,6 @@ let sha1 = "7de193febd768273c457730497024d512c27915a"; }; }; - "temporary-0.0.8" = { - name = "temporary"; - packageName = "temporary"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/temporary/-/temporary-0.0.8.tgz"; - sha1 = "a18a981d28ba8ca36027fb3c30538c3ecb740ac0"; - }; - }; "terraformer-1.0.9" = { name = "terraformer"; packageName = "terraformer"; @@ -10373,13 +10444,13 @@ let sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; }; }; - "through2-2.0.3" = { + "through2-2.0.5" = { name = "through2"; packageName = "through2"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; "tildify-1.2.0" = { @@ -10409,22 +10480,22 @@ let sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg=="; }; }; - "timers-ext-0.1.5" = { + "timers-ext-0.1.7" = { name = "timers-ext"; packageName = "timers-ext"; - version = "0.1.5"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz"; - sha512 = "tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg=="; + url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz"; + sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; - "tiny-emitter-2.0.2" = { + "tiny-emitter-2.1.0" = { name = "tiny-emitter"; packageName = "tiny-emitter"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz"; - sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="; + url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; + sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; }; }; "tmp-0.0.29" = { @@ -10544,6 +10615,15 @@ let sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; + "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=="; + }; + }; "tr46-0.0.3" = { name = "tr46"; packageName = "tr46"; @@ -10589,13 +10669,13 @@ let sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; }; }; - "trough-1.0.2" = { + "trough-1.0.3" = { name = "trough"; packageName = "trough"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz"; - sha512 = "FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ=="; + url = "https://registry.npmjs.org/trough/-/trough-1.0.3.tgz"; + sha512 = "fwkLWH+DimvA4YCy+/nvJd61nWQQ2liO/nF/RjkTpiOGi+zxZzVkhb1mvbHIIW4b/8nDsYI8uTmAlc0nNkRMOw=="; }; }; "tty-browserify-0.0.0" = { @@ -10661,13 +10741,13 @@ let sha1 = "d1c2093a54ff8a19f58cff877eeaa54f2242d383"; }; }; - "typechecker-4.5.0" = { + "typechecker-4.7.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.5.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz"; - sha512 = "bqPE/ck3bVIaXP7gMKTKSHrypT32lpYTpiqzPYeYzdSQnmaGvaGhy7TnN/M/+5R+2rs/kKcp9ZLPRp/Q9Yj+4w=="; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.7.0.tgz"; + sha512 = "4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ=="; }; }; "typedarray-0.0.6" = { @@ -10679,22 +10759,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "uc.micro-1.0.5" = { + "uc.micro-1.0.6" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz"; - sha512 = "JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg=="; - }; - }; - "uglify-es-3.3.10" = { - name = "uglify-es"; - packageName = "uglify-es"; - version = "3.3.10"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz"; - sha512 = "rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww=="; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz"; + sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; "uglify-js-2.7.5" = { @@ -10715,13 +10786,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.4.6" = { + "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.6"; + version = "3.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz"; - sha512 = "O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz"; + sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; + }; + }; + "uglify-js-3.5.3" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.3.tgz"; + sha512 = "rIQPT2UMDnk4jRX+w4WO84/pebU2jiLsjgIyrCktYgSvx28enOE3iYQMr+BD1rHiitWnDmpu0cY/LfIEpKcjcw=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -10778,15 +10858,6 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - }; "underscore-1.6.0" = { name = "underscore"; packageName = "underscore"; @@ -10841,22 +10912,49 @@ let sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g=="; }; }; - "unicode-5.2.0-0.7.5" = { - name = "unicode-5.2.0"; - packageName = "unicode-5.2.0"; - version = "0.7.5"; + "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.1.0" = { + name = "unicode-match-property-value-ecmascript"; + packageName = "unicode-match-property-value-ecmascript"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-5.2.0/-/unicode-5.2.0-0.7.5.tgz"; - sha512 = "KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; + sha512 = "hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g=="; }; }; - "unified-4.2.1" = { + "unicode-property-aliases-ecmascript-1.0.5" = { + name = "unicode-property-aliases-ecmascript"; + packageName = "unicode-property-aliases-ecmascript"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; + sha512 = "L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="; + }; + }; + "unified-6.2.0" = { name = "unified"; packageName = "unified"; - version = "4.2.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz"; - sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e"; + url = "https://registry.npmjs.org/unified/-/unified-6.2.0.tgz"; + sha512 = "1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA=="; }; }; "union-value-1.0.0" = { @@ -10886,22 +10984,22 @@ let sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; }; }; - "unique-filename-1.1.0" = { + "unique-filename-1.1.1" = { name = "unique-filename"; packageName = "unique-filename"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz"; - sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; - "unique-slug-2.0.0" = { + "unique-slug-2.0.1" = { name = "unique-slug"; packageName = "unique-slug"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz"; - sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz"; + sha512 = "n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg=="; }; }; "unique-stream-1.0.0" = { @@ -10931,6 +11029,15 @@ let sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q=="; }; }; + "unist-util-stringify-position-1.1.2" = { + name = "unist-util-stringify-position"; + packageName = "unist-util-stringify-position"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz"; + sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="; + }; + }; "unist-util-visit-1.4.0" = { name = "unist-util-visit"; packageName = "unist-util-visit"; @@ -11093,15 +11200,6 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "utila-0.3.3" = { - name = "utila"; - packageName = "utila"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz"; - sha1 = "d7e8e7d7e309107092b05f8d9688824d633a4226"; - }; - }; "utila-0.4.0" = { name = "utila"; packageName = "utila"; @@ -11120,15 +11218,6 @@ let sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "uuid-3.1.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"; - sha512 = "DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="; - }; - }; "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; @@ -11156,13 +11245,13 @@ let sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; }; }; - "validate-npm-package-license-3.0.3" = { + "validate-npm-package-license-3.0.4" = { name = "validate-npm-package-license"; packageName = "validate-npm-package-license"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; - sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g=="; + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "validator-5.7.0" = { @@ -11228,22 +11317,31 @@ let sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; }; }; - "vfile-1.4.0" = { + "vfile-2.3.0" = { name = "vfile"; packageName = "vfile"; - version = "1.4.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz"; - sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; + url = "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz"; + sha512 = "ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w=="; }; }; - "vfile-location-2.0.3" = { + "vfile-location-2.0.4" = { name = "vfile-location"; packageName = "vfile-location"; - version = "2.0.3"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.4.tgz"; + sha512 = "KRL5uXQPoUKu+NGvQVL4XLORw45W62v4U4gxJ3vRlDfI9QsT4ZN1PNXn/zQpKUulqGDpYuT0XDfp5q9O87/y/w=="; + }; + }; + "vfile-message-1.1.1" = { + name = "vfile-message"; + packageName = "vfile-message"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz"; - sha512 = "zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz"; + sha512 = "1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA=="; }; }; "vinyl-0.4.6" = { @@ -11273,15 +11371,6 @@ let sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; }; }; - "vlq-0.2.3" = { - name = "vlq"; - packageName = "vlq"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz"; - sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="; - }; - }; "vm-browserify-0.0.4" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -11318,6 +11407,15 @@ let sha1 = "d74847bb4d6f90f61fe2c74f9f68662aa0e07601"; }; }; + "weak-map-1.0.5" = { + name = "weak-map"; + packageName = "weak-map"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; + sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -11354,22 +11452,13 @@ let sha1 = "aa1f3abf0f0d74db7111c40e500b84f966640750"; }; }; - "webpack-sources-1.1.0" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz"; - sha512 = "aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw=="; - }; - }; - "whatwg-encoding-1.0.3" = { + "whatwg-encoding-1.0.5" = { name = "whatwg-encoding"; packageName = "whatwg-encoding"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz"; - sha512 = "jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw=="; + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; "whatwg-url-4.8.0" = { @@ -11426,15 +11515,6 @@ let sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; }; }; - "winston-2.4.3" = { - name = "winston"; - packageName = "winston"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz"; - sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw=="; - }; - }; "wkx-0.2.0" = { name = "wkx"; packageName = "wkx"; @@ -11471,15 +11551,6 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "worker-farm-1.6.0" = { - name = "worker-farm"; - packageName = "worker-farm"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz"; - sha512 = "6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ=="; - }; - }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -11516,6 +11587,24 @@ let sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; + "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=="; + }; + }; + "x-is-string-0.1.0" = { + name = "x-is-string"; + packageName = "x-is-string"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz"; + sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; + }; + }; "x-xss-protection-1.1.0" = { name = "x-xss-protection"; packageName = "x-xss-protection"; @@ -11579,15 +11668,6 @@ let sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q=="; }; }; - "xmlbuilder-0.4.3" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; - sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; - }; - }; "xmlbuilder-9.0.7" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -11705,13 +11785,13 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "yallist-3.0.2" = { + "yallist-3.0.3" = { name = "yallist"; packageName = "yallist"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz"; - sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"; + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"; + sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; }; }; "yargs-3.10.0" = { @@ -11771,108 +11851,22 @@ let }; in { - "uglifyjs-webpack-plugin-^1.2.7" = nodeEnv.buildNodePackage { - name = "uglifyjs-webpack-plugin"; - packageName = "uglifyjs-webpack-plugin"; - version = "1.2.7"; + "eve-^0.5.4" = nodeEnv.buildNodePackage { + name = "eve"; + packageName = "eve"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz"; - sha512 = "1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA=="; + url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz"; + sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; }; - dependencies = [ - sources."ajv-6.5.2" - sources."ajv-keywords-3.2.0" - sources."aproba-1.2.0" - sources."balanced-match-1.0.0" - sources."bluebird-3.5.1" - sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" - sources."cacache-10.0.4" - sources."chownr-1.0.1" - sources."commander-2.14.1" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."copy-concurrently-1.0.5" - sources."core-util-is-1.0.2" - sources."cyclist-0.2.2" - sources."duplexify-3.6.0" - sources."end-of-stream-1.4.1" - sources."errno-0.1.7" - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" - sources."find-cache-dir-1.0.0" - sources."find-up-2.1.0" - sources."flush-write-stream-1.0.3" - sources."from2-2.3.0" - sources."fs-write-stream-atomic-1.0.10" - sources."fs.realpath-1.0.0" - sources."glob-7.1.2" - sources."graceful-fs-4.1.11" - sources."iferr-0.1.5" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."json-schema-traverse-0.4.1" - sources."locate-path-2.0.0" - sources."lru-cache-4.1.3" - sources."make-dir-1.3.0" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mississippi-2.0.0" - sources."mkdirp-0.5.1" - sources."move-concurrently-1.0.1" - sources."once-1.4.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parallel-transform-1.1.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."pify-3.0.0" - sources."pkg-dir-2.0.0" - sources."process-nextick-args-2.0.0" - sources."promise-inflight-1.0.1" - sources."prr-1.0.1" - sources."pseudomap-1.0.2" - sources."pump-2.0.1" - sources."pumpify-1.5.1" - sources."punycode-2.1.1" - sources."readable-stream-2.3.6" - sources."rimraf-2.6.2" - sources."run-queue-1.0.3" - sources."safe-buffer-5.1.2" - sources."schema-utils-0.4.5" - sources."serialize-javascript-1.5.0" - sources."source-list-map-2.0.0" - sources."source-map-0.6.1" - sources."ssri-5.3.0" - sources."stream-each-1.2.3" - sources."stream-shift-1.0.0" - sources."string_decoder-1.1.1" - sources."through2-2.0.3" - sources."typedarray-0.0.6" - sources."uglify-es-3.3.10" - sources."unique-filename-1.1.0" - sources."unique-slug-2.0.0" - sources."uri-js-4.2.2" - sources."util-deprecate-1.0.2" - sources."webpack-sources-1.1.0" - sources."worker-farm-1.6.0" - sources."wrappy-1.0.2" - sources."xtend-4.0.1" - sources."y18n-4.0.0" - sources."yallist-2.1.2" - ]; buildInputs = globalBuildInputs; meta = { - description = "UglifyJS plugin for webpack"; - homepage = https://github.com/webpack-contrib/uglifyjs-webpack-plugin; - license = "MIT"; + description = "Simple custom events"; + homepage = "https://github.com/adobe-webplatform/eve#readme"; + license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "babel-cli-^6.18.0" = nodeEnv.buildNodePackage { name = "babel-cli"; @@ -11888,8 +11882,11 @@ in sources."anymatch-1.3.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-unique-0.2.1" - sources."async-each-1.0.1" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.2" + sources."atob-2.1.2" sources."babel-code-frame-6.26.0" sources."babel-core-6.26.3" sources."babel-generator-6.26.1" @@ -11907,42 +11904,117 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."balanced-match-1.0.0" - sources."binary-extensions-1.11.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."binary-extensions-1.13.1" sources."brace-expansion-1.1.11" sources."braces-1.8.5" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."chalk-1.1.3" sources."chokidar-1.7.0" - sources."commander-2.16.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."collection-visit-1.0.0" + sources."commander-2.20.0" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."convert-source-map-1.5.1" - sources."core-js-2.5.7" + sources."convert-source-map-1.6.0" + sources."copy-descriptor-0.1.1" + sources."core-js-2.6.5" sources."core-util-is-1.0.2" sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."detect-indent-4.0.0" sources."escape-string-regexp-1.0.5" sources."esutils-2.0.2" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."extglob-0.3.2" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."for-in-1.0.2" sources."for-own-0.1.5" + sources."fragment-cache-0.2.1" sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.4" - sources."glob-7.1.2" + sources."fsevents-1.2.7" + sources."get-value-2.0.6" + sources."glob-7.1.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."globals-9.18.0" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."has-ansi-2.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."home-or-tmp-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."invariant-2.2.4" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -11950,60 +12022,233 @@ in sources."is-finite-1.0.2" sources."is-glob-2.0.1" sources."is-number-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-2.1.0" sources."js-tokens-3.0.2" sources."jsesc-1.3.0" sources."json5-0.5.1" sources."kind-of-3.2.2" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."loose-envify-1.4.0" - sources."math-random-1.0.1" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."math-random-1.0.4" sources."micromatch-2.3.11" sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."nan-2.10.0" + sources."nan-2.13.2" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) sources."normalize-path-2.1.1" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."output-file-sync-1.1.2" sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" + sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."private-0.1.8" sources."process-nextick-args-2.0.0" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" ]; }) sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regenerator-runtime-0.10.5" sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.2" + sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."repeating-2.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."safe-buffer-5.1.2" - sources."set-immediate-shim-1.0.1" + sources."safe-regex-1.1.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."slash-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" sources."source-map-support-0.4.18" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."to-fast-properties-1.0.3" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) sources."trim-right-1.0.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (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."isobject-3.0.1" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."v8flags-2.1.1" @@ -12016,7 +12261,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "babel-core-^6.21.0" = nodeEnv.buildNodePackage { name = "babel-core"; @@ -12044,8 +12289,8 @@ in sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."concat-map-0.0.1" - sources."convert-source-map-1.5.1" - sources."core-js-2.5.7" + sources."convert-source-map-1.6.0" + sources."core-js-2.6.5" sources."debug-2.6.9" sources."detect-indent-4.0.0" sources."escape-string-regexp-1.0.5" @@ -12058,7 +12303,7 @@ in sources."js-tokens-3.0.2" sources."jsesc-1.3.0" sources."json5-0.5.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."loose-envify-1.4.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -12071,6 +12316,7 @@ in sources."private-0.1.8" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" + sources."safe-buffer-5.1.2" sources."slash-1.0.0" sources."source-map-0.5.7" sources."source-map-support-0.4.18" @@ -12086,7 +12332,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "babel-loader-^6.2.10" = nodeEnv.buildNodePackage { name = "babel-loader"; @@ -12119,7 +12365,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "babel-plugin-transform-runtime-^6.15.0" = nodeEnv.buildNodePackage { name = "babel-plugin-transform-runtime"; @@ -12131,7 +12377,7 @@ in }; dependencies = [ sources."babel-runtime-6.26.0" - sources."core-js-2.5.7" + sources."core-js-2.6.5" sources."regenerator-runtime-0.11.1" ]; buildInputs = globalBuildInputs; @@ -12140,7 +12386,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "babel-polyfill-^6.22.0" = nodeEnv.buildNodePackage { name = "babel-polyfill"; @@ -12156,7 +12402,7 @@ in sources."regenerator-runtime-0.11.1" ]; }) - sources."core-js-2.5.7" + sources."core-js-2.6.5" sources."regenerator-runtime-0.10.5" ]; buildInputs = globalBuildInputs; @@ -12166,7 +12412,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "babel-preset-es2015-^6.18.0" = nodeEnv.buildNodePackage { name = "babel-preset-es2015"; @@ -12220,7 +12466,7 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."chalk-1.1.3" - sources."core-js-2.5.7" + sources."core-js-2.6.5" sources."debug-2.6.9" sources."escape-string-regexp-1.0.5" sources."esutils-2.0.2" @@ -12229,7 +12475,7 @@ in sources."invariant-2.2.4" sources."js-tokens-3.0.2" sources."jsesc-0.5.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."loose-envify-1.4.0" sources."ms-2.0.0" sources."private-0.1.8" @@ -12250,7 +12496,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "babel-runtime-^6.20.0" = nodeEnv.buildNodePackage { name = "babel-runtime"; @@ -12261,7 +12507,7 @@ in sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; }; dependencies = [ - sources."core-js-2.5.7" + sources."core-js-2.6.5" sources."regenerator-runtime-0.11.1" ]; buildInputs = globalBuildInputs; @@ -12270,59 +12516,62 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "copy-webpack-plugin-^4.0.1" = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "4.5.2"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz"; - sha512 = "zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz"; + sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA=="; }; dependencies = [ sources."aproba-1.2.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" - sources."arrify-1.0.1" sources."balanced-match-1.0.0" - sources."big.js-3.2.0" - sources."bluebird-3.5.1" + sources."big.js-5.2.2" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."cacache-10.0.4" - sources."chownr-1.0.1" + sources."chownr-1.1.1" sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."copy-concurrently-1.0.5" sources."core-util-is-1.0.2" sources."cyclist-0.2.2" - sources."dir-glob-2.0.0" - sources."duplexify-3.6.0" + sources."dir-glob-2.2.2" + sources."duplexify-3.7.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" sources."find-cache-dir-1.0.0" sources."find-up-2.1.0" - sources."flush-write-stream-1.0.3" + sources."flush-write-stream-1.1.1" sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."globby-7.1.1" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."iferr-0.1.5" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" + sources."is-glob-4.0.1" sources."isarray-1.0.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + (sources."json5-1.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."loader-utils-1.2.3" sources."locate-path-2.0.0" - sources."lru-cache-4.1.3" + sources."lru-cache-4.1.5" sources."make-dir-1.3.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -12345,19 +12594,19 @@ in sources."pump-2.0.1" sources."pumpify-1.5.1" sources."readable-stream-2.3.6" - sources."rimraf-2.6.2" + sources."rimraf-2.6.3" sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" - sources."serialize-javascript-1.5.0" + sources."serialize-javascript-1.6.1" sources."slash-1.0.0" sources."ssri-5.3.0" sources."stream-each-1.2.3" sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."typedarray-0.0.6" - sources."unique-filename-1.1.0" - sources."unique-slug-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.1" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" sources."xtend-4.0.1" @@ -12371,7 +12620,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "css-loader-^0.26.1" = nodeEnv.buildNodePackage { name = "css-loader"; @@ -12389,50 +12638,54 @@ in sources."autoprefixer-6.7.7" sources."babel-code-frame-6.26.0" sources."balanced-match-0.4.2" - sources."big.js-3.2.0" + sources."big.js-5.2.2" sources."browserslist-1.7.7" sources."caniuse-api-1.6.1" - sources."caniuse-db-1.0.30000874" + sources."caniuse-db-1.0.30000957" sources."chalk-1.1.3" sources."clap-1.2.3" sources."clone-1.0.4" sources."coa-1.0.4" sources."color-0.11.4" - sources."color-convert-1.9.2" - sources."color-name-1.1.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-0.3.0" sources."colormin-1.1.2" sources."colors-1.1.2" sources."css-color-names-0.0.4" - sources."css-selector-tokenizer-0.7.0" + sources."css-selector-tokenizer-0.7.1" sources."cssesc-0.1.0" sources."cssnano-3.10.0" sources."csso-2.3.2" sources."decamelize-1.2.0" sources."defined-1.0.0" - sources."electron-to-chromium-1.3.55" + sources."electron-to-chromium-1.3.124" sources."emojis-list-2.1.0" sources."escape-string-regexp-1.0.5" sources."esprima-2.7.3" sources."esutils-2.0.2" - sources."fastparse-1.1.1" + sources."fastparse-1.1.2" sources."flatten-1.0.2" sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-1.0.0" - sources."html-comment-regex-1.1.1" + sources."html-comment-regex-1.1.2" sources."icss-replace-symbols-1.1.0" sources."indexes-of-1.0.1" sources."is-absolute-url-2.1.0" sources."is-plain-obj-1.1.0" sources."is-svg-2.1.0" - sources."js-base64-2.4.8" + sources."js-base64-2.5.1" sources."js-tokens-3.0.2" sources."js-yaml-3.7.0" sources."jsesc-0.5.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + (sources."json5-1.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."loader-utils-1.2.3" sources."lodash.camelcase-4.3.0" sources."lodash.memoize-4.1.2" sources."lodash.uniq-4.5.0" @@ -12465,44 +12718,44 @@ in sources."postcss-minify-gradients-1.0.5" sources."postcss-minify-params-1.2.2" sources."postcss-minify-selectors-2.1.1" - (sources."postcss-modules-extract-imports-1.2.0" // { + (sources."postcss-modules-extract-imports-1.2.1" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" + sources."chalk-2.4.2" sources."has-flag-3.0.0" sources."postcss-6.0.23" sources."source-map-0.6.1" - sources."supports-color-5.4.0" + sources."supports-color-5.5.0" ]; }) (sources."postcss-modules-local-by-default-1.2.0" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" + sources."chalk-2.4.2" sources."has-flag-3.0.0" sources."postcss-6.0.23" sources."source-map-0.6.1" - sources."supports-color-5.4.0" + sources."supports-color-5.5.0" ]; }) (sources."postcss-modules-scope-1.1.0" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" + sources."chalk-2.4.2" sources."has-flag-3.0.0" sources."postcss-6.0.23" sources."source-map-0.6.1" - sources."supports-color-5.4.0" + sources."supports-color-5.5.0" ]; }) (sources."postcss-modules-values-1.3.0" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.4.1" + sources."chalk-2.4.2" sources."has-flag-3.0.0" sources."postcss-6.0.23" sources."source-map-0.6.1" - sources."supports-color-5.4.0" + sources."supports-color-5.5.0" ]; }) sources."postcss-normalize-charset-1.1.1" @@ -12514,7 +12767,7 @@ in sources."postcss-selector-parser-2.2.3" sources."postcss-svgo-2.1.6" sources."postcss-unique-selectors-2.0.2" - sources."postcss-value-parser-3.3.0" + sources."postcss-value-parser-3.3.1" sources."postcss-zindex-2.2.0" sources."prepend-http-1.0.4" sources."q-1.5.1" @@ -12546,81 +12799,80 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "doctoc-^1.3.0" = nodeEnv.buildNodePackage { name = "doctoc"; packageName = "doctoc"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.1.tgz"; - sha1 = "f012e3603e3156254c2ef22ac88c7190f55426ba"; + url = "https://registry.npmjs.org/doctoc/-/doctoc-1.4.0.tgz"; + sha512 = "8IAq3KdMkxhXCUF+xdZxdJxwuz8N2j25sMgqiu4U4JWluN9tRKMlAalxGASszQjlZaBprdD2YfXpL3VPWUD4eg=="; }; dependencies = [ + sources."@textlint/ast-node-types-4.2.1" + sources."@textlint/markdown-to-ast-6.0.9" sources."anchor-markdown-header-0.5.7" sources."bail-1.0.3" sources."boundary-1.0.1" - sources."ccount-1.0.3" sources."character-entities-1.2.2" - sources."character-entities-html4-1.1.2" sources."character-entities-legacy-1.1.2" sources."character-reference-invalid-1.1.2" sources."collapse-white-space-1.0.4" sources."core-util-is-1.0.2" sources."debug-2.6.9" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."emoji-regex-6.1.3" - sources."entities-1.1.1" + sources."entities-1.1.2" sources."extend-3.0.2" - sources."function-bind-1.1.1" - sources."has-1.0.3" + sources."fault-1.0.2" + sources."format-0.2.2" sources."htmlparser2-3.9.2" sources."inherits-2.0.3" sources."is-alphabetical-1.0.2" sources."is-alphanumerical-1.0.2" + sources."is-buffer-1.1.6" sources."is-decimal-1.0.2" sources."is-hexadecimal-1.0.2" + sources."is-plain-obj-1.1.0" + sources."is-whitespace-character-1.0.2" + sources."is-word-character-1.0.2" sources."isarray-1.0.0" - sources."longest-streak-1.0.0" - sources."markdown-table-0.4.0" - sources."markdown-to-ast-3.4.0" + sources."markdown-escapes-1.0.2" sources."minimist-1.2.0" sources."ms-2.0.0" - sources."once-1.4.0" - sources."parse-entities-1.1.2" + sources."parse-entities-1.2.1" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" - sources."remark-5.1.0" - sources."remark-parse-1.1.0" - sources."remark-stringify-1.1.0" + sources."remark-frontmatter-1.3.1" + sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" sources."safe-buffer-5.1.2" + sources."state-toggle-1.0.1" sources."string_decoder-1.1.1" - sources."stringify-entities-1.3.2" sources."structured-source-3.0.2" sources."traverse-0.6.6" sources."trim-0.0.1" sources."trim-trailing-lines-1.1.1" - sources."trough-1.0.2" + sources."trough-1.0.3" sources."underscore-1.8.3" sources."unherit-1.1.1" - sources."unified-4.2.1" + sources."unified-6.2.0" sources."unist-util-is-2.1.2" sources."unist-util-remove-position-1.1.2" + sources."unist-util-stringify-position-1.1.2" sources."unist-util-visit-1.4.0" sources."unist-util-visit-parents-2.0.1" sources."update-section-0.3.3" sources."util-deprecate-1.0.2" - sources."vfile-1.4.0" - sources."vfile-location-2.0.3" - sources."wrappy-1.0.2" + sources."vfile-2.3.0" + sources."vfile-location-2.0.4" + sources."vfile-message-1.1.1" + sources."x-is-string-0.1.0" sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; @@ -12630,32 +12882,32 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "ejs-loader-^0.3.0" = nodeEnv.buildNodePackage { name = "ejs-loader"; packageName = "ejs-loader"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.3.1.tgz"; - sha512 = "bdJHTxBY3uqZ6L5V1WRohf1gr7ousgESpArPVseEQCWCATs+M8BRqxyJWqnFo+h815gTA++g5LyAyqS5OTIfdQ=="; + url = "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.3.3.tgz"; + sha512 = "1pQNFYu+4VIeLLNrSZ8QaiyFk9oXv8koUyQ2Pz5k0dw89HHjeiliTPQ46GfqAzCqJ8cEq8QFNj/HsVjyIuzKEA=="; }; dependencies = [ sources."big.js-3.2.0" sources."emojis-list-2.1.0" sources."json5-0.5.1" sources."loader-utils-0.2.17" - sources."lodash-3.10.1" + sources."lodash-4.17.11" sources."object-assign-4.1.1" ]; buildInputs = globalBuildInputs; meta = { description = "EJS (Underscore/LoDash Templates) loader for webpack"; - homepage = https://github.com/okonet/ejs-loader; + homepage = https://github.com/difelice/ejs-loader; license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "exports-loader-^0.6.3" = nodeEnv.buildNodePackage { name = "exports-loader"; @@ -12666,10 +12918,11 @@ in sha1 = "d70fc6121975b35fc12830cf52754be2740fc886"; }; dependencies = [ - sources."big.js-3.2.0" + sources."big.js-5.2.2" sources."emojis-list-2.1.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" + sources."minimist-1.2.0" sources."source-map-0.5.7" ]; buildInputs = globalBuildInputs; @@ -12678,7 +12931,7 @@ in homepage = "https://github.com/webpack/exports-loader#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; "expose-^0.1.4" = nodeEnv.buildNodePackage { name = "expose"; @@ -12694,7 +12947,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "expose-loader-^0.7.1" = nodeEnv.buildNodePackage { name = "expose-loader"; @@ -12711,7 +12964,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "extract-text-webpack-plugin-^1.0.1" = nodeEnv.buildNodePackage { name = "extract-text-webpack-plugin"; @@ -12739,7 +12992,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "file-loader-^0.9.0" = nodeEnv.buildNodePackage { name = "file-loader"; @@ -12763,7 +13016,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "html-webpack-plugin-^2.25.0" = nodeEnv.buildNodePackage { name = "html-webpack-plugin"; @@ -12776,64 +13029,48 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."big.js-3.2.0" - sources."bluebird-3.5.1" + sources."bluebird-3.5.4" sources."boolbase-1.0.0" sources."camel-case-3.0.0" - sources."clean-css-4.1.11" - sources."commander-2.16.0" - sources."core-util-is-1.0.2" + sources."clean-css-4.2.1" + sources."commander-2.17.1" sources."css-select-1.2.0" - sources."css-what-2.1.0" - (sources."dom-converter-0.1.4" // { - dependencies = [ - sources."utila-0.3.3" - ]; - }) - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.0" - sources."domhandler-2.1.0" + sources."css-what-2.1.3" + sources."dom-converter-0.2.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" sources."domutils-1.5.1" sources."emojis-list-2.1.0" - sources."entities-1.1.1" - sources."he-1.1.1" - sources."html-minifier-3.5.19" - (sources."htmlparser2-3.3.0" // { - dependencies = [ - sources."domutils-1.1.6" - ]; - }) + sources."entities-1.1.2" + sources."he-1.2.0" + sources."html-minifier-3.5.21" + sources."htmlparser2-3.10.1" sources."inherits-2.0.3" - sources."isarray-0.0.1" sources."json5-0.5.1" sources."loader-utils-0.2.17" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lower-case-1.1.4" sources."no-case-2.3.2" - sources."nth-check-1.0.1" + sources."nth-check-1.0.2" sources."object-assign-4.1.1" sources."param-case-2.1.1" sources."pretty-error-2.1.1" - sources."readable-stream-1.0.34" + sources."readable-stream-3.3.0" sources."relateurl-0.2.7" - (sources."renderkid-2.0.1" // { - dependencies = [ - sources."utila-0.3.3" - ]; - }) - sources."source-map-0.5.7" - sources."string_decoder-0.10.31" + sources."renderkid-2.0.3" + sources."safe-buffer-5.1.2" + sources."source-map-0.6.1" + sources."string_decoder-1.2.0" sources."strip-ansi-3.0.1" sources."toposort-1.0.7" - (sources."uglify-js-3.4.6" // { + (sources."uglify-js-3.4.10" // { dependencies = [ - sources."source-map-0.6.1" + sources."commander-2.19.0" ]; }) sources."upper-case-1.1.3" + sources."util-deprecate-1.0.2" sources."utila-0.4.0" ]; buildInputs = globalBuildInputs; @@ -12843,7 +13080,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "imports-loader-^0.7.0" = nodeEnv.buildNodePackage { name = "imports-loader"; @@ -12854,10 +13091,11 @@ in sha1 = "f204b5f34702a32c1db7d48d89d5e867a0441253"; }; dependencies = [ - sources."big.js-3.2.0" + sources."big.js-5.2.2" sources."emojis-list-2.1.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" + sources."minimist-1.2.0" sources."source-map-0.5.7" ]; buildInputs = globalBuildInputs; @@ -12867,7 +13105,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "json-loader-^0.5.4" = nodeEnv.buildNodePackage { name = "json-loader"; @@ -12884,7 +13122,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jsonlint-^1.6.2" = nodeEnv.buildNodePackage { name = "jsonlint"; @@ -12909,7 +13147,7 @@ in homepage = http://zaach.github.com/jsonlint/; }; production = true; - bypassCache = false; + bypassCache = true; }; "less-^2.7.1" = nodeEnv.buildNodePackage { name = "less"; @@ -12926,12 +13164,12 @@ in sources."assert-plus-0.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."boom-2.10.1" sources."caseless-0.12.0" sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" (sources."dashdash-1.14.1" // { @@ -12951,7 +13189,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."hawk-3.1.3" @@ -12971,8 +13209,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" @@ -12986,7 +13224,7 @@ in sources."safer-buffer-2.1.2" sources."sntp-1.0.9" sources."source-map-0.5.7" - (sources."sshpk-1.14.2" // { + (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -13009,7 +13247,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "less-loader-^2.2.3" = nodeEnv.buildNodePackage { name = "less-loader"; @@ -13032,7 +13270,7 @@ in homepage = "https://github.com/webpack/less-loader#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; "optimize-css-assets-webpack-plugin-^1.3.0" = nodeEnv.buildNodePackage { name = "optimize-css-assets-webpack-plugin"; @@ -13051,7 +13289,7 @@ in sources."balanced-match-0.4.2" sources."browserslist-1.7.7" sources."caniuse-api-1.6.1" - sources."caniuse-db-1.0.30000874" + sources."caniuse-db-1.0.30000957" (sources."chalk-1.1.3" // { dependencies = [ sources."supports-color-2.0.0" @@ -13061,8 +13299,8 @@ in sources."clone-1.0.4" sources."coa-1.0.4" sources."color-0.11.4" - sources."color-convert-1.9.2" - sources."color-name-1.1.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-0.3.0" sources."colormin-1.1.2" sources."colors-1.1.2" @@ -13071,7 +13309,7 @@ in sources."csso-2.3.2" sources."decamelize-1.2.0" sources."defined-1.0.0" - sources."electron-to-chromium-1.3.55" + sources."electron-to-chromium-1.3.124" sources."escape-string-regexp-1.0.5" sources."esprima-2.7.3" sources."flatten-1.0.2" @@ -13079,12 +13317,12 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-1.0.0" - sources."html-comment-regex-1.1.1" + sources."html-comment-regex-1.1.2" sources."indexes-of-1.0.1" sources."is-absolute-url-2.1.0" sources."is-plain-obj-1.1.0" sources."is-svg-2.1.0" - sources."js-base64-2.4.8" + sources."js-base64-2.5.1" sources."js-yaml-3.7.0" sources."lodash.memoize-4.1.2" sources."lodash.uniq-4.5.0" @@ -13122,7 +13360,7 @@ in sources."postcss-selector-parser-2.2.3" sources."postcss-svgo-2.1.6" sources."postcss-unique-selectors-2.0.2" - sources."postcss-value-parser-3.3.0" + sources."postcss-value-parser-3.3.1" sources."postcss-zindex-2.2.0" sources."prepend-http-1.0.4" sources."q-1.5.1" @@ -13152,7 +13390,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "script-loader-^0.7.0" = nodeEnv.buildNodePackage { name = "script-loader"; @@ -13172,7 +13410,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "standard-^9.0.1" = nodeEnv.buildNodePackage { name = "standard"; @@ -13183,7 +13421,7 @@ in sha1 = "9bd3b9467492e212b1914d78553943ff9b48fd99"; }; dependencies = [ - sources."acorn-5.7.1" + sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -13195,10 +13433,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" sources."array.prototype.find-2.0.4" - sources."arrify-1.0.1" sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -13218,14 +13453,13 @@ in sources."debug-2.6.9" sources."debug-log-1.0.1" sources."deep-is-0.1.3" - sources."define-properties-1.1.2" + sources."define-properties-1.1.3" sources."deglob-2.1.1" - sources."del-2.2.2" sources."doctrine-2.1.0" sources."error-ex-1.3.2" - sources."es-abstract-1.12.0" - sources."es-to-primitive-1.1.1" - sources."es5-ext-0.10.45" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -13256,55 +13490,47 @@ in sources."file-entry-cache-2.0.0" sources."find-root-1.1.0" sources."find-up-2.1.0" - sources."flat-cache-1.3.0" - sources."foreach-2.0.5" + sources."flat-cache-1.3.4" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."generate-function-2.0.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-stdin-5.0.1" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."globals-9.18.0" - sources."globby-5.0.0" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-symbols-1.0.0" sources."home-or-tmp-2.0.0" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inquirer-0.12.0" - sources."interpret-1.1.0" + sources."interpret-1.2.0" sources."is-arrayish-0.2.1" sources."is-callable-1.1.4" sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.17.2" - sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.1" - sources."is-path-inside-1.0.1" + sources."is-my-json-valid-2.19.0" sources."is-property-1.0.2" sources."is-regex-1.0.4" sources."is-resolvable-1.1.0" - sources."is-symbol-1.0.1" + sources."is-symbol-1.0.2" sources."isarray-1.0.0" sources."js-tokens-3.0.2" - sources."js-yaml-3.12.0" + sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" sources."jsx-ast-utils-1.4.1" sources."levn-0.3.0" - (sources."load-json-file-4.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."load-json-file-4.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -13314,7 +13540,7 @@ in sources."next-tick-1.0.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" - sources."object-keys-1.0.12" + sources."object-keys-1.1.0" sources."once-1.4.0" sources."onetime-1.1.0" sources."optionator-0.8.2" @@ -13327,10 +13553,8 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" - sources."path-parse-1.0.5" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" + sources."path-parse-1.0.6" + sources."pify-3.0.0" sources."pkg-conf-2.1.0" sources."pkg-config-1.1.1" sources."pluralize-1.2.1" @@ -13341,10 +13565,10 @@ in sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."require-uncached-1.0.3" - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" - sources."rimraf-2.6.2" + sources."rimraf-2.6.3" sources."run-async-0.1.0" sources."run-parallel-1.1.9" sources."rx-lite-3.1.2" @@ -13390,7 +13614,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "string-loader-^0.0.1" = nodeEnv.buildNodePackage { name = "string-loader"; @@ -13407,7 +13631,7 @@ in license = "ISC"; }; production = true; - bypassCache = false; + bypassCache = true; }; "style-loader-^0.13.1" = nodeEnv.buildNodePackage { name = "style-loader"; @@ -13418,10 +13642,11 @@ in sha1 = "74533384cf698c7104c7951150b49717adc2f3bb"; }; dependencies = [ - sources."big.js-3.2.0" + sources."big.js-5.2.2" sources."emojis-list-2.1.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" + sources."minimist-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -13430,7 +13655,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "url-loader-^0.5.7" = nodeEnv.buildNodePackage { name = "url-loader"; @@ -13441,11 +13666,12 @@ in sha512 = "B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q=="; }; dependencies = [ - sources."big.js-3.2.0" + sources."big.js-5.2.2" sources."emojis-list-2.1.0" - sources."json5-0.5.1" - sources."loader-utils-1.1.0" + sources."json5-1.0.1" + sources."loader-utils-1.2.3" sources."mime-1.3.6" + sources."minimist-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -13454,7 +13680,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "webpack-^1.14.0" = nodeEnv.buildNodePackage { name = "webpack"; @@ -13471,6 +13697,7 @@ in sources."anymatch-1.3.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-unique-0.2.1" (sources."assert-1.4.1" // { dependencies = [ @@ -13478,34 +13705,72 @@ in sources."util-0.10.3" ]; }) + sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.1" - sources."balanced-match-1.0.0" + sources."async-each-1.0.2" + sources."atob-2.1.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) sources."base64-js-1.3.0" sources."big.js-3.2.0" - sources."binary-extensions-1.11.0" - sources."brace-expansion-1.1.11" + sources."binary-extensions-1.13.1" sources."braces-1.8.5" sources."browserify-aes-0.4.0" sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" sources."builtin-status-codes-3.0.0" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."camelcase-1.2.1" sources."center-align-0.1.3" sources."chokidar-1.7.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) (sources."cliui-2.1.0" // { dependencies = [ sources."wordwrap-0.0.2" ]; }) sources."clone-1.0.4" - sources."concat-map-0.0.1" + sources."collection-visit-1.0.0" + sources."component-emitter-1.2.1" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."crypto-browserify-3.3.0" sources."date-now-0.1.4" + sources."debug-2.6.9" sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."domain-browser-1.2.0" sources."emojis-list-2.1.0" (sources."enhanced-resolve-0.9.1" // { @@ -13517,31 +13782,74 @@ in sources."events-1.1.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."extglob-0.3.2" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."for-in-1.0.2" sources."for-own-0.1.5" - sources."fsevents-1.2.4" + sources."fragment-cache-0.2.1" + sources."fsevents-1.2.7" + sources."get-value-2.0.6" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."has-flag-1.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) sources."https-browserify-0.0.1" - sources."ieee754-1.1.12" + sources."ieee754-1.1.13" sources."indexof-0.0.1" sources."inherits-2.0.3" sources."interpret-0.6.6" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" sources."is-number-2.1.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-2.1.0" sources."json5-0.5.1" @@ -13549,13 +13857,27 @@ in sources."lazy-cache-1.0.4" sources."loader-utils-0.2.17" sources."longest-1.0.1" - sources."math-random-1.0.1" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."math-random-1.0.4" sources."memory-fs-0.3.0" sources."micromatch-2.3.11" - sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.1" - sources."nan-2.10.0" + sources."ms-2.0.0" + sources."nan-2.13.2" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.2" + ]; + }) (sources."node-libs-browser-0.7.0" // { dependencies = [ sources."string_decoder-0.10.31" @@ -13563,14 +13885,38 @@ in }) sources."normalize-path-2.1.1" sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."optimist-0.6.1" sources."os-browserify-0.2.1" sources."pako-0.2.9" sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-is-absolute-1.0.1" sources."pbkdf2-compat-2.0.1" + sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."process-0.11.10" sources."process-nextick-args-2.0.0" @@ -13578,33 +13924,143 @@ in sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" ]; }) sources."readable-stream-2.3.6" - sources."readdirp-2.1.0" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.2" + sources."micromatch-3.1.10" + ]; + }) sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.2" + sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."right-align-0.1.3" sources."ripemd160-0.2.0" sources."safe-buffer-5.1.2" - sources."set-immediate-shim-1.0.1" + sources."safe-regex-1.1.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."setimmediate-1.0.5" sources."sha.js-2.2.6" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" sources."source-list-map-0.1.8" sources."source-map-0.5.7" - sources."stream-browserify-2.0.1" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" sources."string_decoder-1.1.1" sources."supports-color-3.2.3" sources."tapable-0.1.10" sources."timers-browserify-2.0.10" sources."to-arraybuffer-1.0.1" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) sources."tty-browserify-0.0.0" (sources."uglify-js-2.7.5" // { dependencies = [ @@ -13612,11 +14068,30 @@ in ]; }) sources."uglify-to-browserify-1.0.2" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (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."isobject-3.0.1" + ]; + }) + sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) + sources."use-3.1.1" sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" @@ -13642,7 +14117,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "webpack-parallel-uglify-plugin-^0.2.0" = nodeEnv.buildNodePackage { name = "webpack-parallel-uglify-plugin"; @@ -13662,7 +14137,7 @@ in sources."concat-map-0.0.1" sources."decamelize-1.2.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."is-buffer-1.1.6" @@ -13695,24 +14170,7 @@ in license = "ISC"; }; production = true; - bypassCache = false; - }; - "eve-^0.5.4" = nodeEnv.buildNodePackage { - name = "eve"; - packageName = "eve"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz"; - sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Simple custom events"; - homepage = "https://github.com/adobe-webplatform/eve#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = false; + bypassCache = true; }; "Idle.Js-git+https://github.com/shawnmclean/Idle.js" = nodeEnv.buildNodePackage { name = "Idle.Js"; @@ -13728,7 +14186,7 @@ in license = "Apache 2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "archiver-^2.1.1" = nodeEnv.buildNodePackage { name = "archiver"; @@ -13740,12 +14198,12 @@ in }; dependencies = [ sources."archiver-utils-1.3.0" - sources."async-2.6.1" + sources."async-2.6.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.0" sources."bl-1.2.2" sources."brace-expansion-1.1.11" - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -13758,14 +14216,14 @@ in sources."end-of-stream-1.4.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" - sources."graceful-fs-4.1.11" - sources."ieee754-1.1.12" + sources."glob-7.1.3" + sources."graceful-fs-4.1.15" + sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."lazystream-1.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."minimatch-3.0.4" sources."normalize-path-2.1.1" sources."once-1.4.0" @@ -13775,7 +14233,7 @@ in sources."remove-trailing-separator-1.1.0" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" - sources."tar-stream-1.6.1" + sources."tar-stream-1.6.2" sources."to-buffer-1.1.1" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -13789,18 +14247,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "async-^2.1.4" = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; - sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; + url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; + sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; dependencies = [ - sources."lodash-4.17.10" + sources."lodash-4.17.11" ]; buildInputs = globalBuildInputs; meta = { @@ -13809,15 +14267,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "aws-sdk-^2.7.20" = nodeEnv.buildNodePackage { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.286.2"; + version = "2.437.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.286.2.tgz"; - sha512 = "46a/2+rGEgIlmUz08vZOkYFmZIgj+An/cc+Ngz9XBLkAZbx+3sBzOrxexrlVV69MPkMbckbeZjIq8NEJWV5gPw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.437.0.tgz"; + sha512 = "sDZb5QBOO6FOMvuKDEdO16YQRk0WUhnQd38EaSt0yUCi4Gev8uypODyYONgODZcXe8Cr1GMwC8scUKr00S/I5w=="; }; dependencies = [ sources."base64-js-1.3.0" @@ -13830,7 +14288,7 @@ in sources."querystring-0.2.0" sources."sax-1.2.1" sources."url-0.10.3" - sources."uuid-3.1.0" + sources."uuid-3.3.2" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" ]; @@ -13841,15 +14299,15 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "base64url-^3.0.0" = nodeEnv.buildNodePackage { name = "base64url"; packageName = "base64url"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64url/-/base64url-3.0.0.tgz"; - sha512 = "LIVmqIrIWuiqTvn4RzcrwCOuHo2DD6tKmKBPXXlr4p4n4l6BZBkwFTIa3zu1XkX5MbZgro4a6BvPi+n2Mns5Gg=="; + url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz"; + sha512 = "ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -13858,41 +14316,40 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "azure-storage-^2.7.0" = nodeEnv.buildNodePackage { name = "azure-storage"; packageName = "azure-storage"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.1.tgz"; - sha512 = "rnFo1uMIPtilusRCpK91tfY3P4Q7qRsDNwriXdp+OeTIGkGt0cTxL4mhqYfNPYPK+WBQmBdGWhOk+iROM05dcw=="; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.2.tgz"; + sha512 = "pOyGPya9+NDpAfm5YcFfklo57HfjDbYLXxs4lomPwvRxmb0Di/A+a+RkUmEFzaQ8S13CqxK40bRRB0sjj2ZQxA=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."browserify-mime-1.2.9" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."extend-1.2.1" + sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."hash-base-3.0.4" sources."http-signature-1.2.0" sources."inherits-2.0.3" @@ -13902,39 +14359,41 @@ in sources."jsbn-0.1.1" sources."json-edm-parser-0.1.2" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.2.0" sources."jsprim-1.4.1" sources."md5.js-1.3.4" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.0.6" - (sources."request-2.87.0" // { - dependencies = [ - sources."extend-3.0.2" - ]; - }) + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-0.5.8" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."string_decoder-0.10.31" - sources."tough-cookie-2.3.4" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."underscore-1.8.3" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."validator-9.4.1" sources."verror-1.10.0" sources."xml2js-0.2.8" - sources."xmlbuilder-0.4.3" + sources."xmlbuilder-9.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -13943,7 +14402,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "blueimp-md5-^2.6.0" = nodeEnv.buildNodePackage { name = "blueimp-md5"; @@ -13960,7 +14419,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "body-parser-^1.15.2" = nodeEnv.buildNodePackage { name = "body-parser"; @@ -13980,8 +14439,8 @@ in sources."iconv-lite-0.4.23" sources."inherits-2.0.3" sources."media-typer-0.3.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."on-finished-2.3.0" sources."qs-6.5.2" @@ -13999,24 +14458,24 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "bootstrap-^3.3.7" = nodeEnv.buildNodePackage { name = "bootstrap"; packageName = "bootstrap"; - version = "3.3.7"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz"; - sha1 = "5a389394549f23330875a3b150656574f8a9eb71"; + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz"; + sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; buildInputs = globalBuildInputs; meta = { description = "The most popular front-end framework for developing responsive, mobile first projects on the web."; - homepage = http://getbootstrap.com/; + homepage = https://getbootstrap.com/; license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "bootstrap-validator-^0.11.8" = nodeEnv.buildNodePackage { name = "bootstrap-validator"; @@ -14032,15 +14491,15 @@ in homepage = "https://github.com/1000hz/bootstrap-validator#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; "chance-^1.0.4" = nodeEnv.buildNodePackage { name = "chance"; packageName = "chance"; - version = "1.0.16"; + version = "1.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/chance/-/chance-1.0.16.tgz"; - sha512 = "2bgDHH5bVfAXH05SPtjqrsASzZ7h90yCuYT2z4mkYpxxYvJXiIydBFzVieVHZx7wLH1Ag2Azaaej2/zA1XUrNQ=="; + url = "https://registry.npmjs.org/chance/-/chance-1.0.18.tgz"; + sha512 = "g9YLQVHVZS/3F+zIicfB58vjcxopvYQRp7xHzvyDFDhXH1aRZI/JhwSAO0X5qYiQluoGnaNAU6wByD2KTxJN1A=="; }; buildInputs = globalBuildInputs; meta = { @@ -14049,7 +14508,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "cheerio-^0.22.0" = nodeEnv.buildNodePackage { name = "cheerio"; @@ -14061,21 +14520,15 @@ in }; dependencies = [ sources."boolbase-1.0.0" - sources."core-util-is-1.0.2" sources."css-select-1.2.0" - sources."css-what-2.1.0" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.0" + sources."css-what-2.1.3" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."entities-1.1.1" - sources."htmlparser2-3.9.2" + sources."entities-1.1.2" + sources."htmlparser2-3.10.1" sources."inherits-2.0.3" - sources."isarray-1.0.0" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" sources."lodash.defaults-4.2.0" @@ -14088,11 +14541,10 @@ in sources."lodash.reduce-4.6.0" sources."lodash.reject-4.6.0" sources."lodash.some-4.6.0" - sources."nth-check-1.0.1" - sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.6" + sources."nth-check-1.0.2" + sources."readable-stream-3.3.0" sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."string_decoder-1.2.0" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -14102,188 +14554,459 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "codemirror-git+https://github.com/hackmdio/CodeMirror.git" = nodeEnv.buildNodePackage { name = "codemirror"; packageName = "codemirror"; - version = "5.39.1"; + version = "5.41.1"; src = fetchgit { url = "https://github.com/hackmdio/CodeMirror.git"; - rev = "df412731ed3923124f9a43f60e84bdf855eb843a"; - sha256 = "3c5a6813c29893301836773c3ed122ec868840432b16d2936a4deab419e3620b"; + rev = "490cdc903e06895354691e7a06b84203b3be4a6e"; + sha256 = "a0cd1c3b5e1e4d46c02cff3983585064c1586cf7358bcf6460b8e83c6f8902e3"; }; dependencies = [ - sources."acorn-5.7.1" - (sources."acorn-jsx-3.0.1" // { + sources."@types/estree-0.0.39" + sources."@types/node-11.13.0" + sources."acorn-5.7.3" + sources."acorn-dynamic-import-4.0.0" + sources."acorn-jsx-5.0.1" + sources."ajv-6.10.0" + (sources."align-text-0.1.4" // { dependencies = [ - sources."acorn-3.3.0" + sources."kind-of-3.2.2" ]; }) - (sources."acorn-object-spread-1.0.0" // { + sources."ansi-styles-1.0.0" + (sources."anymatch-1.3.2" // { dependencies = [ - sources."acorn-3.3.0" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."kind-of-3.2.2" + sources."micromatch-2.3.11" ]; }) - sources."ajv-5.5.2" - sources."align-text-0.1.4" - sources."ansi-regex-2.1.1" - sources."ansi-styles-1.0.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.2" sources."asynckit-0.4.0" + sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - sources."balanced-match-1.0.0" + sources."aws4-1.8.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."bcrypt-pbkdf-1.0.2" + sources."binary-extensions-1.13.1" sources."blint-1.0.3" - sources."brace-expansion-1.1.11" - (sources."buble-0.15.2" // { + (sources."braces-2.3.2" // { dependencies = [ - sources."acorn-3.3.0" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."buble-0.19.7" // { + dependencies = [ + sources."acorn-6.1.1" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" sources."minimist-1.2.0" - sources."strip-ansi-3.0.1" ]; }) sources."buffer-from-1.1.1" + sources."cache-base-1.0.1" sources."camelcase-1.2.1" sources."caseless-0.12.0" sources."center-align-0.1.3" sources."chalk-0.4.0" - sources."cliui-2.1.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."concat-map-0.0.1" + sources."chokidar-1.7.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colors-1.3.3" + sources."combined-stream-1.0.7" + sources."component-emitter-1.2.1" sources."concat-stream-1.6.2" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" sources."escape-string-regexp-1.0.5" - sources."estree-walker-0.2.1" + sources."estree-walker-0.6.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."expand-range-1.8.2" // { + dependencies = [ + sources."fill-range-2.2.4" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + sources."kind-of-3.2.2" + ]; + }) sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" + sources."filename-regex-2.0.1" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."for-in-1.0.2" + sources."for-own-0.1.5" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" + sources."fragment-cache-0.2.1" sources."fs-extra-1.0.0" + sources."fsevents-1.2.7" + sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" - sources."has-ansi-2.0.0" + sources."har-validator-5.1.3" sources."has-color-0.1.7" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."hasha-2.2.0" sources."http-signature-1.2.0" sources."inherits-2.0.3" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" + sources."jsesc-0.5.0" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" sources."klaw-1.3.1" sources."lazy-cache-1.0.4" sources."longest-1.0.1" - sources."magic-string-0.14.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."magic-string-0.25.2" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."math-random-1.0.4" + sources."micromatch-3.1.10" + sources."mime-1.6.0" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."minimist-0.0.10" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."ms-2.0.0" - sources."node-static-0.6.0" + sources."nan-2.13.2" + sources."nanomatch-1.2.13" + sources."node-static-0.7.11" sources."nomnom-1.8.1" - sources."oauth-sign-0.8.2" + sources."normalize-path-2.1.1" + sources."oauth-sign-0.9.0" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.omit-2.0.1" + sources."object.pick-1.3.0" + sources."optimist-0.6.1" sources."os-homedir-1.0.2" + sources."parse-glob-3.0.4" + sources."pascalcase-0.1.1" + sources."path-is-absolute-1.0.1" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."phantomjs-prebuilt-2.1.16" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + sources."posix-character-classes-0.1.1" + sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" + (sources."randomatic-3.1.1" // { + dependencies = [ + sources."is-number-4.0.0" + ]; + }) sources."readable-stream-2.3.6" + sources."readdirp-2.2.1" + sources."regenerate-1.4.0" + sources."regenerate-unicode-properties-8.0.2" + sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" + sources."regexpu-core-4.5.4" + sources."regjsgen-0.5.0" + sources."regjsparser-0.6.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.87.0" + sources."request-2.88.0" sources."request-progress-2.0.1" sources."require-relative-0.8.7" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."right-align-0.1.3" - sources."rollup-0.41.6" - sources."rollup-plugin-buble-0.15.0" - sources."rollup-pluginutils-1.5.2" - sources."rollup-watch-3.2.2" + sources."rollup-0.66.6" + sources."rollup-plugin-buble-0.19.6" + sources."rollup-pluginutils-2.6.0" + sources."rollup-watch-4.3.1" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."source-map-0.5.7" - sources."source-map-support-0.4.18" - sources."sshpk-1.14.2" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.4" + sources."split-string-3.1.0" + sources."sshpk-1.16.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-0.1.1" - sources."supports-color-2.0.0" + sources."supports-color-5.5.0" sources."throttleit-1.0.0" - sources."tough-cookie-2.3.4" + (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."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uglify-js-2.8.29" sources."uglify-to-browserify-1.0.2" sources."underscore-1.6.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.1.0" + sources."unicode-property-aliases-ecmascript-1.0.5" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (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."uri-js-4.2.2" + sources."urix-0.1.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."vlq-0.2.3" sources."which-1.3.1" sources."window-size-0.1.0" - sources."wordwrap-0.0.2" + sources."wordwrap-0.0.3" sources."yargs-3.10.0" sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; meta = { description = "Full-featured in-browser code editor"; - homepage = http://codemirror.net/; + homepage = https://codemirror.net/; license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "compression-^1.6.2" = nodeEnv.buildNodePackage { name = "compression"; packageName = "compression"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz"; - sha512 = "HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg=="; + url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; }; dependencies = [ sources."accepts-1.3.5" sources."bytes-3.0.0" - sources."compressible-2.0.14" + sources."compressible-2.0.16" sources."debug-2.6.9" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."negotiator-0.6.1" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."safe-buffer-5.1.2" sources."vary-1.1.2" ]; @@ -14294,7 +15017,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "connect-flash-^0.1.1" = nodeEnv.buildNodePackage { name = "connect-flash"; @@ -14309,7 +15032,7 @@ in description = "Flash message middleware for Connect."; }; production = true; - bypassCache = false; + bypassCache = true; }; "connect-session-sequelize-^4.1.0" = nodeEnv.buildNodePackage { name = "connect-session-sequelize"; @@ -14331,7 +15054,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "cookie-0.3.1" = nodeEnv.buildNodePackage { name = "cookie"; @@ -14348,7 +15071,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "cookie-parser-1.4.3" = nodeEnv.buildNodePackage { name = "cookie-parser"; @@ -14369,7 +15092,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "deep-freeze-^0.0.1" = nodeEnv.buildNodePackage { name = "deep-freeze"; @@ -14386,7 +15109,7 @@ in license = "public domain"; }; production = true; - bypassCache = false; + bypassCache = true; }; "diff-match-patch-git+https://github.com/hackmdio/diff-match-patch.git" = nodeEnv.buildNodePackage { name = "diff-match-patch"; @@ -14403,7 +15126,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "ejs-^2.5.5" = nodeEnv.buildNodePackage { name = "ejs"; @@ -14420,7 +15143,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "emojify.js-~1.1.0" = nodeEnv.buildNodePackage { name = "emojify.js"; @@ -14437,20 +15160,20 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "express->=4.14" = nodeEnv.buildNodePackage { name = "express"; packageName = "express"; - version = "4.16.3"; + version = "4.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; - sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; + url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; + sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; }; dependencies = [ sources."accepts-1.3.5" sources."array-flatten-1.1.1" - sources."body-parser-1.18.2" + sources."body-parser-1.18.3" sources."bytes-3.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -14467,31 +15190,26 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."http-errors-1.6.3" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.23" sources."inherits-2.0.3" sources."ipaddr.js-1.8.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."on-finished-2.3.0" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.4" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."range-parser-1.2.0" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) - sources."safe-buffer-5.1.1" + sources."raw-body-2.3.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."send-0.16.2" sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" @@ -14508,7 +15226,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "express-session-^1.14.2" = nodeEnv.buildNodePackage { name = "express-session"; @@ -14525,7 +15243,7 @@ in sources."debug-2.6.9" sources."depd-1.1.2" sources."ms-2.0.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."parseurl-1.3.2" sources."random-bytes-1.0.0" sources."uid-safe-2.1.5" @@ -14538,7 +15256,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "file-saver-^1.3.3" = nodeEnv.buildNodePackage { name = "file-saver"; @@ -14555,7 +15273,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "flowchart.js-^1.6.4" = nodeEnv.buildNodePackage { name = "flowchart.js"; @@ -14576,7 +15294,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "font-awesome-^4.7.0" = nodeEnv.buildNodePackage { name = "font-awesome"; @@ -14593,7 +15311,7 @@ in license = "(OFL-1.1 AND MIT)"; }; production = true; - bypassCache = false; + bypassCache = true; }; "formidable-^1.0.17" = nodeEnv.buildNodePackage { name = "formidable"; @@ -14610,7 +15328,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "gist-embed-~2.6.0" = nodeEnv.buildNodePackage { name = "gist-embed"; @@ -14627,15 +15345,15 @@ in license = "BSD-2-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "graceful-fs-^4.1.11" = nodeEnv.buildNodePackage { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.11"; + version = "4.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; buildInputs = globalBuildInputs; meta = { @@ -14644,46 +15362,24 @@ in license = "ISC"; }; production = true; - bypassCache = false; + bypassCache = true; }; "handlebars-^4.0.6" = nodeEnv.buildNodePackage { name = "handlebars"; packageName = "handlebars"; - version = "4.0.11"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; - sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz"; + sha512 = "3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA=="; }; dependencies = [ - sources."align-text-0.1.4" - sources."amdefine-1.0.1" - sources."async-1.5.2" - sources."camelcase-1.2.1" - sources."center-align-0.1.3" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - sources."lazy-cache-1.0.4" - sources."longest-1.0.1" + sources."commander-2.19.0" sources."minimist-0.0.10" + sources."neo-async-2.6.0" sources."optimist-0.6.1" - sources."repeat-string-1.6.1" - sources."right-align-0.1.3" - sources."source-map-0.4.4" - (sources."uglify-js-2.8.29" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."uglify-to-browserify-1.0.2" - sources."window-size-0.1.0" + sources."source-map-0.6.1" + sources."uglify-js-3.5.3" sources."wordwrap-0.0.3" - sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -14692,30 +15388,32 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "helmet-^3.3.0" = nodeEnv.buildNodePackage { name = "helmet"; packageName = "helmet"; - version = "3.13.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.13.0.tgz"; - sha512 = "rCYnlbOBkeP6fCo4sXZNu91vIAWlbVgolwnUANtnzPANRf2kJZ2a6yjRnCqG23Tyl2/ExvJ8bDg4xUdNCIWnrw=="; + url = "https://registry.npmjs.org/helmet/-/helmet-3.16.0.tgz"; + sha512 = "rsTKRogc5OYGlvSHuq5QsmOsOzF6uDoMqpfh+Np8r23+QxDq+SUx90Rf8HyIKQVl7H6NswZEwfcykinbAeZ6UQ=="; }; dependencies = [ sources."camelize-1.0.0" sources."content-security-policy-builder-2.0.0" sources."dasherize-2.0.0" + sources."depd-2.0.0" sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" sources."expect-ct-0.1.1" + sources."feature-policy-0.2.0" sources."frameguard-3.0.0" sources."helmet-crossdomain-0.3.0" sources."helmet-csp-2.7.1" sources."hide-powered-by-1.0.0" sources."hpkp-2.0.0" - sources."hsts-2.1.0" - sources."ienoopen-1.0.0" + sources."hsts-2.2.0" + sources."ienoopen-1.1.0" sources."nocache-2.0.0" sources."platform-1.3.5" sources."referrer-policy-1.1.0" @@ -14728,7 +15426,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "highlight.js-~9.12.0" = nodeEnv.buildNodePackage { name = "highlight.js"; @@ -14745,7 +15443,7 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "i18n-^0.8.3" = nodeEnv.buildNodePackage { name = "i18n"; @@ -14759,7 +15457,11 @@ in sources."abbrev-1.1.1" (sources."ambi-2.5.0" // { dependencies = [ - sources."typechecker-4.5.0" + (sources."typechecker-4.7.0" // { + dependencies = [ + sources."editions-2.1.3" + ]; + }) ]; }) sources."async-1.5.2" @@ -14767,9 +15469,14 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."csextends-1.2.0" - sources."debug-3.1.0" + sources."debug-4.1.1" sources."eachr-2.0.4" sources."editions-1.3.4" + (sources."errlop-1.1.1" // { + dependencies = [ + sources."editions-2.1.3" + ]; + }) (sources."extendr-2.1.0" // { dependencies = [ sources."typechecker-2.0.8" @@ -14781,7 +15488,7 @@ in ]; }) sources."glob-6.0.4" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."ignorefs-1.2.0" sources."ignorepatterns-1.1.0" sources."inflight-1.0.6" @@ -14791,14 +15498,15 @@ in sources."messageformat-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."ms-2.0.0" - sources."mustache-2.3.0" + sources."ms-2.1.1" + sources."mustache-3.0.1" sources."nopt-3.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."safefs-3.2.2" sources."scandirectory-2.5.0" - sources."sprintf-js-1.1.1" + sources."semver-5.7.0" + sources."sprintf-js-1.1.2" sources."taskgroup-4.3.1" sources."typechecker-2.1.0" sources."watchr-2.4.13" @@ -14812,31 +15520,31 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "imgur-git+https://github.com/hackmdio/node-imgur.git" = nodeEnv.buildNodePackage { name = "imgur"; packageName = "imgur"; - version = "0.2.0"; + version = "0.3.1"; src = fetchgit { url = "https://github.com/hackmdio/node-imgur.git"; - rev = "0fba6d163428c946942cd2c3022634cbb8754e38"; - sha256 = "b7dc96b2ccefdca42dca10138d3121b405b2b7e70ffa055ce225ad63bc3f3c7a"; + rev = "4fe9cfa3893505c34c49067483d85d3ad4376cd6"; + sha256 = "60c728bf600ffe40db8c0b902fc1974b50f367a2bff2cea6bb9f1e9d29fb3dae"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" + sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."combined-stream-1.0.7" + sources."commander-2.20.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -14844,14 +15552,15 @@ in sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" + sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-4.5.3" + sources."glob-7.1.3" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -14859,36 +15568,46 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" - sources."minimatch-2.0.10" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."minimatch-3.0.4" + sources."oauth-sign-0.9.0" sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" - sources."punycode-1.4.1" - sources."q-1.5.1" + sources."pop-iterate-1.0.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."q-2.0.3" sources."qs-6.5.2" - sources."request-2.87.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" + sources."weak-map-1.0.5" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { description = "Upload images to imgur.com"; homepage = https://github.com/kaimallea/node-imgur; + license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "ionicons-~2.0.1" = nodeEnv.buildNodePackage { name = "ionicons"; @@ -14905,7 +15624,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-^3.1.1" = nodeEnv.buildNodePackage { name = "jquery"; @@ -14922,7 +15641,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-mousewheel-^3.1.13" = nodeEnv.buildNodePackage { name = "jquery-mousewheel"; @@ -14938,7 +15657,7 @@ in homepage = https://github.com/jquery/jquery-mousewheel; }; production = true; - bypassCache = false; + bypassCache = true; }; "jquery-ui-^1.12.1" = nodeEnv.buildNodePackage { name = "jquery-ui"; @@ -14955,7 +15674,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "js-cookie-^2.1.3" = nodeEnv.buildNodePackage { name = "js-cookie"; @@ -14972,29 +15691,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; - }; - "js-sequence-diagrams-^1000000.0.6" = nodeEnv.buildNodePackage { - name = "js-sequence-diagrams"; - packageName = "js-sequence-diagrams"; - version = "1000000.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sequence-diagrams/-/js-sequence-diagrams-1000000.0.6.tgz"; - sha1 = "e95db01420479c5ccbc12046af1da42fde649e5c"; - }; - dependencies = [ - sources."eve-git://github.com/adobe-webplatform/eve.git#eef80ed" - sources."raphael-2.1.4" - sources."underscore-1.4.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fucks NPM and draws simple SVG sequence diagrams from textual representation of the diagram"; - homepage = "https://github.com/Moeditor/js-sequence-diagrams#readme"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = false; + bypassCache = true; }; "js-url-^2.3.0" = nodeEnv.buildNodePackage { name = "js-url"; @@ -15005,75 +15702,55 @@ in sha1 = "e0c02b622e89710749399f440d49056e72f70078"; }; dependencies = [ - sources."ajv-5.5.2" + sources."agent-base-4.2.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."async-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."ansi-styles-3.2.1" + sources."async-limiter-1.0.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."caseless-0.12.0" - sources."chalk-1.1.3" + sources."chalk-2.4.2" sources."cli-1.0.1" - sources."co-4.6.0" - sources."colors-1.0.3" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" - sources."cycle-1.0.3" - sources."dashdash-1.14.1" sources."date-now-0.1.4" - sources."debug-2.6.9" - sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.1.0" // { + sources."debug-4.1.1" + (sources."dom-serializer-0.1.1" // { dependencies = [ - sources."domelementtype-1.1.3" - sources."entities-1.1.1" + sources."entities-1.1.2" ]; }) - sources."domelementtype-1.3.0" + sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" sources."duplexer-0.1.1" - sources."ecc-jsbn-0.1.2" sources."entities-1.0.0" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" + sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."eventemitter2-0.4.14" + sources."eventemitter2-5.0.1" sources."exit-0.1.2" - sources."extend-3.0.2" - sources."extract-zip-1.6.7" - sources."extsprintf-1.3.0" - sources."eyes-0.1.8" - sources."fast-deep-equal-1.1.0" - sources."fast-json-stable-stringify-2.0.0" + (sources."extract-zip-1.6.7" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."fd-slicer-1.0.1" sources."figures-1.7.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.2" - sources."fs-extra-1.0.0" sources."fs.realpath-1.0.0" - sources."getpass-0.1.7" - sources."glob-7.1.2" - sources."graceful-fs-4.1.11" - sources."grunt-contrib-jshint-1.1.0" - sources."grunt-contrib-qunit-2.0.0" - sources."grunt-contrib-uglify-3.4.0" - sources."grunt-lib-phantomjs-1.1.0" + sources."glob-7.1.3" + sources."grunt-contrib-jshint-2.1.0" + sources."grunt-contrib-qunit-3.1.0" + sources."grunt-contrib-uglify-4.0.1" sources."gzip-size-3.0.0" - sources."har-schema-2.0.0" - sources."har-validator-5.0.3" sources."has-ansi-2.0.0" - sources."hasha-2.2.0" + sources."has-flag-3.0.0" sources."hooker-0.2.3" (sources."htmlparser2-3.8.3" // { dependencies = [ @@ -15082,80 +15759,55 @@ in sources."string_decoder-0.10.31" ]; }) - sources."http-signature-1.2.0" + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."jshint-2.9.6" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."kew-0.7.0" - sources."klaw-1.3.1" - sources."lodash-4.17.10" - sources."maxmin-2.1.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."jshint-2.10.2" + sources."lodash-4.17.11" + (sources."maxmin-2.1.0" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" + ]; + }) + sources."mime-2.4.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."package-1.0.1" + sources."p-each-series-1.0.0" + sources."p-reduce-1.0.0" sources."path-is-absolute-1.0.1" sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."phantom-4.0.12" - sources."phantomjs-prebuilt-2.1.16" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" sources."pretty-bytes-3.0.1" sources."process-nextick-args-2.0.0" - sources."progress-1.1.8" - sources."punycode-1.4.1" - sources."qs-6.5.2" + sources."progress-2.0.3" + sources."proxy-from-env-1.0.0" + sources."puppeteer-1.14.0" sources."readable-stream-2.3.6" - sources."request-2.87.0" - sources."request-progress-2.0.1" - sources."rimraf-2.6.2" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."semver-5.5.0" sources."shelljs-0.3.0" sources."source-map-0.6.1" - sources."split-1.0.1" - sources."sshpk-1.14.2" - sources."stack-trace-0.0.10" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-1.0.4" - sources."supports-color-2.0.0" - sources."temporary-0.0.8" - sources."throttleit-1.0.0" - sources."through-2.3.8" - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."supports-color-5.5.0" sources."typedarray-0.0.6" - sources."uglify-js-3.4.6" - sources."unicode-5.2.0-0.7.5" + sources."uglify-js-3.5.3" sources."uri-path-1.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" - sources."which-1.3.1" - sources."winston-2.4.3" sources."wrappy-1.0.2" + sources."ws-6.2.1" sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; @@ -15165,15 +15817,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "js-yaml-^3.7.0" = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; - sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; }; dependencies = [ sources."argparse-1.0.10" @@ -15187,7 +15839,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "jsdom-nogyp-^0.8.3" = nodeEnv.buildNodePackage { name = "jsdom-nogyp"; @@ -15198,72 +15850,71 @@ in sha1 = "924b3f03cfe487dfcdf6375e6324252ceb80d0cc"; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."cssom-0.2.5" (sources."cssstyle-0.2.37" // { dependencies = [ - sources."cssom-0.3.4" + sources."cssom-0.3.6" ]; }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."ecc-jsbn-0.1.2" - sources."entities-1.1.1" + sources."entities-1.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" - sources."htmlparser2-3.9.2" + sources."har-validator-5.1.3" + sources."htmlparser2-3.10.1" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."nwmatcher-1.3.9" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readable-stream-2.3.6" - sources."request-2.87.0" + sources."readable-stream-3.3.0" + sources."request-2.88.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."string_decoder-1.1.1" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + sources."string_decoder-1.2.0" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -15278,7 +15929,7 @@ in }; }; production = true; - bypassCache = false; + bypassCache = true; }; "keymaster-^1.6.2" = nodeEnv.buildNodePackage { name = "keymaster"; @@ -15294,7 +15945,7 @@ in homepage = https://github.com/madrobby/keymaster; }; production = true; - bypassCache = false; + bypassCache = true; }; "list.js-^1.5.0" = nodeEnv.buildNodePackage { name = "list.js"; @@ -15305,7 +15956,7 @@ in sha1 = "a4cbfc8281ddefc02fdb2d30c8748bfae25fbcda"; }; dependencies = [ - sources."string-natural-compare-2.0.2" + sources."string-natural-compare-2.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -15314,15 +15965,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "lodash-^4.17.4" = nodeEnv.buildNodePackage { name = "lodash"; packageName = "lodash"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; buildInputs = globalBuildInputs; meta = { @@ -15331,7 +15982,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "lz-string-1.4.4" = nodeEnv.buildNodePackage { name = "lz-string"; @@ -15348,7 +15999,7 @@ in license = "WTFPL"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-^8.2.2" = nodeEnv.buildNodePackage { name = "markdown-it"; @@ -15360,11 +16011,11 @@ in }; dependencies = [ sources."argparse-1.0.10" - sources."entities-1.1.1" - sources."linkify-it-2.0.3" + sources."entities-1.1.2" + sources."linkify-it-2.1.0" sources."mdurl-1.0.1" sources."sprintf-js-1.0.3" - sources."uc.micro-1.0.5" + sources."uc.micro-1.0.6" ]; buildInputs = globalBuildInputs; meta = { @@ -15373,7 +16024,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-abbr-^1.0.4" = nodeEnv.buildNodePackage { name = "markdown-it-abbr"; @@ -15390,7 +16041,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-container-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-container"; @@ -15407,7 +16058,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-deflist-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-deflist"; @@ -15424,7 +16075,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-emoji-^1.3.0" = nodeEnv.buildNodePackage { name = "markdown-it-emoji"; @@ -15441,7 +16092,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-footnote-^3.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-footnote"; @@ -15458,7 +16109,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-imsize-^2.0.1" = nodeEnv.buildNodePackage { name = "markdown-it-imsize"; @@ -15475,7 +16126,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-ins-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-ins"; @@ -15492,7 +16143,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-mark-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mark"; @@ -15509,7 +16160,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-mathjax-^2.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-mathjax"; @@ -15526,7 +16177,7 @@ in license = "ISC"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-regexp-^0.4.0" = nodeEnv.buildNodePackage { name = "markdown-it-regexp"; @@ -15543,7 +16194,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-sub-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sub"; @@ -15560,7 +16211,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-it-sup-^1.0.0" = nodeEnv.buildNodePackage { name = "markdown-it-sup"; @@ -15577,7 +16228,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "markdown-pdf-^8.0.0" = nodeEnv.buildNodePackage { name = "markdown-pdf"; @@ -15588,7 +16239,7 @@ in sha512 = "lpRyiNptdwArH6bG6Y8X13G5Qr/usTTDXxTp7zjhwxJ+cQO7Z6A1T265ZiN6PVDLzRNxxtcquQCIOpTC0U1NFg=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."argparse-0.1.16" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -15596,13 +16247,12 @@ in sources."asynckit-0.4.0" sources."autolinker-0.15.3" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" - sources."commander-2.16.0" + sources."combined-stream-1.0.7" + sources."commander-2.20.0" sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -15610,22 +16260,22 @@ in sources."delayed-stream-1.0.0" sources."duplexer-0.1.1" sources."ecc-jsbn-0.1.2" - sources."es6-promise-4.2.4" + sources."es6-promise-4.2.6" sources."extend-3.0.2" sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fd-slicer-1.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."fs-extra-1.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."hasha-2.2.0" - sources."highlight.js-9.12.0" + sources."highlight.js-9.15.6" sources."http-signature-1.2.0" sources."inherits-2.0.3" sources."is-stream-1.1.0" @@ -15635,18 +16285,18 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."kew-0.7.0" sources."klaw-1.3.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."os-tmpdir-1.0.2" sources."pend-1.2.0" sources."performance-now-2.1.0" @@ -15655,27 +16305,33 @@ in sources."pinkie-promise-2.0.1" sources."process-nextick-args-2.0.0" sources."progress-1.1.8" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."remarkable-1.7.1" - sources."request-2.87.0" + sources."request-2.88.0" sources."request-progress-2.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."series-stream-1.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."stream-from-to-1.4.3" sources."string_decoder-1.1.1" sources."throttleit-1.0.0" - sources."through2-2.0.3" + sources."through2-2.0.5" sources."tmp-0.0.33" - sources."tough-cookie-2.3.4" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."underscore-1.7.0" sources."underscore.string-2.4.0" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -15690,7 +16346,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mathjax-~2.7.0" = nodeEnv.buildNodePackage { name = "mathjax"; @@ -15707,7 +16363,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mermaid-~7.1.0" = nodeEnv.buildNodePackage { name = "mermaid"; @@ -15721,11 +16377,11 @@ in sources."d3-3.5.17" sources."dagre-d3-renderer-0.4.26" sources."dagre-layout-0.8.8" - sources."graphlib-2.1.5" + sources."graphlib-2.1.7" sources."graphlibrary-2.2.0" - sources."he-1.1.1" - sources."lodash-4.17.10" - sources."moment-2.22.2" + sources."he-1.2.0" + sources."lodash-4.17.11" + sources."moment-2.24.0" ]; buildInputs = globalBuildInputs; meta = { @@ -15734,7 +16390,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mattermost-^3.4.0" = nodeEnv.buildNodePackage { name = "mattermost"; @@ -15746,7 +16402,7 @@ in }; dependencies = [ sources."async-1.5.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."component-emitter-1.2.1" sources."cookiejar-2.0.6" sources."core-util-is-1.0.2" @@ -15759,8 +16415,8 @@ in sources."isarray-0.0.1" sources."methods-1.1.2" sources."mime-1.3.4" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."qs-2.3.3" sources."readable-stream-1.0.27-1" @@ -15775,7 +16431,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "meta-marked-^0.4.2" = nodeEnv.buildNodePackage { name = "meta-marked"; @@ -15799,7 +16455,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "method-override-^2.3.7" = nodeEnv.buildNodePackage { name = "method-override"; @@ -15823,7 +16479,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "minimist-^1.2.0" = nodeEnv.buildNodePackage { name = "minimist"; @@ -15840,7 +16496,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "minio-^6.0.0" = nodeEnv.buildNodePackage { name = "minio"; @@ -15861,9 +16517,9 @@ in sources."inherits-2.0.3" sources."isarray-1.0.0" sources."json-stream-1.0.0" - sources."lodash-4.17.10" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."lodash-4.17.11" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."process-nextick-args-2.0.0" @@ -15896,15 +16552,15 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "moment-^2.17.1" = nodeEnv.buildNodePackage { name = "moment"; packageName = "moment"; - version = "2.22.2"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; - sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66"; + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; buildInputs = globalBuildInputs; meta = { @@ -15913,25 +16569,25 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "morgan-^1.7.0" = nodeEnv.buildNodePackage { name = "morgan"; packageName = "morgan"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz"; - sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; + url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; + sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; }; dependencies = [ - sources."basic-auth-2.0.0" + sources."basic-auth-2.0.1" sources."debug-2.6.9" sources."depd-1.1.2" sources."ee-first-1.1.1" sources."ms-2.0.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" - sources."safe-buffer-5.1.1" + sources."on-headers-1.0.2" + sources."safe-buffer-5.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -15940,7 +16596,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "mysql-^2.12.0" = nodeEnv.buildNodePackage { name = "mysql"; @@ -15969,7 +16625,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "node-uuid-^1.4.7" = nodeEnv.buildNodePackage { name = "node-uuid"; @@ -15985,7 +16641,7 @@ in homepage = https://github.com/broofa/node-uuid; }; production = true; - bypassCache = false; + bypassCache = true; }; "octicons-~4.4.0" = nodeEnv.buildNodePackage { name = "octicons"; @@ -16002,7 +16658,7 @@ in license = "(OFL-1.1 OR MIT)"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-^0.4.0" = nodeEnv.buildNodePackage { name = "passport"; @@ -16023,7 +16679,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-dropbox-oauth2-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-dropbox-oauth2"; @@ -16034,10 +16690,11 @@ in sha1 = "77c737636e4841944dfb82dfc42c3d8ab782c10e"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" sources."passport-oauth-1.0.0" sources."passport-oauth1-1.1.0" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."pkginfo-0.2.3" sources."uid2-0.0.3" @@ -16049,7 +16706,7 @@ in homepage = "https://github.com/florianheinemann/passport-dropbox-oauth2#readme"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-facebook-^2.1.1" = nodeEnv.buildNodePackage { name = "passport-facebook"; @@ -16060,8 +16717,9 @@ in sha1 = "c39d0b52ae4d59163245a4e21a7b9b6321303311"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16073,7 +16731,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-github-^1.1.0" = nodeEnv.buildNodePackage { name = "passport-github"; @@ -16084,8 +16742,9 @@ in sha1 = "8ce1e3fcd61ad7578eb1df595839e4aea12355d4"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16097,7 +16756,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-gitlab2-^4.0.0" = nodeEnv.buildNodePackage { name = "passport-gitlab2"; @@ -16108,8 +16767,9 @@ in sha512 = "C/8/L8piHwv57J6fY/MzsEJc8yCkgsyBSzMWxfTfEHRvCaTkD08vJ5b/txydKrWrRPl4MHuZfisFnKlZHmq4yw=="; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16121,7 +16781,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-google-oauth20-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-google-oauth20"; @@ -16132,8 +16792,9 @@ in sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0"; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" - sources."passport-oauth2-1.4.0" + sources."passport-oauth2-1.5.0" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" sources."utils-merge-1.0.1" @@ -16145,27 +16806,27 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-ldapauth-^2.0.0" = nodeEnv.buildNodePackage { name = "passport-ldapauth"; packageName = "passport-ldapauth"; - version = "2.0.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-2.0.0.tgz"; - sha1 = "42dff004417185d0a4d9f776a3eed8d4731fd689"; + url = "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-2.1.3.tgz"; + sha512 = "23n425UTasN6XhcXG0qQ0h0YrS/zfo8kNIEhSLfPsNpglhYhhQFfB1pmDc5RrH+Kiz5fKLkki5BpvkKHCwkixg=="; }; dependencies = [ sources."@types/body-parser-1.17.0" sources."@types/connect-3.4.32" - sources."@types/events-1.2.0" - sources."@types/express-4.16.0" - sources."@types/express-serve-static-core-4.16.0" + sources."@types/events-3.0.0" + sources."@types/express-4.16.1" + sources."@types/express-serve-static-core-4.16.2" sources."@types/ldapjs-1.0.3" - sources."@types/mime-2.0.0" - sources."@types/node-7.0.68" - sources."@types/passport-0.3.5" - sources."@types/range-parser-1.2.2" + sources."@types/mime-2.0.1" + sources."@types/node-10.14.4" + sources."@types/passport-1.0.0" + sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -16187,21 +16848,20 @@ in sources."assert-plus-0.1.5" ]; }) - sources."ldapauth-fork-4.0.2" + sources."ldapauth-fork-4.2.0" sources."ldapjs-1.0.2" - sources."lru-cache-4.1.3" + sources."lru-cache-5.1.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.2" + sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.10.0" + sources."nan-2.13.2" sources."ncp-2.0.0" sources."once-1.4.0" sources."passport-strategy-1.0.0" sources."path-is-absolute-1.0.1" sources."precond-0.2.3" - sources."pseudomap-1.0.2" sources."rimraf-2.4.5" sources."safe-json-stringify-1.2.0" (sources."vasync-1.6.4" // { @@ -16211,7 +16871,7 @@ in }) sources."verror-1.10.0" sources."wrappy-1.0.2" - sources."yallist-2.1.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -16220,7 +16880,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-local-^1.0.0" = nodeEnv.buildNodePackage { name = "passport-local"; @@ -16238,17 +16898,18 @@ in description = "Local username and password authentication strategy for Passport."; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-oauth2-^1.4.0" = nodeEnv.buildNodePackage { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; - sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; + sha512 = "kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ=="; }; dependencies = [ + sources."base64url-3.0.1" sources."oauth-0.9.15" sources."passport-strategy-1.0.0" sources."uid2-0.0.3" @@ -16261,7 +16922,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-twitter-^1.0.4" = nodeEnv.buildNodePackage { name = "passport-twitter"; @@ -16286,7 +16947,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport-saml-^0.31.0" = nodeEnv.buildNodePackage { name = "passport-saml"; @@ -16297,10 +16958,10 @@ in sha1 = "e4d654cab30f018bfd39056efe7bcfa770aab463"; }; dependencies = [ - sources."async-2.6.1" + sources."async-2.6.2" sources."ejs-2.6.1" - sources."lodash-4.17.10" - sources."node-forge-0.7.5" + sources."lodash-4.17.11" + sources."node-forge-0.7.6" sources."passport-strategy-1.0.0" sources."q-1.5.1" sources."sax-1.2.4" @@ -16323,7 +16984,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "passport.socketio-^3.7.0" = nodeEnv.buildNodePackage { name = "passport.socketio"; @@ -16343,15 +17004,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pdfobject-^2.0.201604172" = nodeEnv.buildNodePackage { name = "pdfobject"; packageName = "pdfobject"; - version = "2.0.201604172"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pdfobject/-/pdfobject-2.0.201604172.tgz"; - sha1 = "112edf93b98be121a5e780b06e7f5f78ad31ab3f"; + url = "https://registry.npmjs.org/pdfobject/-/pdfobject-2.1.1.tgz"; + sha512 = "QFktTHyjs4q/WhGFfV2RdAbscPdNkyQb/JfFz18cwILvs9ocDiYVFAEh/jgkKGv6my+r4nlbLjwj7BHFKAupHQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -16360,7 +17021,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pg-^6.1.2" = nodeEnv.buildNodePackage { name = "pg"; @@ -16381,10 +17042,10 @@ in sources."pg-pool-1.8.0" sources."pg-types-1.13.0" sources."pgpass-1.0.2" - sources."postgres-array-1.0.2" + sources."postgres-array-1.0.3" sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.3" - sources."postgres-interval-1.1.2" + sources."postgres-date-1.0.4" + sources."postgres-interval-1.2.0" sources."semver-4.3.2" sources."split-1.0.1" sources."through-2.3.8" @@ -16397,7 +17058,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "pg-hstore-^2.3.2" = nodeEnv.buildNodePackage { name = "pg-hstore"; @@ -16416,22 +17077,22 @@ in homepage = https://github.com/scarney81/pg-hstore; }; production = true; - bypassCache = false; + bypassCache = true; }; "prismjs-^1.6.0" = nodeEnv.buildNodePackage { name = "prismjs"; packageName = "prismjs"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz"; - sha512 = "Lf2JrFYx8FanHrjoV5oL8YHCclLQgbJcVZR+gikGGMqz6ub5QVWDTM6YIwm3BuPxM/LOV+rKns3LssXNLIf+DA=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.16.0.tgz"; + sha512 = "OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA=="; }; dependencies = [ - sources."clipboard-2.0.1" + sources."clipboard-2.0.4" sources."delegate-3.2.0" sources."good-listener-1.2.2" sources."select-1.1.2" - sources."tiny-emitter-2.0.2" + sources."tiny-emitter-2.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -16440,33 +17101,33 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "randomcolor-^0.5.3" = nodeEnv.buildNodePackage { name = "randomcolor"; packageName = "randomcolor"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.3.tgz"; - sha1 = "7f90f2f2a7f6d5a52232161eeaeeaea9ac3b5815"; + url = "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.4.tgz"; + sha512 = "nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA=="; }; buildInputs = globalBuildInputs; meta = { description = "A tiny script for generating attractive random colors"; - homepage = https://randomcolor.llllll.li/; + homepage = https://randomcolor.lllllllllllllllll.com/; license = "CC0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "raphael-git+https://github.com/dmitrybaranovskiy/raphael" = nodeEnv.buildNodePackage { name = "raphael"; packageName = "raphael"; - version = "2.2.7"; + version = "2.2.8"; src = fetchgit { url = "https://github.com/dmitrybaranovskiy/raphael"; - rev = "527c51b7b12f846f9ab0d5ddf14767912b569c7d"; - sha256 = "a9c2dece0218d3c82ad624fd55d7f81b7696fd0415bc0f52429f2d09497b25d8"; + rev = "bf3dcd35317f76f915bcd04ed9db36a1b3775c4d"; + sha256 = "79245aeeab138e9a5137196d290536394bd376bbd0e92883c91d7cee9bea3274"; }; dependencies = [ sources."eve-raphael-0.5.0" @@ -16478,7 +17139,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "readline-sync-^1.4.7" = nodeEnv.buildNodePackage { name = "readline-sync"; @@ -16495,60 +17156,65 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "request-^2.79.0" = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; dependencies = [ - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" ]; @@ -16559,7 +17225,7 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; "reveal.js-~3.6.0" = nodeEnv.buildNodePackage { name = "reveal.js"; @@ -16576,7 +17242,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "scrypt-^6.0.3" = nodeEnv.buildNodePackage { name = "scrypt"; @@ -16587,7 +17253,7 @@ in sha1 = "04e014a5682b53fa50c2d5cce167d719c06d870d"; }; dependencies = [ - sources."nan-2.10.0" + sources."nan-2.13.2" ]; buildInputs = globalBuildInputs; meta = { @@ -16596,7 +17262,7 @@ in license = "zlib"; }; production = true; - bypassCache = false; + bypassCache = true; }; "select2-^3.5.2-browserify" = nodeEnv.buildNodePackage { name = "select2"; @@ -16612,30 +17278,30 @@ in homepage = http://ivaynberg.github.io/select2; }; production = true; - bypassCache = false; + bypassCache = true; }; "sequelize-^3.28.0" = nodeEnv.buildNodePackage { name = "sequelize"; packageName = "sequelize"; - version = "3.33.0"; + version = "3.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/sequelize/-/sequelize-3.33.0.tgz"; - sha1 = "b0eb12b87223aded10e50a9d78506e0dd42f9208"; + url = "https://registry.npmjs.org/sequelize/-/sequelize-3.34.0.tgz"; + sha512 = "smJMYZ+JniYZ2Ja4GPaEC0/mkvCNnRl7mM958hZQP9dpXNbSS/wPFUNrn0mnfpWRk8Ob/3zo0H1qxQbXKgcIzw=="; }; dependencies = [ sources."@types/geojson-1.0.6" - sources."bluebird-3.5.1" + sources."bluebird-3.5.4" sources."debug-2.6.9" sources."depd-1.1.2" sources."dottie-1.1.1" sources."generic-pool-2.4.2" sources."inflection-1.12.0" - sources."lodash-4.17.10" - sources."moment-2.22.2" - sources."moment-timezone-0.5.21" + sources."lodash-4.17.11" + sources."moment-2.24.0" + sources."moment-timezone-0.5.23" sources."ms-2.0.0" sources."retry-as-promised-2.3.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."shimmer-1.1.0" sources."terraformer-1.0.9" sources."terraformer-wkt-parser-1.2.0" @@ -16651,7 +17317,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "sequelize-cli-^2.5.1" = nodeEnv.buildNodePackage { name = "sequelize-cli"; @@ -16677,7 +17343,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.2.1" sources."assign-symbols-1.0.0" - sources."atob-2.1.1" + sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -16686,10 +17352,9 @@ in ]; }) sources."beeper-1.1.1" - sources."bluebird-3.5.1" + sources."bluebird-3.5.4" sources."brace-expansion-1.1.11" sources."braces-1.8.5" - sources."builtin-modules-1.1.1" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -16726,15 +17391,15 @@ in sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-support-1.1.3" - sources."commander-2.16.0" + sources."commander-2.20.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."config-chain-1.1.11" + sources."config-chain-1.1.12" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" (sources."cross-spawn-5.1.0" // { dependencies = [ - sources."lru-cache-4.1.3" + sources."lru-cache-4.1.5" ]; }) sources."d-1.0.0" @@ -16751,15 +17416,15 @@ in sources."deprecated-0.0.1" sources."detect-file-0.1.0" sources."duplexer2-0.0.2" - (sources."editorconfig-0.13.3" // { + (sources."editorconfig-0.15.3" // { dependencies = [ - sources."lru-cache-3.2.0" - sources."semver-5.5.0" + sources."lru-cache-4.1.5" + sources."semver-5.7.0" ]; }) sources."end-of-stream-0.1.5" sources."error-ex-1.3.2" - sources."es5-ext-0.10.45" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -16776,24 +17441,25 @@ in ]; }) sources."extglob-0.3.2" - sources."fancy-log-1.3.2" + sources."fancy-log-1.3.3" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."find-index-0.1.1" sources."find-up-2.1.0" sources."findup-sync-1.0.0" - (sources."fined-1.1.0" // { + (sources."fined-1.1.1" // { dependencies = [ sources."expand-tilde-2.0.2" ]; }) sources."first-chunk-stream-1.0.0" - sources."flagged-respawn-1.0.0" + sources."flagged-respawn-1.0.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fs-exists-sync-0.1.0" sources."fs-extra-4.0.3" + sources."fs.realpath-1.0.0" sources."gaze-0.5.2" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -16821,8 +17487,8 @@ in sources."minimatch-0.2.14" ]; }) - sources."glogg-1.0.1" - sources."graceful-fs-4.1.11" + sources."glogg-1.0.2" + sources."graceful-fs-4.1.15" sources."gulp-3.9.1" sources."gulp-help-1.6.1" sources."gulp-util-3.0.8" @@ -16844,12 +17510,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."interpret-1.1.0" + sources."interpret-1.2.0" sources."invert-kv-1.0.0" (sources."is-absolute-1.0.0" // { dependencies = [ @@ -16863,7 +17529,6 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" @@ -16897,7 +17562,12 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-beautify-1.7.5" + (sources."js-beautify-1.9.1" // { + dependencies = [ + sources."glob-7.1.3" + sources."minimatch-3.0.4" + ]; + }) sources."jsonfile-4.0.0" sources."kind-of-3.2.2" sources."lcid-1.0.0" @@ -16967,7 +17637,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lodash._basecopy-3.0.1" sources."lodash._basetostring-3.0.1" sources."lodash._basevalues-3.0.0" @@ -16993,9 +17663,9 @@ in }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."math-random-1.0.1" + sources."math-random-1.0.4" sources."mem-1.1.0" - sources."memoizee-0.4.12" + sources."memoizee-0.4.14" sources."micromatch-2.3.11" sources."mimic-fn-1.2.0" sources."minimatch-2.0.10" @@ -17010,7 +17680,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.22.2" + sources."moment-2.24.0" sources."ms-2.0.0" sources."multipipe-0.1.2" (sources."nanomatch-1.2.13" // { @@ -17021,10 +17691,10 @@ in sources."kind-of-6.0.2" ]; }) - sources."natives-1.1.4" + sources."natives-1.1.6" sources."next-tick-1.0.0" - sources."nopt-3.0.6" - sources."normalize-package-data-2.4.0" + sources."nopt-4.0.1" + sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -17068,6 +17738,8 @@ in sources."ordered-read-streams-0.1.0" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" sources."p-finally-1.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" @@ -17075,11 +17747,13 @@ in sources."parse-filepath-1.0.2" sources."parse-glob-3.0.4" sources."parse-json-2.2.0" + sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."path-parse-1.0.5" + sources."path-parse-1.0.6" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-type-2.0.0" @@ -17090,7 +17764,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - (sources."randomatic-3.0.0" // { + (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" sources."kind-of-6.0.2" @@ -17108,12 +17782,12 @@ in sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.2" + sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.8.1" + sources."resolve-1.10.0" sources."resolve-dir-0.1.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -17160,10 +17834,10 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."sparkles-1.0.1" - sources."spdx-correct-3.0.0" - sources."spdx-exceptions-2.1.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.0" + sources."spdx-license-ids-3.0.4" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -17195,7 +17869,7 @@ in sources."strip-bom-1.0.0" sources."strip-eof-1.0.0" sources."supports-color-2.0.0" - (sources."through2-2.0.3" // { + (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" @@ -17203,7 +17877,7 @@ in }) sources."tildify-1.2.0" sources."time-stamp-1.1.0" - sources."timers-ext-0.1.5" + sources."timers-ext-0.1.7" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" (sources."to-regex-range-2.1.1" // { @@ -17237,7 +17911,7 @@ in sources."user-home-1.1.1" sources."util-deprecate-1.0.2" sources."v8flags-2.1.1" - sources."validate-npm-package-license-3.0.3" + sources."validate-npm-package-license-3.0.4" sources."vinyl-0.5.3" (sources."vinyl-fs-0.3.14" // { dependencies = [ @@ -17270,7 +17944,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "shortid-2.2.8" = nodeEnv.buildNodePackage { name = "shortid"; @@ -17287,7 +17961,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "socket.io-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io"; @@ -17306,7 +17980,7 @@ in sources."base64-arraybuffer-0.1.5" sources."base64id-1.0.0" sources."better-assert-1.0.2" - sources."blob-0.0.4" + sources."blob-0.0.5" sources."callsite-1.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -17323,13 +17997,13 @@ in sources."debug-3.1.0" ]; }) - sources."engine.io-parser-2.1.2" + sources."engine.io-parser-2.1.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."object-component-0.0.3" @@ -17357,7 +18031,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "socket.io-client-~2.0.4" = nodeEnv.buildNodePackage { name = "socket.io-client"; @@ -17374,7 +18048,7 @@ in sources."backo2-1.0.2" sources."base64-arraybuffer-0.1.5" sources."better-assert-1.0.2" - sources."blob-0.0.4" + sources."blob-0.0.5" sources."callsite-1.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -17385,7 +18059,7 @@ in sources."debug-3.1.0" ]; }) - sources."engine.io-parser-2.1.2" + sources."engine.io-parser-2.1.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."indexof-0.0.1" @@ -17413,7 +18087,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "spin.js-^2.3.2" = nodeEnv.buildNodePackage { name = "spin.js"; @@ -17430,19 +18104,19 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "sqlite3-^4.0.1" = nodeEnv.buildNodePackage { name = "sqlite3"; packageName = "sqlite3"; - version = "4.0.2"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.2.tgz"; - sha512 = "51ferIRwYOhzUEtogqOa/y9supADlAht98bF/gbIi6WkzRJX6Yioldxbzj1MV4yV+LgdKD/kkHwFTeFXOG4htA=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.6.tgz"; + sha512 = "EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -17450,15 +18124,14 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."caseless-0.12.0" - sources."chownr-1.0.1" - sources."co-4.6.0" + sources."chownr-1.1.1" sources."code-point-at-1.1.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" @@ -17471,20 +18144,20 @@ in sources."ecc-jsbn-0.1.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.2" + sources."glob-7.1.3" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."has-unicode-2.0.1" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -17495,26 +18168,26 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.3.3" - sources."minizlib-1.1.0" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."nan-2.10.0" - sources."needle-2.2.1" - sources."node-pre-gyp-0.10.3" + sources."needle-2.2.4" + sources."node-pre-gyp-0.11.0" sources."nopt-4.0.1" - sources."npm-bundled-1.0.3" - sources."npm-packlist-1.1.11" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-homedir-1.0.2" @@ -17523,7 +18196,8 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" (sources."rc-1.2.8" // { dependencies = [ @@ -17531,29 +18205,34 @@ in ]; }) sources."readable-stream-2.3.6" - sources."request-2.87.0" - sources."rimraf-2.6.2" + sources."request-2.88.0" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" 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-4.4.6" - sources."tough-cookie-2.3.4" + sources."tar-4.4.8" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" sources."wide-align-1.1.3" sources."wrappy-1.0.2" - sources."yallist-3.0.2" + sources."yallist-3.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -17562,7 +18241,7 @@ in license = "BSD-3-Clause"; }; production = true; - bypassCache = false; + bypassCache = true; }; "store-^2.0.12" = nodeEnv.buildNodePackage { name = "store"; @@ -17579,7 +18258,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "string-^3.3.3" = nodeEnv.buildNodePackage { name = "string"; @@ -17596,7 +18275,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "tedious-^1.14.0" = nodeEnv.buildNodePackage { name = "tedious"; @@ -17610,10 +18289,10 @@ in sources."babel-runtime-6.26.0" sources."big-number-0.3.1" sources."bl-1.2.2" - sources."core-js-2.5.7" + sources."core-js-2.6.5" sources."core-util-is-1.0.2" sources."dns-lookup-all-1.0.2" - sources."iconv-lite-0.4.23" + sources."iconv-lite-0.4.24" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-2.0.0" @@ -17621,7 +18300,7 @@ in sources."regenerator-runtime-0.11.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.0" + sources."semver-5.7.0" sources."sprintf-0.1.5" sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" @@ -17633,7 +18312,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "to-markdown-^3.0.3" = nodeEnv.buildNodePackage { name = "to-markdown"; @@ -17647,85 +18326,86 @@ in sources."abab-1.0.4" sources."acorn-4.0.13" sources."acorn-globals-3.1.0" - sources."ajv-5.5.2" + sources."ajv-6.10.0" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" + sources."aws4-1.8.0" sources."bcrypt-pbkdf-1.0.2" sources."block-elements-1.2.0" sources."caseless-0.12.0" - sources."co-4.6.0" sources."collapse-whitespace-1.1.2" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."content-type-parser-1.0.2" sources."core-util-is-1.0.2" - sources."cssom-0.3.4" + sources."cssom-0.3.6" sources."cssstyle-0.2.37" sources."dashdash-1.14.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."html-encoding-sniffer-1.0.2" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.24" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-9.12.0" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."mime-db-1.35.0" - sources."mime-types-2.1.19" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."nwmatcher-1.4.4" - sources."oauth-sign-0.8.2" + sources."oauth-sign-0.9.0" sources."optionator-0.8.2" sources."parse5-1.5.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.1.29" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."request-2.87.0" // { + (sources."request-2.88.0" // { dependencies = [ - sources."tough-cookie-2.3.4" + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" ]; }) sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."source-map-0.6.1" - sources."sshpk-1.14.2" + sources."sshpk-1.16.1" sources."symbol-tree-3.2.2" - sources."tough-cookie-2.4.3" + sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."uri-js-4.2.2" sources."uuid-3.3.2" sources."verror-1.10.0" sources."void-elements-2.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-encoding-1.0.3" + sources."whatwg-encoding-1.0.5" (sources."whatwg-url-4.8.0" // { dependencies = [ sources."webidl-conversions-3.0.1" @@ -17741,7 +18421,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "toobusy-js-^0.5.1" = nodeEnv.buildNodePackage { name = "toobusy-js"; @@ -17758,7 +18438,7 @@ in license = "WTFPL"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uuid-^3.1.0" = nodeEnv.buildNodePackage { name = "uuid"; @@ -17775,7 +18455,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "uws-~0.14.1" = nodeEnv.buildNodePackage { name = "uws"; @@ -17792,24 +18472,24 @@ in license = "Zlib"; }; production = true; - bypassCache = false; + bypassCache = true; }; "validator-^10.4.0" = nodeEnv.buildNodePackage { name = "validator"; packageName = "validator"; - version = "10.5.0"; + version = "10.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz"; - sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ=="; + url = "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz"; + sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; buildInputs = globalBuildInputs; meta = { description = "String validation and sanitization"; - homepage = http://github.com/chriso/validator.js; + homepage = https://github.com/chriso/validator.js; license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "velocity-animate-^1.4.0" = nodeEnv.buildNodePackage { name = "velocity-animate"; @@ -17826,7 +18506,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "visibilityjs-^1.2.4" = nodeEnv.buildNodePackage { name = "visibilityjs"; @@ -17843,7 +18523,7 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "viz.js-^1.7.0" = nodeEnv.buildNodePackage { name = "viz.js"; @@ -17860,15 +18540,15 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "winston-^2.3.0" = nodeEnv.buildNodePackage { name = "winston"; packageName = "winston"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz"; - sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz"; + sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q=="; }; dependencies = [ sources."async-1.0.0" @@ -17885,18 +18565,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; "xss-^1.0.3" = nodeEnv.buildNodePackage { name = "xss"; packageName = "xss"; - version = "1.0.3"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.3.tgz"; - sha512 = "LTpz3jXPLUphMMmyufoZRSKnqMj41OVypZ8uYGzvjkMV9C1EdACrhQl/EM8Qfh5htSAuMIQFOejmKAZGkJfaCg=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.6.tgz"; + sha512 = "6Q9TPBeNyoTRxgZFk5Ggaepk/4vUOYdOsIUYvLehcsIZTFjaavbVnsuAkLA5lIFuug5hw8zxcB9tm01gsjph2A=="; }; dependencies = [ - sources."commander-2.16.0" + sources."commander-2.20.0" sources."cssfilter-0.0.10" ]; buildInputs = globalBuildInputs; @@ -17906,6 +18586,6 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/servers/web-apps/codimd/node.nix b/nixpkgs/pkgs/servers/web-apps/codimd/node.nix index 8f3be4cc8c7f..abcf470ca088 100644 --- a/nixpkgs/pkgs/servers/web-apps/codimd/node.nix +++ b/nixpkgs/pkgs/servers/web-apps/codimd/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix index 88e183bc3f25..42df8f62ef57 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -70,7 +70,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -78,13 +78,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -92,13 +92,13 @@ lib.makeScope newScope (self: with self; { sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -106,13 +106,13 @@ lib.makeScope newScope (self: with self; { sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -120,13 +120,13 @@ lib.makeScope newScope (self: with self; { sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -134,8 +134,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -153,7 +153,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -161,13 +161,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -175,13 +175,13 @@ lib.makeScope newScope (self: with self; { sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -189,13 +189,13 @@ lib.makeScope newScope (self: with self; { sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -203,13 +203,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -217,13 +217,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -231,13 +231,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -245,13 +245,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -259,13 +259,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -273,13 +273,13 @@ lib.makeScope newScope (self: with self; { sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -287,13 +287,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -301,13 +301,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -315,13 +315,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -329,13 +329,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -343,13 +343,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -357,13 +357,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -371,13 +371,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -385,13 +385,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -399,13 +399,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -413,13 +413,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -427,13 +427,13 @@ lib.makeScope newScope (self: with self; { sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -441,13 +441,13 @@ lib.makeScope newScope (self: with self; { sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -455,13 +455,13 @@ lib.makeScope newScope (self: with self; { sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -469,13 +469,13 @@ lib.makeScope newScope (self: with self; { sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -483,13 +483,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -497,13 +497,13 @@ lib.makeScope newScope (self: with self; { sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -511,13 +511,13 @@ lib.makeScope newScope (self: with self; { sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -525,8 +525,8 @@ lib.makeScope newScope (self: with self; { sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -557,7 +557,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -565,13 +565,13 @@ lib.makeScope newScope (self: with self; { sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; + nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -579,8 +579,8 @@ lib.makeScope newScope (self: with self; { sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ pkgconfig mkfontscale ]; + buildInputs = [ ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -625,11 +625,11 @@ lib.makeScope newScope (self: with self; { }) {}; imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "imake-1.0.7"; + name = "imake-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; - sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; + url = mirror://xorg/individual/util/imake-1.0.8.tar.bz2; + sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -651,11 +651,11 @@ lib.makeScope newScope (self: with self; { }) {}; libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation { - name = "libFS-1.0.7"; + name = "libFS-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; - sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; + url = mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2; + sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -768,11 +768,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXcomposite-0.4.4"; + name = "libXcomposite-0.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; - sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; + url = mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2; + sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -781,11 +781,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation { - name = "libXcursor-1.1.15"; + name = "libXcursor-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2; - sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"; + url = mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2; + sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -794,11 +794,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation { - name = "libXdamage-1.1.4"; + name = "libXdamage-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; - sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; + url = mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2; + sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -807,11 +807,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXdmcp-1.1.2"; + name = "libXdmcp-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2; - sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1"; + url = mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2; + sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -820,11 +820,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "libXext-1.3.3"; + name = "libXext-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; - sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; + url = mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2; + sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -872,11 +872,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { - name = "libXft-2.3.2"; + name = "libXft-2.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; - sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; + url = mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2; + sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -911,11 +911,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { - name = "libXmu-1.1.2"; + name = "libXmu-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; - sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; + url = mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2; + sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -936,7 +936,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation { + libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "libXpm-3.5.12"; builder = ./builder.sh; src = fetchurl { @@ -944,7 +944,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -963,11 +963,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation { - name = "libXrandr-1.5.1"; + name = "libXrandr-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; - sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; + url = mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2; + sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1041,11 +1041,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { - name = "libXvMC-1.0.10"; + name = "libXvMC-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; - sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; + url = mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2; + sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation { - name = "libXxf86dga-1.1.4"; + name = "libXxf86dga-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; - sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; + url = mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2; + sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1106,11 +1106,11 @@ lib.makeScope newScope (self: with self; { }) {}; libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { - name = "libfontenc-1.1.3"; + name = "libfontenc-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; - sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; + url = mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2; + sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; { }) {}; libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { - name = "libxkbfile-1.0.9"; + name = "libxkbfile-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; - sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; + url = mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2; + sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1210,11 +1210,11 @@ lib.makeScope newScope (self: with self; { }) {}; luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "luit-20181211"; + name = "luit-20190106"; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp.invisible-island.net/luit/luit-20181211.tgz; - sha256 = "18mf3savxjs29hf4xhhc5h278qy0bbj9ddssx44w0bnlg107jhp1"; + url = https://invisible-mirror.net/archives/luit/luit-20190106.tgz; + sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1223,11 +1223,11 @@ lib.makeScope newScope (self: with self; { }) {}; makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "makedepend-1.0.5"; + name = "makedepend-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; - sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; + url = mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2; + sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1235,25 +1235,12 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - mkfontdir = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "mkfontdir-1.0.7"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2; - sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; - }; - hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ]; - meta.platforms = stdenv.lib.platforms.unix; - }) {}; - mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation { - name = "mkfontscale-1.1.3"; + name = "mkfontscale-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2; - sha256 = "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y"; + url = mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2; + sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1261,7 +1248,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { + oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation { name = "oclock-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1270,7 +1257,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXmu libXt ]; + buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1366,11 +1353,11 @@ lib.makeScope newScope (self: with self; { }) {}; x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation { - name = "x11perf-1.6.0"; + name = "x11perf-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; - sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; + url = mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2; + sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1443,7 +1430,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1452,11 +1439,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1465,11 +1452,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil ]; + buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1478,7 +1465,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb xcbproto ]; + buildInputs = [ gperf m4 libxcb xcbproto xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1508,7 +1495,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1517,11 +1504,11 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1530,16 +1517,16 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gperf m4 libxcb ]; + buildInputs = [ gperf m4 libxcb xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xclock-1.0.7"; + name = "xclock-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; - sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; + url = mirror://xorg/individual/app/xclock-1.0.8.tar.bz2; + sha256 = "0m92zhamh15my9f2rqa14q41d6k2cn468azm3g7g3w9n7942024k"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1561,11 +1548,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { - name = "xcompmgr-1.1.7"; + name = "xcompmgr-1.1.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; - sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; + url = mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2; + sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1638,7 +1625,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation { + xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1647,16 +1634,16 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto libX11 ]; + buildInputs = [ libGL xorgproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { - name = "xev-1.2.2"; + name = "xev-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; - sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; + url = mirror://xorg/individual/app/xev-1.2.3.tar.bz2; + sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1677,7 +1664,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation { + xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.6"; builder = ./builder.sh; src = fetchurl { @@ -1686,7 +1673,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto udev xorgserver ]; + buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1716,7 +1703,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation { + xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { name = "xf86-input-libinput-0.28.2"; builder = ./builder.sh; src = fetchurl { @@ -1725,7 +1712,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto xorgserver ]; + buildInputs = [ xorgproto libinput xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1742,7 +1729,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { + xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.1"; builder = ./builder.sh; src = fetchurl { @@ -1751,7 +1738,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto libX11 libXi xorgserver libXtst ]; + buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1782,11 +1769,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-amdgpu-18.1.0"; + name = "xf86-video-amdgpu-19.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2; - sha256 = "0wlnb929l3yqj4hdkzyxyhbaph13ac4villajgmbh66pa6xja7z1"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2; + sha256 = "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1833,16 +1820,16 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-ati-18.0.1"; + xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-ati-19.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2; - sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"; + url = mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2; + sha256 = "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; + buildInputs = [ xorgproto mesa_noglu libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1963,7 +1950,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + 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 { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -1972,7 +1959,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; + 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; }) {}; @@ -2353,6 +2340,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation { + name = "xfd-1.1.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xfd-1.1.3.tar.bz2; + sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xfontsel-1.0.6"; builder = ./builder.sh; @@ -2379,6 +2379,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xfsinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + name = "xfsinfo-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2; + sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libFS xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; @@ -2406,11 +2419,11 @@ lib.makeScope newScope (self: with self; { }) {}; xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xhost-1.0.7"; + name = "xhost-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; - sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; + url = mirror://xorg/individual/app/xhost-1.0.8.tar.bz2; + sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2522,7 +2535,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation { + xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation { name = "xload-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2530,17 +2543,17 @@ lib.makeScope newScope (self: with self; { sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; }; hardeningDisable = [ "bindnow" "relro" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsatoms-1.1.2"; + name = "xlsatoms-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; - sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; + url = mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2; + sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2601,11 +2614,11 @@ lib.makeScope newScope (self: with self; { }) {}; xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xmodmap-1.0.9"; + name = "xmodmap-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; - sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; + url = mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2; + sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2613,6 +2626,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xmore = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { + name = "xmore-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xmore-1.0.3.tar.bz2; + sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXaw libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; @@ -2692,11 +2718,11 @@ lib.makeScope newScope (self: with self; { }) {}; xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xprop-1.2.3"; + name = "xprop-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xprop-1.2.3.tar.bz2; - sha256 = "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj"; + url = mirror://xorg/individual/app/xprop-1.2.4.tar.bz2; + sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2718,11 +2744,11 @@ lib.makeScope newScope (self: with self; { }) {}; xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xrdb-1.1.1"; + name = "xrdb-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2; - sha256 = "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd"; + url = mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2; + sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2782,12 +2808,25 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xstdcmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xstdcmap-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2; + sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { - name = "xtrans-1.3.5"; + name = "xtrans-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2; - sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; + url = mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2; + sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2809,11 +2848,11 @@ lib.makeScope newScope (self: with self; { }) {}; xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { - name = "xvinfo-1.1.3"; + name = "xvinfo-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; - sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; + url = mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2; + sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2821,7 +2860,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { + xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation { name = "xwd-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -2830,7 +2869,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 xorgproto ]; + buildInputs = [ libxkbfile libX11 xorgproto ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 938b0b7b2f96..bb0d1b595517 100755 --- a/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -26,7 +26,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" ); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; @@ -35,11 +35,13 @@ $pcMap{"dbus-1"} = "dbus"; $pcMap{"uuid"} = "libuuid"; $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "libGL"; +$pcMap{"GL"} = "libGL"; $pcMap{"gbm"} = "mesa_noglu"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; $pcMap{"\$DRI2PROTO"} = "xorgproto"; +$pcMap{"\${XKBMODULE}"} = "libxkbfile"; my $downloadCache = "./download-cache"; @@ -149,15 +151,15 @@ while (<>) { } if ($file =~ /AC_PATH_PROG\(BDFTOPCF/) { - push @requires, "bdftopcf"; + push @nativeRequires, "bdftopcf"; } if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/) { - push @requires, "mkfontscale"; + push @nativeRequires, "mkfontscale"; } if ($file =~ /AC_PATH_PROG\(MKFONTDIR/) { - push @requires, "mkfontdir"; + push @nativeRequires, "mkfontscale"; } if ($file =~ /AM_PATH_PYTHON/) { @@ -173,17 +175,17 @@ while (<>) { my $isFont; if ($file =~ /XORG_FONT_BDF_UTILS/) { - push @requires, "bdftopcf", "mkfontdir"; + push @nativeRequires, "bdftopcf", "mkfontscale"; $isFont = 1; } if ($file =~ /XORG_FONT_SCALED_UTILS/) { - push @requires, "mkfontscale", "mkfontdir"; + push @nativeRequires, "mkfontscale"; $isFont = 1; } if ($file =~ /XORG_FONT_UCS2ANY/) { - push @requires, "fontutil", "mkfontscale"; + push @nativeRequires, "fontutil", "mkfontscale"; $isFont = 1; } @@ -213,6 +215,7 @@ while (<>) { #process \@requires, $1 while $file =~ /PKG_CHECK_MODULES\([^,]*,\s*[\[]?([^\)\[]*)/g; process \@requires, $1 while $file =~ /PKG_CHECK_MODULES\([^,]*,([^\)\,]*)/g; + process \@requires, $1 while $file =~ /AC_SEARCH_LIBS\([^,]*,([^\)\,]*)/g; process \@requires, $1 while $file =~ /MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /REQUIRED_LIBS=\"(.*)\"/g; process \@requires, $1 while $file =~ /REQUIRED_MODULES=\"(.*)\"/g; @@ -224,6 +227,7 @@ while (<>) { process \@requires, $1 while $file =~ /ivo_requires=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; + push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/; push @requires, "libxslt" if $pkg =~ /libxcb/; push @requires, "gperf", "m4", "xorgproto" if $pkg =~ /xcbutil/; diff --git a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index e7e4c86e6a29..068130f9c768 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -49,10 +49,6 @@ self: super: meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; }; }); - fontcursormisc = super.fontcursormisc.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.mkfontscale ]; - }); - fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: { postInstall = '' @@ -74,9 +70,7 @@ self: super: inherit tradcpp; }); - mkfontdir = super.mkfontdir.overrideAttrs (attrs: { - preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin"; - }); + mkfontdir = self.mkfontscale; libxcb = super.libxcb.overrideAttrs (attrs: { configureFlags = [ "--enable-xkb" "--enable-xinput" ]; @@ -288,10 +282,6 @@ self: super: meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; }; }); - oclock = super.oclock.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.libxkbfile ]; - }); - setxkbmap = super.setxkbmap.overrideAttrs (attrs: { postInstall = '' @@ -337,7 +327,6 @@ self: super: outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = "sdkdir=\${out}/include/xorg"; - buildInputs = attrs.buildInputs ++ [ mtdev libevdev ]; }); xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: { @@ -349,19 +338,12 @@ self: super: }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec { - name = "xf86-input-libinput-0.28.0"; - src = fetchurl { - url = "mirror://xorg/individual/driver/${name}.tar.bz2"; - sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691"; - }; outputs = [ "out" "dev" ]; - buildInputs = attrs.buildInputs ++ [ libinput ]; installFlags = "sdkdir=\${dev}/include/xorg"; }); xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev - buildInputs = attrs.buildInputs ++ [mtdev libevdev]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; }); @@ -426,7 +408,7 @@ self: super: }); xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [intltool]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [intltool]; #TODO: resurrect patches for US_intl? patches = [ ./xkeyboard-config-eo.patch ]; @@ -614,8 +596,16 @@ self: super: })); lndir = super.lndir.overrideAttrs (attrs: { + buildInputs = []; preConfigure = '' + export XPROTO_CFLAGS=" " + export XPROTO_LIBS=" " substituteInPlace lndir.c \ + --replace '<X11/Xos.h>' '<string.h>' \ + --replace '<X11/Xfuncproto.h>' '<unistd.h>' \ + --replace '_X_ATTRIBUTE_PRINTF(1,2)' '__attribute__((__format__(__printf__,1,2)))' \ + --replace '_X_ATTRIBUTE_PRINTF(2,3)' '__attribute__((__format__(__printf__,2,3)))' \ + --replace '_X_NORETURN' '__attribute__((noreturn))' \ --replace 'n_dirs--;' "" ''; }); @@ -690,7 +680,7 @@ self: super: }); xwd = super.xwd.overrideAttrs (attrs: { - buildInputs = with self; attrs.buildInputs ++ [libXt libxkbfile]; + buildInputs = with self; attrs.buildInputs ++ [libXt]; }); xrdb = super.xrdb.overrideAttrs (attrs: { diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 06f7c2b93a8c..c1ffd610eb1b 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -1,4 +1,4 @@ -ftp://ftp.invisible-island.net/luit/luit-20181211.tgz +https://invisible-mirror.net/archives/luit/luit-20190106.tgz https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 @@ -17,8 +17,7 @@ mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 mirror://xorg/individual/app/ico-1.0.5.tar.bz2 mirror://xorg/individual/app/listres-1.0.4.tar.bz2 -mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2 mirror://xorg/individual/app/oclock-1.0.4.tar.bz2 mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 @@ -26,25 +25,27 @@ mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/transset-1.0.2.tar.bz2 mirror://xorg/individual/app/twm-1.0.10.tar.bz2 mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 -mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 +mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 +mirror://xorg/individual/app/xclock-1.0.8.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 -mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 +mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.12.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 -mirror://xorg/individual/app/xev-1.2.2.tar.bz2 +mirror://xorg/individual/app/xev-1.2.3.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 +mirror://xorg/individual/app/xfd-1.1.3.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 +mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 -mirror://xorg/individual/app/xhost-1.0.7.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.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 @@ -53,22 +54,24 @@ mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/app/xkill-1.0.5.tar.bz2 mirror://xorg/individual/app/xload-1.1.3.tar.bz2 -mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 +mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2 mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 -mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 +mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 +mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 -mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 +mirror://xorg/individual/app/xprop-1.2.4.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 -mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2 +mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 +mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 -mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 +mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 @@ -85,11 +88,11 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 @@ -168,8 +171,8 @@ mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 -mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 @@ -178,23 +181,23 @@ mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 -mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 -mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2 -mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 -mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 +mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2 +mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2 +mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2 +mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 -mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 +mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 -mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2 @@ -202,16 +205,16 @@ mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 -mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2 -mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2 +mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 -mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2 +mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 -mirror://xorg/individual/util/imake-1.0.7.tar.bz2 +mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 -mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 +mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2 diff --git a/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix index 8339460276c4..54ab90e849c6 100644 --- a/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix +++ b/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix @@ -24,12 +24,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "18.12.1"; + version = "19.02"; name = "ejabberd-${version}"; src = fetchurl { url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "0mqzbjzcf0aqjzds6pxl1zy1ajn3f8c94dn47xf2i9qid0bsydgx"; + sha256 = "18ga87w4mhi2wli9q7m64wsml0g61k1jacamn7k522gv50d8fwpv"; }; nativeBuildInputs = [ fakegit ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1ihg5jbvilfxacsw885ywgyf74r9hm8gcn17mrgbv6y7fcvcgcsr"; + outputHash = "0nv8bwfjjhnd1xn0k6zpr882r982s43mcdwqpdgkwkvlv4b8zp2z"; }; configureFlags = diff --git a/nixpkgs/pkgs/shells/powershell/default.nix b/nixpkgs/pkgs/shells/powershell/default.nix index f40a67f7e52d..4c4733bc9cd8 100644 --- a/nixpkgs/pkgs/shells/powershell/default.nix +++ b/nixpkgs/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "1zm5q25ny2x6wvdqfrc380467zq0nbrzh2rzldwdkdpkb6wbvpj8" - else if stdenv.isLinux then "021ag632jcn7f1vpddann04xifgsq3wrx93hzbvq7cngg8y16r3y" + platformSha = if stdenv.isDarwin then "1jcrrgybcyq9kwyqxshsfm5fy3sa77h3795xx3rvrs8k434nl1yb" + else if stdenv.isLinux then "1hlis827wmnjcy4h8va50093pmnqdhkbnbimmkymzmcvmkbmi9nx" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.1.2"; + version = "6.2.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/nixpkgs/pkgs/shells/xonsh/default.nix b/nixpkgs/pkgs/shells/xonsh/default.nix index 5848c0a453cd..3d55dcc2f9b2 100644 --- a/nixpkgs/pkgs/shells/xonsh/default.nix +++ b/nixpkgs/pkgs/shells/xonsh/default.nix @@ -2,31 +2,36 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.8.3"; + version = "0.8.12"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "1qnghqswvqlwv9121r4maibmn2dvqmbr3fhsnngsj3q7plfp7yb2"; + sha256 = "1p8slx8nk15vyyzwc9ic50py0amk9p9nggp1973wfas0fxsg1r4f"; }; LC_ALL = "en_US.UTF-8"; postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py - sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh + sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py + sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' tests/test_integrations.py + sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh + find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' patchShebangs . ''; + doCheck = !stdenv.isDarwin; + checkPhase = '' - HOME=$TMPDIR \ - pytest \ - -k 'not test_man_completion and not test_indir and not test_xonsh_party and not test_foreign_bash_data and not test_script and not test_single_command_no_windows and not test_redirect_out_to_file and not test_sourcefile and not test_printname and not test_printfile' + HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight' + HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5 + HOME=$TMPDIR pytest -k 'test_ptk_highlight' ''; - checkInputs = [ python3Packages.pytest glibcLocales git ]; + checkInputs = [ python3Packages.pytest python3Packages.pytest-rerunfailures glibcLocales git ]; propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ]; diff --git a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index c94658002df5..38e45693ad5e 100644 --- a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "grml-zsh-config-${version}"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1g3hbn1ibrrafa9z26pzyn4lb8mfc5zipr1i1j3w2av872zh0y35"; + sha256 = "1b794c3hfhw51aqp8dg8smxqjv4x518rs1ib4pdglc4d785rlq1k"; }; nativeBuildInputs = [ txt2tags ]; diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 17ad6be0fad8..6d6fa5d93e14 100644 --- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-01-15"; + version = "2019-04-04"; name = "oh-my-zsh-${version}"; + rev = "4ddb2e384ab0840b1d8a6d4c95770ef8a6c25fcc"; - src = fetchgit { + src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "586ca16902d9dae4d95d5256a824572f60219c83"; - sha256 = "0hzc1fv848h9vlmrw487818l30xfw2vnv50yhkrgvw8lqaam3bs8"; + sha256 = "0hvpq24qh10x3ii3j16kwpzlgas6zw9bg0sspd9dlfqb7rcmvqy2"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh new file mode 100755 index 000000000000..08b0daa4387c --- /dev/null +++ b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts jq + +set -eu -o pipefail + +oldVersion="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.version or (builtins.parseDrvName oh-my-zsh.name).version" | tr -d '"')" +latestSha="$(curl -L -s https://api.github.com/repos/robbyrussell/oh-my-zsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" +url="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.src.url" | tr -d '"')" + +if [ ! "null" = "${latestSha}" ]; then + latestDate="$(curl -L -s https://api.github.com/repos/robbyrussell/oh-my-zsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" + update-source-version oh-my-zsh "${latestSha}" --version-key=rev + update-source-version oh-my-zsh "${latestDate}" --ignore-same-hash + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix" + git add "${default_nix}" + git commit -m "oh-my-zsh: ${oldVersion} -> ${latestDate}" +else + echo "oh-my-zsh is already up-to-date" +fi diff --git a/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 248d7b77cf66..34ee0072d388 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "zsh-autosuggestions-${version}"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "zsh-users"; repo = "zsh-autosuggestions"; rev = "v${version}"; - sha256 = "19qkg4b2flvnp2l0cbkl4qbrnl8d3lym2mmh1mx9nmjd7b81r3pf"; + sha256 = "1xhrdv6cgmq9qslb476rcs8ifw8i2vf43yvmmscjcmpz0jac4sbx"; }; nativeBuildInputs = [ zsh ]; diff --git a/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix index 8acdd8bb5161..764459958bf3 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "zsh-prezto-2017-12-03"; + name = "zsh-prezto-2019-03-18"; src = fetchgit { url = "https://github.com/sorin-ionescu/prezto"; - rev = "029414581e54f5b63156f81acd0d377e8eb78883"; - sha256 = "0crrj2nq0wcv5in8qimnkca2an760aqald13vq09s5kbwwc9rs1f"; + rev = "1f4601e44c989b90dc7314b151891fa60a101251"; + sha256 = "1dcd5r7pc4biiplm0lh7yca0h6hs0xpaq9dwaarmfsh9wrd68350"; fetchSubmodules = true; }; buildPhase = '' - sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh + sed -i '/\''${ZDOTDIR:\-\$HOME}\/.zpreztorc" ]]/i\ + if [[ -s "/etc/zpreztorc" ]]; then\ + source "/etc/zpreztorc"\ + fi' init.zsh sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh for i in runcoms/*; do sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i done - sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh ''; installPhase = '' mkdir -p $out diff --git a/nixpkgs/pkgs/stdenv/cross/default.nix b/nixpkgs/pkgs/stdenv/cross/default.nix index 7b4f8adc82f3..fc9a585cf4d6 100644 --- a/nixpkgs/pkgs/stdenv/cross/default.nix +++ b/nixpkgs/pkgs/stdenv/cross/default.nix @@ -53,9 +53,9 @@ in lib.init bootStages ++ [ cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false - then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc + then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang else if crossSystem.useLLVM or false - then buildPackages.llvmPackages_7.lldClang + then buildPackages.llvmPackages_8.lldClang else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs diff --git a/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/nixpkgs/pkgs/stdenv/generic/check-meta.nix index fe0c8cfad919..76e1c351ff40 100644 --- a/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -1,7 +1,7 @@ # Checks derivation meta and attrs for problems (like brokenness, # licenses, etc). -{ lib, config, hostPlatform, meta }: +{ lib, config, hostPlatform }: let # If we're in hydra, we can dispense with the more verbose error @@ -76,7 +76,7 @@ let showLicense = license: license.shortName or "unknown"; - pos_str = meta.position or "«unknown-file»"; + pos_str = meta: meta.position or "«unknown-file»"; remediation = { unfree = remediate_whitelist "Unfree"; @@ -143,12 +143,12 @@ let ${lib.concatStrings (builtins.map (output: " - ${output}\n") missingOutputs)} ''; - handleEvalIssue = attrs: { reason , errormsg ? "" }: + handleEvalIssue = { meta, attrs }: { reason , errormsg ? "" }: let msg = if inHydra then "Failed to evaluate ${attrs.name or "«name-missing»"}: «${reason}»: ${errormsg}" else '' - Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. + Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str meta} ${errormsg}, refusing to evaluate. '' + (builtins.getAttr reason remediation) attrs; @@ -245,12 +245,12 @@ let { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } else { valid = true; }; - assertValidity = attrs: let + assertValidity = { meta, attrs }: let validity = checkValidity attrs; in validity // { # Throw an error if trying to evaluate an non-valid derivation handled = if !validity.valid - then handleEvalIssue attrs (removeAttrs validity ["valid"]) + then handleEvalIssue { inherit meta attrs; } (removeAttrs validity ["valid"]) else true; }; diff --git a/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index dfb7e95113b8..417c10363b52 100644 --- a/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -1,6 +1,13 @@ { lib, config, stdenv }: -rec { +let + checkMeta = import ./check-meta.nix { + inherit lib config; + # Nix itself uses the `system` field of a derivation to decide where + # to build it. This is a bit confusing for cross compilation. + inherit (stdenv) hostPlatform; + }; +in rec { # `mkDerivation` wraps the builtin `derivation` function to # produce derivations that use this stdenv and its shell. # @@ -263,12 +270,7 @@ rec { __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; }; - validity = import ./check-meta.nix { - inherit lib config meta; - # Nix itself uses the `system` field of a derivation to decide where - # to build it. This is a bit confusing for cross compilation. - inherit (stdenv) hostPlatform; - } attrs; + validity = checkMeta { inherit meta attrs; }; # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not diff --git a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix index e0118b8b27b4..e4cb70c8f24d 100644 --- a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix +++ b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix @@ -1,23 +1,33 @@ -{stdenv, fetchurl, libX11, glib, pkgconfig, libXmu }: +{ stdenv +, fetchurl +, libX11 +, glib +, pkgconfig +, libXmu +}: stdenv.mkDerivation rec { - - name = "wmctrl-1.07"; - + + pname = "wmctrl"; + version = "1.07"; + src = fetchurl { - url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz"; + # NOTE: 2019-04-11: There is also a semi-official mirror: http://tripie.sweb.cz/utils/wmctrl/ + url = "https://sites.google.com/site/tstyblo/wmctrl/${pname}-${version}.tar.gz"; sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; meta = { - homepage = http://tomas.styblo.name/wmctrl/; - description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager"; + homepage = https://sites.google.com/site/tstyblo/wmctrl; + description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; + maintainers = [ stdenv.lib.maintainers.Anton-Latukha ]; }; + } diff --git a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix index 4dfc06aa4366..e9cd04ecd1c3 100644 --- a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix +++ b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.6.2"; + version = "0.7.0"; doCheck = false; @@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1ca29rw1w2ldahp9f1v9kfrjycbjwx3mab3m25lr82084kaa6lsh"; + sha256 = "0dl4rnh4l3rhga5pfxmkc9syn6vx05zxdf8xcv0gw9h60y1smp6v"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "1sy7q875gg6as98lp6m15x9b3lhdikm9326lmqcs5fv3hhzvdlvy"; + cargoSha256 = "148p7r9xmc0nc0d4qyxhh29xqcb5axwqwcxcrkgd41f32c3g44dc"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/nixpkgs/pkgs/tools/admin/analog/default.nix b/nixpkgs/pkgs/tools/admin/analog/default.nix index 0d8bdad2c659..c6135e8d143f 100644 --- a/nixpkgs/pkgs/tools/admin/analog/default.nix +++ b/nixpkgs/pkgs/tools/admin/analog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.c-amie.co.uk/software/analog/; + homepage = https://www.c-amie.co.uk/software/analog/; license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/nixpkgs/pkgs/tools/admin/ansible/default.nix b/nixpkgs/pkgs/tools/admin/ansible/default.nix index f9cc3fb4ebcb..91fc2c50fcf6 100644 --- a/nixpkgs/pkgs/tools/admin/ansible/default.nix +++ b/nixpkgs/pkgs/tools/admin/ansible/default.nix @@ -7,21 +7,21 @@ ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; - version = "2.6.9"; + version = "2.6.15"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "12mysvdavkypgmyms1wjq2974lk97w893k23i6khigxrjj6r85z1"; + sha256 = "1l4ji9sryfn0l651hy6cf5zqq8fpwi956c7qzjm4sihz5ps6wyhd"; }; })); ansible_2_5 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { pname = "ansible"; - version = "2.5.14"; + version = "2.5.15"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0sd04h2k5qv4m48dn76jkjlwlqfdk15hzyagj9i71r8brvmwhnk9"; + sha256 = "1w9wfv1s2jq6vkx1hm6n69zwxv2pgjj7nidyg452miwh684jpg7z"; }; })); } diff --git a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 71360f8030c5..03b0ff5c0016 100644 --- a/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "aws-vault"; - version = "4.3.0"; + version = "4.5.1"; goPackagePath = "github.com/99designs/${pname}"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "0cwzvw1rcvg7y3m8dahr9r05s4i9apnfw5xhiaf0rlkdh3vy33wp"; + sha256 = "0y64fx15p9ls829lif7c0jaxyclzpnr8l5cyw25q545878dzmcs5"; }; # set the version. see: aws-vault's Makefile diff --git a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index aa8cc12ece85..3abd189d0f97 100644 --- a/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "03ymvfhk8azyvdm6j4pbqx2fsh178kw81yqwkycbhmm6mnyc8yv1"; + sha256 = "1w94c1p8vnp3kf802zpr3i0932f5b5irnfqmxj2p44gfyfmkym1j"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1pw4w3v81mp8alm6vxq10242xxwv8rfs59bjxrmy0pfkjgsr4x4v"; + sha256 = "0pps7csf8d3rxqgd0bv06ga6cgkqhlbsys0k0sy1ipl3i6h5hmpf"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "222.0.0"; + version = "241.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index a94cf1d37ec5..424d97a47299 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -8,24 +8,15 @@ buildGoPackage rec { pname = "lxd"; - version = "3.11"; + version = "3.12"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0xxzrwhyzzp23arj57vjs1yh91gy3r4wpd5qy9ksifzd390clf2x"; + sha256 = "0m2cq41mz5209csr07gsnmslqvqdxk2p1l2saa23ddnaybqnjy16"; }; - patches = [ - (fetchpatch { - url = https://github.com/CanonicalLtd/go-dqlite/commit/88a96df66e3e3bdc290fd4a0d41615d284d2c92c.patch; - sha256 = "0z6r4shh1rlf0in9xk1gi6ms2kcvplc3878106d2zzzfz7ad83a4"; - extraPrefix = "dist/src/github.com/CanonicalLtd/go-dqlite/"; - stripLen = 1; - }) - ]; - preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd diff --git a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix index 62fa8219f5ad..f73104422c1b 100644 --- a/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix +++ b/nixpkgs/pkgs/tools/admin/nomachine-client/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.5"; - versionMinor = "6"; - versionBuild_x86_64 = "9"; - versionBuild_i686 = "8"; + versionMajor = "6.6"; + versionMinor = "8"; + versionBuild_x86_64 = "5"; + versionBuild_i686 = "5"; in stdenv.mkDerivation rec { pname = "nomachine-client"; @@ -14,12 +14,12 @@ in if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; - sha256 = "07lg5yadxpl5qfvvh067b3kxd8hm3xv95ralm2pyjl4lw6aql46p"; + sha256 = "0hsx1nd9m1l35pj4jri88jib1hgf2wh1f42s650y2br2h6bhaixs"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; - sha256 = "1a23isw09vicazkrypq0kxbb8qy2i4vxiarrgz5xmasjhiy5999a"; + sha256 = "1hrp8s17pcqkb4jcnayx81qmm7c1njjp69fkpyqgcnv9vshias1b"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 956f688bb0a9..2d4b65273237 100644 --- a/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -4,17 +4,17 @@ with lib; let - version = "0.16.11"; + version = "0.17.4"; # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { "x86_64-linux" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; - sha256 = "176nwqp1dd8vdpl4qajaq2w458f8pgavwvwd93lgnccqw3cznv75"; + sha256 = "169hj0db3kcq8874sb3px1hk88ls08kq5w6wygay56whymhva65n"; }; "x86_64-darwin" = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; - sha256 = "1mkz9bkkvpvbpzfnvwpx4892zd05bvjz5rbfwhwzm3wzfcjjs16i"; + sha256 = "1cn4mbgzq86d69mpp341zxfl8baakz0n5p9yd5chxrjjvxb6i629"; }; }; diff --git a/nixpkgs/pkgs/tools/admin/salt/default.nix b/nixpkgs/pkgs/tools/admin/salt/default.nix index 6cf997cd738c..13bba0860c49 100644 --- a/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -8,11 +8,11 @@ pythonPackages.buildPythonApplication rec { pname = "salt"; - version = "2018.3.2"; + version = "2019.2.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd"; + sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/nixpkgs/pkgs/tools/archivers/gnutar/default.nix b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix index a6f5052ad08a..8ec34ce6730b 100644 --- a/nixpkgs/pkgs/tools/archivers/gnutar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/gnutar/default.nix @@ -62,5 +62,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.all; + + priority = 10; }; } diff --git a/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix b/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix index 6d5041c52d03..3c515b8c195d 100644 --- a/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix +++ b/nixpkgs/pkgs/tools/archivers/rpmextract/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { script = substituteAll { src = ./rpmextract.sh; + isExecutable = true; inherit rpm cpio; inherit (stdenv) shell; }; diff --git a/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/nixpkgs/pkgs/tools/archivers/unrar/default.nix index 73c73c564fd1..a5d1e7b05eff 100644 --- a/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "0i5442sh18v9s47k1j8q04m3ki98z012rw7ml7c5iwklhfvmds20"; + sha256 = "1d77wwgapwjxxshhinhk51skdd6v6xdsx34jjcjg6cj6zlwd0baq"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/audio/playerctl/default.nix b/nixpkgs/pkgs/tools/audio/playerctl/default.nix index d1edbf94fe07..cda89302abdd 100644 --- a/nixpkgs/pkgs/tools/audio/playerctl/default.nix +++ b/nixpkgs/pkgs/tools/audio/playerctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "playerctl-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "0j1fvcc80307ybl1z9l752sr4bcza2fmb8qdivpnm4xmm82faigb"; + sha256 = "1f3njnpd52djx3dmhh9a8p5a67f0jmr1gbk98icflr2q91149gjz"; }; nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index 4e2f8eaf5c9b..71e27c94dbdb 100644 --- a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS=OFF" "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive - "-DBUILD_TESTING=ON" ]; doCheck = true; diff --git a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index 806469493900..e601a12e6e6f 100644 --- a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,12 @@ -{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }: +{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.44.5"; + pname = "e2fsprogs"; + version = "1.45.0"; src = fetchurl { - url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; @@ -33,13 +34,12 @@ stdenv.mkDerivation rec { "--enable-libuuid --disable-e2initrd-helper" ]; - checkInputs = [ perl ]; - doCheck = false; # fails + checkInputs = [ buildPackages.perl ]; + doCheck = true; - # hacky way to make it install *.pc postInstall = '' - make install-libs - rm "$out"/lib/*.a + # avoid cycle between outputs + mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/ ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index 03966533e3a3..0d58e8007efa 100644 --- a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.103"; + version = "3.0.104"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0pqralv57ci4zwd75hz4pxmd4l9d4nib2mcsvrb6jndxqkaqcvns"; + sha256 = "057xg7zy872w4hczk9b9ckmqyah3qhgysvxddqizr204cyadicxh"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix b/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix index eccd72ceb238..ea321200fb98 100644 --- a/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -35,7 +35,13 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--with-libmount" ]; + configureFlags = [ + "--with-libmount" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv # still doesn't use it diff --git a/nixpkgs/pkgs/tools/filesystems/securefs/default.nix b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix index 37eb8b9aa72c..a21aacb7e6b8 100644 --- a/nixpkgs/pkgs/tools/filesystems/securefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/securefs/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { - sha256 = "0m3nv748g31b5nzxbwqqqjvygmz41x9vmhrjh655086g26gzrfib"; + sha256 = "0nf0bd163gz844mikqab2mh7xjlj31ixa6hi85qxdifyjpfjv7y4"; rev = version; repo = "securefs"; owner = "netheril96"; diff --git a/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix index 1a24cf7e75c4..73b7f51fd364 100644 --- a/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.5.1"; + version = "3.5.2"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "07ryavfbbzfxaswsbr8ifnnfn6g8yxgxam6mk6gvcskld6rkf6gd"; + sha256 = "0gvk8snivpi2sjidjnd9ypc66ny7lr0z9v4swl56rwjv539dkbx2"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; diff --git a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 70821468992b..566d6f48e1cc 100644 --- a/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu ]; - configureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; + wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; meta = with stdenv.lib; { description = "OpenGL (ES) 2.0 benchmark"; diff --git a/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix index 93a6652eafbc..a3cefddeb413 100644 --- a/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix +++ b/nixpkgs/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = http://logstalgia.io/; + homepage = https://logstalgia.io/; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/graphics/pngout/default.nix b/nixpkgs/pkgs/tools/graphics/pngout/default.nix index 333e5f600765..9d0e1b0ea879 100644 --- a/nixpkgs/pkgs/tools/graphics/pngout/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngout/default.nix @@ -6,11 +6,11 @@ let else throw "Unsupported system: ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "pngout-20130221"; + name = "pngout-20150319"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz; - sha256 = "1qdzmgx7si9zr7wjdj8fgf5dqmmqw4zg19ypg0pdz7521ns5xbvi"; + url = http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz; + sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; installPhase = '' diff --git a/nixpkgs/pkgs/tools/graphics/vips/default.nix b/nixpkgs/pkgs/tools/graphics/vips/default.nix index 7381238e4acb..77f15aa99b6d 100644 --- a/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.7.0"; + version = "8.7.4"; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw"; + sha256 = "0mcax1qg5i4iqlvgkz3s0c938d7ymx24pv3q2n3w2pjylnnd489s"; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index 66efb936aa4c..332fa0c509d3 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, vulkan-headers, glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; + buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix index ab8a7bdb34de..50cc06d20593 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -4,7 +4,7 @@ , dbus, gtk2, gtk3, qt4, extra-cmake-modules , xkeyboard_config, pcre, libuuid , withPinyin ? true -, fetchFromGitHub +, fetchFromGitLab }: let @@ -37,13 +37,13 @@ let in stdenv.mkDerivation rec { name = "fcitx-${version}"; - version = "4.2.9.5"; + version = "4.2.9.6"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "fcitx"; repo = "fcitx"; rev = version; - sha256 = "0rv69bacdvblka85dakz4ldpznrgwj59nqcccp5mkkn1rab4zh1r"; + sha256 = "0j5vaf930lb21gx4h7z6mksh1fazqw32gajjjkyir94wbmml9n3s"; }; # put data at the correct locations else cmake tries to fetch them, diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index bd5645fe721c..f9d3c53854b4 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the anthy input method"; - homepage = http://wiki.github.com/fujiwarat/ibus-anthy; + homepage = https://github.com/fujiwarat/ibus-anthy; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix index e1cd8ad09fbd..8948f1abbb3e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig +{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null @@ -50,6 +50,24 @@ let }; nativeBuildInputs = [ autoreconfHook ]; }; + ucdSrcs = { + NamesList = fetchurl { + url = "https://www.unicode.org/Public/UNIDATA/NamesList.txt"; + sha256 = "c17c7726f562bd9ef869096807f0297e1edef9a58fdae1fbae487378fa43586f"; + }; + Blocks = fetchurl { + url = "https://www.unicode.org/Public/UNIDATA/Blocks.txt"; + sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10"; + }; + }; + ucd = stdenv.mkDerivation rec { + name = "ucd-12.0.0"; + unpackPhase = ":"; + installPhase = '' + mkdir $out + ${builtins.toString (flip mapAttrsToList ucdSrcs (k: v: "cp ${v} $out/${k}.txt;"))} + ''; + }; python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); python3BuildEnv = python3.buildEnv.override { # ImportError: No module named site @@ -59,24 +77,17 @@ let makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; - - # stop gconf from leaking into environment - # can be removed in ibus 1.6 which will not use gconf anymore - gsettings-schema-convert = runCommand "name" {} '' - mkdir -p $out/bin - ln -s ${gconf}/bin/gsettings-schema-convert $out/bin - ''; in stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.17"; + version = "1.5.20"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "09mrj9d8qpl9cbylg1zx8c3ymc5gdy4jrf6zs125wjz0b574g5av"; + sha256 = "1npavb896qrp6qbqayb0va4mpsi68wybcnlbjknzgssqyw2ylh9r"; }; postPatch = '' @@ -88,10 +99,8 @@ stdenv.mkDerivation rec { ''; preAutoreconf = "touch ChangeLog"; - preConfigure = "intltoolize"; configureFlags = [ - "--disable-gconf" "--disable-memconf" (enableFeature (dconf != null) "dconf") (enableFeature (libnotify != null) "libnotify") @@ -100,13 +109,13 @@ stdenv.mkDerivation rec { (enableFeature enableUI "ui") "--with-unicode-emoji-dir=${emojiData}" "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations" + "--with-ucd-dir=${ucd}" ]; nativeBuildInputs = [ autoreconfHook - gsettings-schema-convert gtk-doc - intltool + gettext makeWrapper pkgconfig python3BuildEnv diff --git a/nixpkgs/pkgs/tools/inputmethods/uim/default.nix b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix index b8510b102cbb..984eecf9e9d5 100644 --- a/nixpkgs/pkgs/tools/inputmethods/uim/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, shared-mime-info , autoconf, automake, intltool, libtool, pkgconfig, cmake , ruby, librsvg , ncurses, m17n_lib, m17n_db, expat @@ -127,6 +127,12 @@ stdenv.mkDerivation rec { #--with-sj3 Use SJ3 [default=no] #--with-osx-dcs Build with OS X Dictionary Services [default=no] + # TODO: fix this in librsvg/glib later + # https://github.com/NixOS/nixpkgs/pull/57027#issuecomment-475461733 + preBuild = '' + export XDG_DATA_DIRS="${shared-mime-info}/share" + ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/misc/autojump/default.nix b/nixpkgs/pkgs/tools/misc/autojump/default.nix index 5f86dbadfa36..ca4dde7a450c 100644 --- a/nixpkgs/pkgs/tools/misc/autojump/default.nix +++ b/nixpkgs/pkgs/tools/misc/autojump/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "autojump-${version}"; - version = "22.5.1"; + version = "22.5.3"; src = fetchFromGitHub { owner = "wting"; repo = "autojump"; rev = "release-v${version}"; - sha256 = "1l1278g3k1qfrz41pkpjdhsabassb9si2d1bfbcmvbv5h3wmlqk9"; + sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"; }; buildInputs = [ python bash ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { Autojump supports tab-completion. ''; - homepage = http://wiki.github.com/wting/autojump; + homepage = https://github.com/wting/autojump; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar yurrriq ]; diff --git a/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/nixpkgs/pkgs/tools/misc/autorandr/default.nix index dff98f236036..550b0ad90674 100644 --- a/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.8"; + version = "1.8.1"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "0yhn3gvvkgmfqf3yl3kqlj0biinw0qvli6s88sxa0pybca3j8nll"; + sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy"; }; meta = { diff --git a/nixpkgs/pkgs/tools/misc/clipster/default.nix b/nixpkgs/pkgs/tools/misc/clipster/default.nix index 7b501d097bb7..ed0239256cdf 100644 --- a/nixpkgs/pkgs/tools/misc/clipster/default.nix +++ b/nixpkgs/pkgs/tools/misc/clipster/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "08zs7yjpjc6haddkwx7sq5vyq2ldy455qlcrx1a3vi7krmdwl1q9"; + sha256 = "0582r8840dk4k4jj1zq6kmyh7z9drcng099bj7f4wvr468nb9z1p"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 84a2735dff8f..9cc48f446467 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -16,37 +16,41 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.30"; + pname = "coreutils"; + version = "8.31"; src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; }; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. - sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh - sed '2i echo Skipping du threshold test && exit 0' -i ./tests/du/threshold.sh - sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh - sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh - sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh + sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh + sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh + sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh + sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh + sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh # sandbox does not allow setgid - sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh + sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh substituteInPlace ./tests/install/install-C.sh \ --replace 'mode3=2755' 'mode3=1755' - sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl + sed '2i print "Skipping env -S test"; exit 77;' -i ./tests/misc/env-S.pl # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do - sed '2i echo Skipping chgrp && exit 0' -i "$f" + sed '2i echo Skipping chgrp && exit 77' -i "$f" done for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do - echo "int main() { return 0; }" > "$f" + echo "int main() { return 77; }" > "$f" done + '' + optionalString (stdenv.hostPlatform.libc == "musl") '' + echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c + echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c ''; outputs = [ "out" "info" ]; @@ -80,7 +84,7 @@ stdenv.mkDerivation rec { # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.hostPlatform.libc == "glibc" + && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) && builtins.storeDir == "/nix/store"; # Prevents attempts of running 'help2man' on cross-built binaries. @@ -123,6 +127,8 @@ stdenv.mkDerivation rec { platforms = platforms.unix ++ platforms.windows; + priority = 10; + maintainers = [ maintainers.eelco ]; }; diff --git a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix index 13c1202e1d31..9a764c12941e 100644 --- a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpulimit-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; - sha256 = "1w1l3r9ini78s8idxlzmgljpfgl1n4y4qhp3q2s8y6wq4bfx41lp"; + sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g"; }; buildFlags = with stdenv; diff --git a/nixpkgs/pkgs/tools/misc/doitlive/default.nix b/nixpkgs/pkgs/tools/misc/doitlive/default.nix index 00b04c2112f4..6edcefb11d5e 100644 --- a/nixpkgs/pkgs/tools/misc/doitlive/default.nix +++ b/nixpkgs/pkgs/tools/misc/doitlive/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "4.2.1"; + version = "4.3.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0sffr78h0hdrlpamg6v0iw2cgrkv7wy82mvrbzri0w1jqd29s526"; + sha256 = "03qrs032x206xrl0x3z0fpvxgjivzz9rkmb11bqlk1id10707cac"; }; propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ]; diff --git a/nixpkgs/pkgs/tools/misc/entr/default.nix b/nixpkgs/pkgs/tools/misc/entr/default.nix index 9301ce12a055..19bcd77923b9 100644 --- a/nixpkgs/pkgs/tools/misc/entr/default.nix +++ b/nixpkgs/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "0y7gvyf0iykpf3gfw09m21hy51m6qn4cpkbrm4nnn7pwrwycj0y5"; + sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix index cefddbd65ef5..ed31d01f09d5 100644 --- a/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/nixpkgs/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.35"; + version = "5.36"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h"; + sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; diff --git a/nixpkgs/pkgs/tools/misc/fltrdr/default.nix b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix index 3d99a0e27e3e..b18e9d96706f 100644 --- a/nixpkgs/pkgs/tools/misc/fltrdr/default.nix +++ b/nixpkgs/pkgs/tools/misc/fltrdr/default.nix @@ -1,20 +1,22 @@ { stdenv , fetchFromGitHub , cmake +, icu }: stdenv.mkDerivation rec { name = "fltrdr-${version}"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { repo = "fltrdr"; owner = "octobanana"; rev = "${version}"; - sha256 = "1gglv7hwszk09ywjq6s169cdzr77sjklj89k5p24if24v93yffpf"; + sha256 = "0hj7pwb93l4ahykmmr0665nq50jvwdq0aiaciz82225aw1cq939w"; }; nativeBuildInputs = [ cmake ]; + buildInputs = [ icu ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile index 3933eb131800..952c419ad313 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile +++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile @@ -1,7 +1,6 @@ source "https://rubygems.org" gem 'fluentd' -gem 'fluent-plugin-elasticsearch' gem 'fluent-plugin-record-reformer' gem 'fluent-plugin-s3' gem 'fluent-plugin-kinesis' diff --git a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock index d5f78e807ff4..3d852e367594 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/fluentd/Gemfile.lock @@ -1,644 +1,82 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - aws-eventstream (1.0.1) - aws-partitions (1.96.0) - aws-sdk (3.0.1) - aws-sdk-resources (~> 3) - aws-sdk-acm (1.9.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-acmpca (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-alexaforbusiness (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-apigateway (1.13.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-applicationautoscaling (1.11.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-applicationdiscoveryservice (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-appstream (1.13.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-appsync (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-athena (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-autoscaling (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-autoscalingplans (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-batch (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-budgets (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloud9 (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-clouddirectory (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudformation (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudfront (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudhsm (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudhsmv2 (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudsearch (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudsearchdomain (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudtrail (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudwatch (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudwatchevents (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cloudwatchlogs (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codebuild (1.12.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codecommit (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codedeploy (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codepipeline (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-codestar (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cognitoidentity (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cognitoidentityprovider (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-cognitosync (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-comprehend (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-configservice (1.12.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-connect (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-core (3.22.1) - aws-eventstream (~> 1.0) + aws-eventstream (1.0.2) + aws-partitions (1.149.0) + aws-sdk-core (3.48.3) + aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) - aws-sigv4 (~> 1.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-costexplorer (1.7.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-databasemigrationservice (1.7.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-datapipeline (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-dax (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-devicefarm (1.7.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-directconnect (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-directoryservice (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-dlm (1.0.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-dynamodb (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-dynamodbstreams (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ec2 (1.38.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ecr (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ecs (1.15.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-efs (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-eks (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticache (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticbeanstalk (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticloadbalancing (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticloadbalancingv2 (1.11.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elasticsearchservice (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-elastictranscoder (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-emr (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-firehose (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-fms (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-gamelift (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-glacier (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-glue (1.10.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-greengrass (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-guardduty (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-health (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iam (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-importexport (1.1.0) - aws-sdk-core (~> 3) - aws-sigv2 (~> 1.0) - aws-sdk-inspector (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iot (1.9.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iot1clickdevicesservice (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iot1clickprojects (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iotanalytics (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iotdataplane (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-iotjobsdataplane (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesis (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesisanalytics (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesisvideo (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesisvideoarchivedmedia (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kinesisvideomedia (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-kms (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lambda (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lambdapreview (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lex (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lexmodelbuildingservice (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-lightsail (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-machinelearning (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-macie (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-marketplacecommerceanalytics (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-marketplaceentitlementservice (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-marketplacemetering (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediaconvert (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-medialive (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediapackage (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediastore (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediastoredata (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mediatailor (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-migrationhub (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mobile (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mq (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-mturk (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-neptune (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-opsworks (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-opsworkscm (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-organizations (1.10.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-pi (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-pinpoint (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-polly (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-pricing (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-rds (1.23.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-redshift (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-rekognition (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-resourcegroups (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-resourcegroupstaggingapi (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-resources (3.22.0) - aws-sdk-acm (~> 1) - aws-sdk-acmpca (~> 1) - aws-sdk-alexaforbusiness (~> 1) - aws-sdk-apigateway (~> 1) - aws-sdk-applicationautoscaling (~> 1) - aws-sdk-applicationdiscoveryservice (~> 1) - aws-sdk-appstream (~> 1) - aws-sdk-appsync (~> 1) - aws-sdk-athena (~> 1) - aws-sdk-autoscaling (~> 1) - aws-sdk-autoscalingplans (~> 1) - aws-sdk-batch (~> 1) - aws-sdk-budgets (~> 1) - aws-sdk-cloud9 (~> 1) - aws-sdk-clouddirectory (~> 1) - aws-sdk-cloudformation (~> 1) - aws-sdk-cloudfront (~> 1) - aws-sdk-cloudhsm (~> 1) - aws-sdk-cloudhsmv2 (~> 1) - aws-sdk-cloudsearch (~> 1) - aws-sdk-cloudsearchdomain (~> 1) - aws-sdk-cloudtrail (~> 1) - aws-sdk-cloudwatch (~> 1) - aws-sdk-cloudwatchevents (~> 1) - aws-sdk-cloudwatchlogs (~> 1) - aws-sdk-codebuild (~> 1) - aws-sdk-codecommit (~> 1) - aws-sdk-codedeploy (~> 1) - aws-sdk-codepipeline (~> 1) - aws-sdk-codestar (~> 1) - aws-sdk-cognitoidentity (~> 1) - aws-sdk-cognitoidentityprovider (~> 1) - aws-sdk-cognitosync (~> 1) - aws-sdk-comprehend (~> 1) - aws-sdk-configservice (~> 1) - aws-sdk-connect (~> 1) - aws-sdk-costandusagereportservice (~> 1) - aws-sdk-costexplorer (~> 1) - aws-sdk-databasemigrationservice (~> 1) - aws-sdk-datapipeline (~> 1) - aws-sdk-dax (~> 1) - aws-sdk-devicefarm (~> 1) - aws-sdk-directconnect (~> 1) - aws-sdk-directoryservice (~> 1) - aws-sdk-dlm (~> 1) - aws-sdk-dynamodb (~> 1) - aws-sdk-dynamodbstreams (~> 1) - aws-sdk-ec2 (~> 1) - aws-sdk-ecr (~> 1) - aws-sdk-ecs (~> 1) - aws-sdk-efs (~> 1) - aws-sdk-eks (~> 1) - aws-sdk-elasticache (~> 1) - aws-sdk-elasticbeanstalk (~> 1) - aws-sdk-elasticloadbalancing (~> 1) - aws-sdk-elasticloadbalancingv2 (~> 1) - aws-sdk-elasticsearchservice (~> 1) - aws-sdk-elastictranscoder (~> 1) - aws-sdk-emr (~> 1) - aws-sdk-firehose (~> 1) - aws-sdk-fms (~> 1) - aws-sdk-gamelift (~> 1) - aws-sdk-glacier (~> 1) - aws-sdk-glue (~> 1) - aws-sdk-greengrass (~> 1) - aws-sdk-guardduty (~> 1) - aws-sdk-health (~> 1) - aws-sdk-iam (~> 1) - aws-sdk-importexport (~> 1) - aws-sdk-inspector (~> 1) - aws-sdk-iot (~> 1) - aws-sdk-iot1clickdevicesservice (~> 1) - aws-sdk-iot1clickprojects (~> 1) - aws-sdk-iotanalytics (~> 1) - aws-sdk-iotdataplane (~> 1) - aws-sdk-iotjobsdataplane (~> 1) - aws-sdk-kinesis (~> 1) - aws-sdk-kinesisanalytics (~> 1) - aws-sdk-kinesisvideo (~> 1) - aws-sdk-kinesisvideoarchivedmedia (~> 1) - aws-sdk-kinesisvideomedia (~> 1) - aws-sdk-kms (~> 1) - aws-sdk-lambda (~> 1) - aws-sdk-lambdapreview (~> 1) - aws-sdk-lex (~> 1) - aws-sdk-lexmodelbuildingservice (~> 1) - aws-sdk-lightsail (~> 1) - aws-sdk-machinelearning (~> 1) - aws-sdk-macie (~> 1) - aws-sdk-marketplacecommerceanalytics (~> 1) - aws-sdk-marketplaceentitlementservice (~> 1) - aws-sdk-marketplacemetering (~> 1) - aws-sdk-mediaconvert (~> 1) - aws-sdk-medialive (~> 1) - aws-sdk-mediapackage (~> 1) - aws-sdk-mediastore (~> 1) - aws-sdk-mediastoredata (~> 1) - aws-sdk-mediatailor (~> 1) - aws-sdk-migrationhub (~> 1) - aws-sdk-mobile (~> 1) - aws-sdk-mq (~> 1) - aws-sdk-mturk (~> 1) - aws-sdk-neptune (~> 1) - aws-sdk-opsworks (~> 1) - aws-sdk-opsworkscm (~> 1) - aws-sdk-organizations (~> 1) - aws-sdk-pi (~> 1) - aws-sdk-pinpoint (~> 1) - aws-sdk-polly (~> 1) - aws-sdk-pricing (~> 1) - aws-sdk-rds (~> 1) - aws-sdk-redshift (~> 1) - aws-sdk-rekognition (~> 1) - aws-sdk-resourcegroups (~> 1) - aws-sdk-resourcegroupstaggingapi (~> 1) - aws-sdk-route53 (~> 1) - aws-sdk-route53domains (~> 1) - aws-sdk-s3 (~> 1) - aws-sdk-sagemaker (~> 1) - aws-sdk-sagemakerruntime (~> 1) - aws-sdk-secretsmanager (~> 1) - aws-sdk-serverlessapplicationrepository (~> 1) - aws-sdk-servicecatalog (~> 1) - aws-sdk-servicediscovery (~> 1) - aws-sdk-ses (~> 1) - aws-sdk-shield (~> 1) - aws-sdk-simpledb (~> 1) - aws-sdk-sms (~> 1) - aws-sdk-snowball (~> 1) - aws-sdk-sns (~> 1) - aws-sdk-sqs (~> 1) - aws-sdk-ssm (~> 1) - aws-sdk-states (~> 1) - aws-sdk-storagegateway (~> 1) - aws-sdk-support (~> 1) - aws-sdk-swf (~> 1) - aws-sdk-transcribeservice (~> 1) - aws-sdk-translate (~> 1) - aws-sdk-waf (~> 1) - aws-sdk-wafregional (~> 1) - aws-sdk-workdocs (~> 1) - aws-sdk-workmail (~> 1) - aws-sdk-workspaces (~> 1) - aws-sdk-xray (~> 1) - aws-sdk-route53 (1.10.1) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-route53domains (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.17.0) - aws-sdk-core (~> 3, >= 3.21.2) + aws-sdk-firehose (1.14.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.13.1) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.16.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.36.0) + aws-sdk-core (~> 3, >= 3.48.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) - aws-sdk-sagemaker (1.11.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-sagemakerruntime (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-secretsmanager (1.10.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-serverlessapplicationrepository (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-servicecatalog (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-servicediscovery (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ses (1.8.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-shield (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-simpledb (1.1.0) - aws-sdk-core (~> 3) - aws-sigv2 (~> 1.0) - aws-sdk-sms (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-snowball (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-sns (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-sqs (1.4.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-ssm (1.18.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-states (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-storagegateway (1.6.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-support (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-swf (1.1.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-transcribeservice (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-translate (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-waf (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-wafregional (1.5.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-workdocs (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-workmail (1.2.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-workspaces (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sdk-xray (1.3.0) - aws-sdk-core (~> 3) - aws-sigv4 (~> 1.0) - aws-sigv2 (1.0.1) - aws-sigv4 (1.0.3) - bson (4.3.0) - cool.io (1.5.3) + aws-sdk-sqs (1.13.0) + aws-sdk-core (~> 3, >= 3.48.2) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) + bson (4.4.2) + cool.io (1.5.4) dig_rb (1.0.1) - elasticsearch (6.1.0) - elasticsearch-api (= 6.1.0) - elasticsearch-transport (= 6.1.0) - elasticsearch-api (6.1.0) + digest-crc (0.4.1) + elasticsearch (6.3.0) + elasticsearch-api (= 6.3.0) + elasticsearch-transport (= 6.3.0) + elasticsearch-api (6.3.0) multi_json - elasticsearch-transport (6.1.0) + elasticsearch-transport (6.3.0) faraday multi_json excon (0.62.0) - faraday (0.15.2) + faraday (0.15.4) multipart-post (>= 1.2, < 3) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) - fluent-plugin-elasticsearch (2.11.1) + fluent-plugin-elasticsearch (3.4.1) elasticsearch excon - fluentd (>= 0.14.20) - fluent-plugin-kafka (0.7.4) + fluentd (>= 0.14.22) + fluent-plugin-kafka (0.9.2) fluentd (>= 0.10.58, < 2) ltsv - ruby-kafka (>= 0.4.1, < 1.0.0) - fluent-plugin-kinesis (2.1.1) - aws-sdk (>= 2.9.9, < 4) - fluentd (>= 0.12.35, < 2) + ruby-kafka (>= 0.7.1, < 0.8.0) + fluent-plugin-kinesis (3.0.0) + aws-sdk-firehose (~> 1, != 1.9, != 1.5) + aws-sdk-kinesis (~> 1, != 1.5, != 1.4) + fluentd (>= 0.14.10, < 2) google-protobuf (~> 3) - fluent-plugin-mongo (1.1.1) - fluentd (>= 0.14.12, < 2) - mongo (~> 2.2.0) + fluent-plugin-mongo (1.2.2) + fluentd (>= 0.14.22, < 2) + mongo (~> 2.6.0) fluent-plugin-record-reformer (0.9.1) fluentd - fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-plugin-rewrite-tag-filter (2.2.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-s3 (1.1.3) + fluent-plugin-s3 (1.1.9) aws-sdk-s3 (~> 1.0) aws-sdk-sqs (~> 1.0) - fluentd (>= 0.14.2, < 2) - fluent-plugin-scribe (0.10.14) + fluentd (>= 0.14.22, < 2) + fluent-plugin-scribe (1.0.0) fluentd thrift (~> 0.8.0) fluent-plugin-webhdfs (1.2.3) fluentd (>= 0.14.4) webhdfs (>= 0.6.0) - fluentd (1.2.3) + fluentd (1.4.2) cool.io (>= 1.4.5, < 2.0.0) dig_rb (~> 1.0.0) http_parser.rb (>= 0.5.1, < 0.7.0) @@ -649,18 +87,19 @@ GEM tzinfo (~> 1.0) tzinfo-data (~> 1.0) yajl-ruby (~> 1.0) - google-protobuf (3.6.0) + google-protobuf (3.7.1) http_parser.rb (0.6.0) jmespath (1.4.0) - ltsv (0.1.0) - mongo (2.2.7) - bson (~> 4.0) - msgpack (1.2.4) + ltsv (0.1.2) + mongo (2.6.4) + bson (>= 4.3.0, < 5.0.0) + msgpack (1.2.9) multi_json (1.13.1) multipart-post (2.0.0) - public_suffix (3.0.2) - ruby-kafka (0.6.7) - serverengine (2.0.7) + public_suffix (3.0.3) + ruby-kafka (0.7.6) + digest-crc + serverengine (2.1.0) sigdump (~> 0.2.2) sigdump (0.2.4) strptime (0.2.3) @@ -668,11 +107,11 @@ GEM thrift (0.8.0) tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2018.5) + tzinfo-data (1.2019.1) tzinfo (>= 1.0.0) webhdfs (0.8.0) addressable - yajl-ruby (1.4.0) + yajl-ruby (1.4.1) PLATFORMS ruby @@ -690,4 +129,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.16.2 + 1.16.3 diff --git a/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix b/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix index 8a3c212d0552..022127238ecc 100644 --- a/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/fluentd/gemset.nix @@ -1,1420 +1,188 @@ { addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; aws-eventstream = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdiwkg24jpx5f3bkw6vchgliicn6v9bpm09j0dldaxsca66q0wy"; + sha256 = "1i4djzrynzr4l8mqx946ad6zn7blz2r5jif58y9c0lws6bdc5h1l"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; aws-partitions = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gqkj0fq1rlrsfr1s3dgrhz4dikxlkrbrkp0i2013aa3lcsm8hqm"; - type = "gem"; - }; - version = "1.96.0"; - }; - aws-sdk = { - dependencies = ["aws-sdk-resources"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z01jdka7akshp524xprqaakpavzjadh0kmwmz8mwk5i1yiakba3"; - type = "gem"; - }; - version = "3.0.1"; - }; - aws-sdk-acm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r6m6l8jbnhcvs6xighgcpc8li8pnjr33l34fqgnbxbbkybwnhl0"; - type = "gem"; - }; - version = "1.9.0"; - }; - aws-sdk-acmpca = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13ggvcyijmhdwiw1ym21pxac4hf7wmndy5l5g1mmd2r6mlz08n6b"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-alexaforbusiness = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bn1460ga5b1nair735nf8cg4hrgh499kdwn9r75d5mjfd4yxg1s"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-apigateway = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v1p15lx6k9iyx226h6w9pp16frhnpl1xxwm1c0q39a5f9k7vyl7"; - type = "gem"; - }; - version = "1.13.0"; - }; - aws-sdk-applicationautoscaling = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sf117qwmw3qdvydr6sn70vm9ygpnr1mgqic2vc1y6s85rzfh4z2"; - type = "gem"; - }; - version = "1.11.0"; - }; - aws-sdk-applicationdiscoveryservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0n770ra6d2bc23rq66x5rd2ck0c0h0ivgxcdgi7kmvkjrh09fslj"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-appstream = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04y4s4pkwvl72a2jzrscki68p6klh9g6vxi86whi4hsg05imj909"; - type = "gem"; - }; - version = "1.13.0"; - }; - aws-sdk-appsync = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kk4r6272fniq5dx50f3k0wz8pjysbvxs26jyvr5af97ayndks1n"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-athena = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q9igjjw0jc860dns4mh8l1bm0s1q4bpfrzkgczij5vx3rp3jpqv"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-autoscaling = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15hvj08avacvkkrm60rdv39k58zxaqsigrlfjgfiki7vcrrqm19j"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-autoscalingplans = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0djk1z0q92cclr0757qvphj63x20a1ygzp3c9w1ycc6b3n7j5a0r"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-batch = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18yr41pgl11x1vfc7w4f7n5v8vbhz4vb05q1fckqcwmwrwcqwycn"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-budgets = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xdwr9c0wcys9gljl2q0bvrjvlk6q676gsr2159qdh0px1s9f8cd"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-cloud9 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vs7jgg1fjz0kn1772mbk55q5ia8k8045bl38wsh23yz9naf7wrb"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-clouddirectory = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zkbqj3nf9pdyzyk9z1xm9qkslghljhwzma10mrpg2wkic8in2zg"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-cloudformation = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q75h9nbhkrs3rblc5bdf2v1yamskgjkz5rlzlikpp1x08alll2x"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-cloudfront = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wzhhv2hnxy0h3zcbppdzym1zmsgmv6fqkdcdghh5ys9mj4wnq86"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-cloudhsm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zjdql9x8cpjikjc6q4g8vmdi1xq27q7vwns8flib9cklbkb615k"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-cloudhsmv2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09pw8dgay7vrmwfjz5dzjrci1q6iqazna36d5vhp3raw4drb5q0c"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-cloudsearch = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1k702nm5aqxhgyc2gvjx8c5abg2b004apsgwfv6pi4szcbd3c4bq"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-cloudsearchdomain = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kc6d3dy7vdydwnhzddnfkrrdspsxzc1h91yml6jskr5p6ccc6mb"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-cloudtrail = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11lj0qw9w7cmxwgfdwvhfx6pfx5dx3b2mcsg0fmy0k8pl18zp4rr"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-cloudwatch = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xmpmwzra3b5gracca050zs0lrsq28sc34x7qx8c0cr05jlkjjig"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-cloudwatchevents = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qr2mlx7w2wb168vldm0ci7z7jf8mjmp73i50048pa6yqsn5jg42"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-cloudwatchlogs = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16fwk4hxycqq8kkv1asiimr5h5dcrnh22ix9z7vzg6gd3w4cx8yl"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-codebuild = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x88dg1ygffxlvw9hl9xj7nfvd311vic49sjwrq171ily9drd8dp"; - type = "gem"; - }; - version = "1.12.0"; - }; - aws-sdk-codecommit = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17xch4hwf5i7vvpq3mi6hg120jdjxw9qplhi7d48ch20w5w2nn3k"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-codedeploy = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18qpmbaqwnbw91hbm64fixn4dba35fhr7x770lvly885i8srbv44"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-codepipeline = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0v9ml7bfdr30py24ab7jhh35ni17m2c7rr16d55sp14j6583ax"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-codestar = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dd3l6igidddxy4flw3wry0mv2lr559vvfafjwna7ilj3v311dz2"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-cognitoidentity = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "014b9d7iai5sinjfs2qar3wwnhhb3cd35867jiwkqwhyga30r70p"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-cognitoidentityprovider = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jlk4ysr1lbn94p16p7z0hr0m7pr47447g632fd0ss1hw7ap4csw"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-cognitosync = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d5fxq99sfwv4c7jgx65yrhxp9qg524bd8bsfamhakn0rlwi4iny"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-comprehend = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l50mvlrarqhb7d469czi3p7rimjwzcwp52bhklxbx6lmv3il23p"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-configservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11lzxili2c17m6h8y6ngl7z7h0rf7jwwaim4dq2pdf2qi2k5mh70"; + sha256 = "08i5a52b42x1q26j4rzaxp4hhwl0wzw12jbbjxjifnwi2dm57biy"; type = "gem"; }; - version = "1.12.0"; - }; - aws-sdk-connect = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15xz6v48y4nn1yrr2n8d2w0z7g52cqyjrkjxyhgdv6967yby4qw2"; - type = "gem"; - }; - version = "1.1.0"; + version = "1.149.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dhii8d1ra9rbh3n0v5s2p4dg5mrwj44sl0mfcan40s1crcrm3m8"; - type = "gem"; - }; - version = "3.22.1"; - }; - aws-sdk-costandusagereportservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04sady26xlvkrmym4bmdbkc1d472kjlxsgr9awa205ih0bxsaffn"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-costexplorer = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ddd92nny926ipzgmr2gg9qh64iv96cd35zwsbwn7ns8mnndxa4q"; - type = "gem"; - }; - version = "1.7.0"; - }; - aws-sdk-databasemigrationservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0slj051gw3mr155cwmj67d95wywq4v14ri6xhnkfx07sqp4i8z9a"; - type = "gem"; - }; - version = "1.7.0"; - }; - aws-sdk-datapipeline = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r2jnvbcbqkg5k42ly1x2w4g97rl4km1m3bwjvwl7q8c9fbrzpby"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-dax = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m6l7p2g667c54jxbdpb1zkin5damiq3x34aw5b3b88wk9nm8pfy"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-devicefarm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02bzffmwrbw5irg94iki16ybg0wb926vsfvd4ziv890fc8n239ya"; - type = "gem"; - }; - version = "1.7.0"; - }; - aws-sdk-directconnect = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03jshg8ax2cww8zvf2lvf542xllgpv38i2iqnv79y62s9a26g4l5"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-directoryservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mmjxk34gids533s2x1ay4s9zzrvad16djf1m6xib6ys9bja1x27"; + sha256 = "1sng9iagk96r8986gsacljnw357famz5x4xa1wk9xm4cx0bmpm5i"; type = "gem"; }; - version = "1.3.0"; - }; - aws-sdk-dlm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j6r629wqg08zr9ndisy3d27hqj32kimlrfkigw276mnx2v507cn"; - type = "gem"; - }; - version = "1.0.0"; - }; - aws-sdk-dynamodb = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0id29l91wpd9az9axsfmiqdwlh0qx4m1ci7fwzxm7ac6yjq4p7gr"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-dynamodbstreams = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03b2wrkxp9cpr0akxqgn5hss9l2yzqa7kl9j0isyh968rbdzaxla"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-ec2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17144h9892pf8hn5c5lnid47q2dilyb5hxzf8pj7z3pkra5yn5aw"; - type = "gem"; - }; - version = "1.38.0"; - }; - aws-sdk-ecr = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01x7m60sqfdkfiif1fxknl9p97076ndwr71s5aixq688plf7zybf"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-ecs = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16czi8zgy8s1p0skcxwr4lcbfwp0g9c8ppbd3ymjchm75rdrg47g"; - type = "gem"; - }; - version = "1.15.0"; - }; - aws-sdk-efs = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fi1a99fh62ma1xy4axh5cpach3fclajd30jp8kig9bxyaspsf2c"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-eks = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sgyja0kdj68vcqzmckxmik7ibp4rmyiw8vl6zyp3ihkqpvwf5ns"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-elasticache = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wy4w8gcdnn4ckyc0aa9p293fnwlv8ihyvmxflzjkigallxa23vc"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-elasticbeanstalk = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10f9lg288m74ssm24m7mhphi4h6km84pak0bpg7gd4rnrw4fdw1f"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-elasticloadbalancing = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dz9gx4c83s1qb03kqng5vh9kjihi0jv02j3ndp2z5z10cpncf3p"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-elasticloadbalancingv2 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qs1gjjnvhx1ijm7mr5aa0cv7sanvm81l8kpx1y57zrpa5ikp3r7"; - type = "gem"; - }; - version = "1.11.0"; - }; - aws-sdk-elasticsearchservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zhylvqwln0vz5qhd1vj89s7fwdk330wksp206dphscmqjra0ggz"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-elastictranscoder = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r9waa8jksznqwvlrapf71j8ga6cjm9j6qjrssqps083kxg0sad1"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-emr = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mkb4302iczxmn7al36f151xvjnf8v0r559p4wn6jginvgwxk48n"; - type = "gem"; - }; - version = "1.3.0"; + version = "3.48.3"; }; aws-sdk-firehose = { dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yc2kvnf0hdlpfh3i51m44775vws3k84wvlhnvj68nm5jszhhx7b"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-fms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lqh6pxg3ki2k539xm99p63fai8grswpkyd5nj8dl4pwsqn4xx57"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-gamelift = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wfyq9m0dv9isdriin285daj5b90bbkrk5b0ss0awhcqwarlj29i"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-glacier = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vlg62v7zraz5f7h13wws9cga4sdv62v6lsfkqn2ai6n1ks80c02"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-glue = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rlq8hchn6dkccwdrd27lizfghmgf4lcrdcblhs14sxmwk0jzl25"; - type = "gem"; - }; - version = "1.10.0"; - }; - aws-sdk-greengrass = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05cjp6jvcnzg3jxwcggg31l0sqb743b6x66230nb5ahf7l8sq4fx"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-guardduty = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l2fbhm1d5mgkvrz8jgny2zcd4zzijwy8s4f4p91kn22m1s74cg4"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-health = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b3zgjwh2drkxcbmglw9vz9b8wir0qwxihf2yrra33qhcxvlf29q"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-iam = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wch93pvh5y16ldn1b42igrj0q76j7mfwvkwqnlk8197wpmyzl8z"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-importexport = { - dependencies = ["aws-sdk-core" "aws-sigv2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0clry5ch04npyrgz61xrwwj6kwqai5d9c933rd17jx0r7dm2x5zb"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-inspector = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0blgc82naibxdv5zv7brc8kdp4mnqimxc3lsb2fahn9av4bdh4zf"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-iot = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00paa2lhahcfk1kk8zka7zb3hnia1qj6i8rv5ybapgdq9rj4936q"; - type = "gem"; - }; - version = "1.9.0"; - }; - aws-sdk-iot1clickdevicesservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0k1if31wsy3dpk4mhwc6s86432g8jbbb1w4gpj85qlydrk2c7y96"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-iot1clickprojects = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12r1pkzixj2g0i9mz7ywsr5qlz19868d8qb4www4s45h6qjwxwnz"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-iotanalytics = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a69cv9nypykg6il99znymfm09da4hlh3d6i13kj8gma5q7prnq6"; + sha256 = "0f7s1vqs1qga6jzvjgg4x4hcz1rdycwry5dcizidzffwn9sp9iy0"; type = "gem"; }; - version = "1.2.0"; - }; - aws-sdk-iotdataplane = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0777k6l8phrby6ar5zpbhsp4i77d8bfs5z57axn6ir1q4dalgza5"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-iotjobsdataplane = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05awqr95nlral8f8il5n27swri3vq9y60mhqz9qmhld8w3cwwspj"; - type = "gem"; - }; - version = "1.1.0"; + version = "1.14.0"; }; aws-sdk-kinesis = { dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kw8ksdy6mylrzdswvxxdjb8wim9agdgxpjp3a1aqa72nlswq3nx"; + sha256 = "005dj7m3zi8gkda5g40a0wxlx48g0w5cz4k7783g2p6c0h5wwdsb"; type = "gem"; }; - version = "1.3.0"; - }; - aws-sdk-kinesisanalytics = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1krdg2qvm2if5npbpw4bk2i1kz51bknfy1j5gaiiym1mmrz7lrap"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-kinesisvideo = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1299hi3296i3wjmy8cjzpy10bzpljb638yrbyash39y3znaxk2i8"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-kinesisvideoarchivedmedia = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17sap4wdpi6l6h8yfm9yzjniv4cps5q3wrhdjp6slwrmhrmq2gpx"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-kinesisvideomedia = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rzwpjnym78i5g6427w7war436qnl77qjaiwwh5avrvy12lfjyrb"; - type = "gem"; - }; - version = "1.1.0"; + version = "1.13.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y41nf5p94r2mrmpxx2icylz7g1jm72d1awwpjfrw5zlxbzi8jgj"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-lambda = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ng2k320s81d5v1g2ihjvkmspnyfkcb9v2fc25mszwg9gwq4mhz1"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-lambdapreview = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ys1zpc7jmzn4vs01z5qw7rkg4732fbzpiwj5p0gpgy151hip110"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-lex = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g67akcqmv1i1k4a370vwnb1qkmfl7smfllbw84kd062h8m1h2vl"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-lexmodelbuildingservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0awdfirdc2wn4xaqxkizlxy604gwna55mn261fjwj6a3jp83pb1z"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-lightsail = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gxs8b3grk4dwsldszvkz31w3lypdnyqhqs1c3w7f18b66p5l714"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-machinelearning = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rf84hxrqgzpmr08h14p1070x8cs3x5gxn48l1ia1bdlfjvllv2f"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-macie = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l20rk8r0k6n81vfy132l5xbaxr4h58ykvyhka0xrb2fys5kr704"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-marketplacecommerceanalytics = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mcbk1gwqpfxg9wrf1vd9c4s97d46p425yx4m7fx6z73fb26ckp3"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-marketplaceentitlementservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17r2c9ir63wbhpl4kz3pwkavjqvi73jpx3vpbm8172zqai72m2qw"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-marketplacemetering = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05snignv3fjdfpjw771daxkkm7hlc7wbsi43ajjwvrxzl8apgkl1"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-mediaconvert = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hdliqi7rxhp02rnnnvrkg1pn5rbss577f5di4h1pbcmw29zqa2p"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-medialive = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03pr959i5lnsdw4vagdhfcjfrm01h055j83abs9w2gs4asmknyi9"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-mediapackage = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "190ca52xzdgnfn73qwv4kc2jix2a3s7gxx6a2nij47ak5bs8qhhn"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-mediastore = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m7xjz0xpnwvsm35m2wnp9ja8sqhk5w09jf92frim482vyddk46n"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-mediastoredata = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1da6wd4nrf99mxyv9fay4bbk3n64swzr8989dfjipqa8rpnry9dq"; + sha256 = "1m64sb5nnpryjmjbgvr5lmlrd06wvafd0ss9i9zf3fsi39hqaicg"; type = "gem"; }; - version = "1.2.0"; - }; - aws-sdk-mediatailor = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rm8f2ln263mabj5ia880h8464pxqg7cp1b1dy6mggbj77v4qyw7"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-migrationhub = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vaswa6f4hd7gf5y2rn6jn4rxx4i3dhyngb6446llwc218qqcp5x"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-mobile = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kvx23q0dcf4kznf72fq6vrz2wzprim1n87a7jwwvqp1cm8dkh9s"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-mq = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h258myrx75zvicpdb06bbls4d0fnpfqfp16yc0j5lmqdr6p74qn"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-mturk = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kb5ii2lqiq8va1plyrna0zczgc9p2dgv0a17xx9pzfg2djvc7vz"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-neptune = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rddn8y1cwnj5zahvln643sfb4ayddqmydrxibf5j1nqsvv46lg7"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-opsworks = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mkjf0694daikkqsqygq1f34zw4wiwg57p8vxlwx5fxjbgwfi01a"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-opsworkscm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06067wx6ihk9kj11789dlzag3j2b7zxk9yil4zxy0gv95w37ypzg"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-organizations = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jhll8rgp78pwsd5wgfg4nwxkyzahlh0xrnddw3cx9qhzcb001xn"; - type = "gem"; - }; - version = "1.10.0"; - }; - aws-sdk-pi = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xm7d9ssn4q2107gp90qsi8vjg87wdl5py55qq76m79xmp2i08wi"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-pinpoint = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "023yvhr6xdisyyx9p104hyaq2vy9rs0n43h2dc5nbm58a1bm2zsn"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-polly = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g98zchw6ycnz3anvpc6glxj9kal71mn78gr2i37awb6z0j3mk1g"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-pricing = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hm8m1jhf6qfpy1866ykvvnc51mfbp89mfby6z6yxy00fz6mvax5"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-rds = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "009ns5wfcrxan5hhzsj7gpcwnni2ydq79mk2i3lj4gw87k9kr9zx"; - type = "gem"; - }; - version = "1.23.0"; - }; - aws-sdk-redshift = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rp9zm846rx9vm2qvh238gzixbb7r58xbrrfk0ipsrw6v19b4my4"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-rekognition = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j399i23anlj252rwnj3dcm66787nspfj8hyazfsgb5ww7b2day3"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-resourcegroups = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0f878grncnyxlkml525apx3l28mmq96gfi5vpcjhcw9apz58qclf"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-resourcegroupstaggingapi = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wr75f1gi449x12hai1yjzrlw6cql3z4jyc1hd68wppyf6f1s8kw"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-resources = { - dependencies = ["aws-sdk-acm" "aws-sdk-acmpca" "aws-sdk-alexaforbusiness" "aws-sdk-apigateway" "aws-sdk-applicationautoscaling" "aws-sdk-applicationdiscoveryservice" "aws-sdk-appstream" "aws-sdk-appsync" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-autoscalingplans" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloud9" "aws-sdk-clouddirectory" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudsearch" "aws-sdk-cloudsearchdomain" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codebuild" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-codestar" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-cognitosync" "aws-sdk-comprehend" "aws-sdk-configservice" "aws-sdk-connect" "aws-sdk-costandusagereportservice" "aws-sdk-costexplorer" "aws-sdk-databasemigrationservice" "aws-sdk-datapipeline" "aws-sdk-dax" "aws-sdk-devicefarm" "aws-sdk-directconnect" "aws-sdk-directoryservice" "aws-sdk-dlm" "aws-sdk-dynamodb" "aws-sdk-dynamodbstreams" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-elastictranscoder" "aws-sdk-emr" "aws-sdk-firehose" "aws-sdk-fms" "aws-sdk-gamelift" "aws-sdk-glacier" "aws-sdk-glue" "aws-sdk-greengrass" "aws-sdk-guardduty" "aws-sdk-health" "aws-sdk-iam" "aws-sdk-importexport" "aws-sdk-inspector" "aws-sdk-iot" "aws-sdk-iot1clickdevicesservice" "aws-sdk-iot1clickprojects" "aws-sdk-iotanalytics" "aws-sdk-iotdataplane" "aws-sdk-iotjobsdataplane" "aws-sdk-kinesis" "aws-sdk-kinesisanalytics" "aws-sdk-kinesisvideo" "aws-sdk-kinesisvideoarchivedmedia" "aws-sdk-kinesisvideomedia" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-lambdapreview" "aws-sdk-lex" "aws-sdk-lexmodelbuildingservice" "aws-sdk-lightsail" "aws-sdk-machinelearning" "aws-sdk-macie" "aws-sdk-marketplacecommerceanalytics" "aws-sdk-marketplaceentitlementservice" "aws-sdk-marketplacemetering" "aws-sdk-mediaconvert" "aws-sdk-medialive" "aws-sdk-mediapackage" "aws-sdk-mediastore" "aws-sdk-mediastoredata" "aws-sdk-mediatailor" "aws-sdk-migrationhub" "aws-sdk-mobile" "aws-sdk-mq" "aws-sdk-mturk" "aws-sdk-neptune" "aws-sdk-opsworks" "aws-sdk-opsworkscm" "aws-sdk-organizations" "aws-sdk-pi" "aws-sdk-pinpoint" "aws-sdk-polly" "aws-sdk-pricing" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-rekognition" "aws-sdk-resourcegroups" "aws-sdk-resourcegroupstaggingapi" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-s3" "aws-sdk-sagemaker" "aws-sdk-sagemakerruntime" "aws-sdk-secretsmanager" "aws-sdk-serverlessapplicationrepository" "aws-sdk-servicecatalog" "aws-sdk-servicediscovery" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-simpledb" "aws-sdk-sms" "aws-sdk-snowball" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-storagegateway" "aws-sdk-support" "aws-sdk-swf" "aws-sdk-transcribeservice" "aws-sdk-translate" "aws-sdk-waf" "aws-sdk-wafregional" "aws-sdk-workdocs" "aws-sdk-workmail" "aws-sdk-workspaces" "aws-sdk-xray"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15z91flcf5daz7v5sfrib5sxm4gk6w66jlh93is0ixr6hwanqb2h"; - type = "gem"; - }; - version = "3.22.0"; - }; - aws-sdk-route53 = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ga3rd1b3fgg8z46490gjkf2a7j1vys7mf3wi4qmwg8ijs8gva4c"; - type = "gem"; - }; - version = "1.10.1"; - }; - aws-sdk-route53domains = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02nzhks6kjpdakm3xcc5373g3dnn45a9gr70vc8jhdjyarhcasbk"; - type = "gem"; - }; - version = "1.3.0"; + version = "1.16.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sxd6iwyg54qdzqxqhww1qnhg4z1il1impkg2g8ksgr9q2ykf4jd"; + sha256 = "1bnihahz0va36jcw5wifw6ad0fdarl0lsils6h50wpvzcxzmlm2i"; type = "gem"; }; - version = "1.17.0"; - }; - aws-sdk-sagemaker = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11arjp9mcgy3b8rp6dpdla0zcsrv40sw7cc0azplayk5n6cislx1"; - type = "gem"; - }; - version = "1.11.0"; - }; - aws-sdk-sagemakerruntime = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zyinypfjsf7kp6dh7wbk3f5x3qhj8p76pv332pknrgk94v6rn3i"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-secretsmanager = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b5xk5icz664rjjcy9ijwfg4nr1chg0pbxyrmzy0agh88vxgp71z"; - type = "gem"; - }; - version = "1.10.0"; - }; - aws-sdk-serverlessapplicationrepository = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n7lzzvpyryv1v3pai3yxk2w95zk2yglmdh0k3h84n6z3w6jlgr3"; - type = "gem"; - }; - version = "1.4.0"; - }; - aws-sdk-servicecatalog = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13dhxxp1nmzs71ripdi4yas1wm17w3ks22by6qlbnqy9zwb0r6jg"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-servicediscovery = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "033fynzwr4j6idlk3p5rqk94n0ayxrwjcziky5hnfj2aic2yj3lf"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-ses = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0aa3vq1lscb5cmcc10s38pdw2crdsfjd4gpb6d9j5d5z8wbpqjhz"; - type = "gem"; - }; - version = "1.8.0"; - }; - aws-sdk-shield = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12imklik3j9l4fchyj4q6wpiw27kkm4m29accjwkxxikh70w9q0l"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-simpledb = { - dependencies = ["aws-sdk-core" "aws-sigv2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16qrczxn096aanan2qrvbbk398sqlfiawviz72z9y31pxds7699d"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-sms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d16b5s6x894fagk6mzvli4n9rpsv4gx1xw445nl49jc8z3b941l"; - type = "gem"; - }; - version = "1.1.0"; - }; - aws-sdk-snowball = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17kk7n83zbhms7bvavlasw13ydsiqzm8l2p6dpsa3cjqvs7bn9bw"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-sns = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pkv99yqilpklrhwhxr5lv0xma1irk0j7q5myw220yl84d7c6m04"; - type = "gem"; - }; - version = "1.3.0"; + version = "1.36.0"; }; aws-sdk-sqs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m4lk45bfanxyq3rz428az2bbz2g3xbzq40754d81m0b17kyz6nc"; + sha256 = "1cpmimcnjfwrqv1nmaxp4yyxmh50wg83ccihj8hiafkazg75kfx0"; type = "gem"; }; - version = "1.4.0"; - }; - aws-sdk-ssm = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w5idgdqp3z9s0cf84r66ha1npjhszp0zd3w43rlp96m1z9m8pk8"; - type = "gem"; - }; - version = "1.18.0"; - }; - aws-sdk-states = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sg5z9mgn76l81zgigxrxwnn710gigp6iragc3gvz0cdfwwzd33f"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-storagegateway = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "078j56x8jllk5dsb8crk33336kmcgs83p2achlw5j10mlfzlra6z"; - type = "gem"; - }; - version = "1.6.0"; - }; - aws-sdk-support = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bg642zz7nn3dfr039pgry44js9jlr31yq47rsqzhl6p3qh9yisi"; - type = "gem"; - }; - version = "1.1.0"; + version = "1.13.0"; }; - aws-sdk-swf = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "108gzaw0y83vncbv6rzaww4950cycwh8crcw3vf2av6w0mbqi61f"; + sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; type = "gem"; }; version = "1.1.0"; }; - aws-sdk-transcribeservice = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z66aqfh1s561wa9dqasvbb4shxb2chp12i8h6hs6lxsrpihxbi0"; - type = "gem"; - }; - version = "1.3.0"; - }; - aws-sdk-translate = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17wprz7c8h8bfi1pv8pw2jll4iaixs9v2zd6iyy33zy0ssyzp9jc"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-waf = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kxaspfpgsrwm1vdyqhbjw1l40z5ygkx9if5lfqh80906rns9gwz"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-wafregional = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ryrx7zh7dmxzrvky3kx6dvz22v0s919jkdhqh8rx65p97ikml2c"; - type = "gem"; - }; - version = "1.5.0"; - }; - aws-sdk-workdocs = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07grgjkzg31n3k0ig70gj6pjix44jwnl54lw4pn4yqld3472r296"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-workmail = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04yak9s80kcx0vnz9ghbis5qj274rpkwga2391kky8r2gf40lpn2"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-sdk-workspaces = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; + bson = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq0bayq1ryzd9z4y70w39h1ag2jj6k59bv72agdafrszv13fggf"; + sha256 = "1kgim98b41cj0njlqv1bwvx2m6gw9n7ilwklfn9hivfg096bzl8l"; type = "gem"; }; - version = "1.3.0"; + version = "4.4.2"; }; - aws-sdk-xray = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; + "cool.io" = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00n7nrx5qfbcv94hdlh623nhv269z9abfkb6mj5dmjw4hzpm8d31"; + sha256 = "0l836z3qgrl5829q48qaz1zngqqxy2k0l61swqm0amhyfcgfbz1m"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.4"; }; - aws-sigv2 = { + dig_rb = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1191i9c0kkiyfs3vfwgfxc8kq19rg1q4lkackz56yffv05yp5ng3"; + sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4"; type = "gem"; }; version = "1.0.1"; }; - aws-sigv4 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hzndv113i6bgy2n72i5l3mwn8vjnb6hhjxfkpn9mm2p5ra77yk7"; - type = "gem"; - }; - version = "1.0.3"; - }; - bson = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07baxjrd8rb5gfsv7hh1akjqcpwih76f1711bwjzp228c79ny2na"; - type = "gem"; - }; - version = "4.3.0"; - }; - "cool.io" = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03wwgs427nmic6aa365d7kyfbljpb1ra6syywffxfmz9382xswcp"; - type = "gem"; - }; - version = "1.5.3"; - }; - dig_rb = { + digest-crc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4"; + sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l"; type = "gem"; }; - version = "1.0.1"; + version = "0.4.1"; }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "162a7aiajs7w3rak21y6jidik7zhkm104wcx25190llyqbqkvlp9"; + sha256 = "1kx13w90dnmrfgwgm86h8wsmjmpv19qxvd1f6xxrdjmw0ij0vyqn"; type = "gem"; }; - version = "6.1.0"; + version = "6.3.0"; }; elasticsearch-api = { dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q9shhpifl6cir68zxv30mjjybxsx39asqnircrgs4lqsb20j1n7"; + sha256 = "06dji10nahhqd04igfwcqb1d521lv7gy40g7nv0mx3nnb1c6ksbm"; type = "gem"; }; - version = "6.1.0"; + version = "6.3.0"; }; elasticsearch-transport = { dependencies = ["faraday" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmb587mp526q1wvb1j13rjj13vxl4fcpmm899ipyr88spld5vc7"; + sha256 = "025c0plj3ydrykmwpwhn6vdxfgf4b7xr4gg5dzdd5ck9frvqb6mz"; type = "gem"; }; - version = "6.1.0"; + version = "6.3.0"; }; excon = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; @@ -1424,15 +192,19 @@ }; faraday = { dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; type = "gem"; }; - version = "0.15.2"; + version = "0.15.4"; }; fluent-config-regexp-type = { dependencies = ["fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hk0vxcmlbid7n6piyv3x83j5gyiz7in397l9x3c6nh69wicy7gm"; @@ -1442,42 +214,52 @@ }; fluent-plugin-elasticsearch = { dependencies = ["elasticsearch" "excon" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh7wpj46753mii98ddafl5yas0iw8dc1b87lzgdyfri9z8cbfv1"; + sha256 = "115y11r7rd4hd9gc2lngm6cas1119fas87s75x6iaykqg8hlr99l"; type = "gem"; }; - version = "2.11.1"; + version = "3.4.1"; }; fluent-plugin-kafka = { dependencies = ["fluentd" "ltsv" "ruby-kafka"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16r7ydlnb1ba7adk3f95v3x1qjk22cifd9bvz71099m17njw56g1"; + sha256 = "079isjc1788fbhagrn2qfrp6mcfw0b6kl6dpnrwpwv9865h75hmm"; type = "gem"; }; - version = "0.7.4"; + version = "0.9.2"; }; fluent-plugin-kinesis = { - dependencies = ["aws-sdk" "fluentd" "google-protobuf"]; + dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14hsvbskfviq11408qglqx1434hv6i7qbgqy8nnii8a657fccvxy"; + sha256 = "14jqr13k50vs29akjpi0prcs1fdjy335prlqylvri7bc1cmfkhz3"; type = "gem"; }; - version = "2.1.1"; + version = "3.0.0"; }; fluent-plugin-mongo = { dependencies = ["fluentd" "mongo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w7fla5172x7bll10zja0sg4n0gzkqa191jf6zradhb6416qd355"; + sha256 = "1p5c7j3yx4cjrn4ljxwghrp8yh0rcdra1iafc67i92s1sl8b70dq"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.2"; }; fluent-plugin-record-reformer = { dependencies = ["fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1gwfrfyi9is4l9q4ih3c4l3c9qvyh00jnd2qajdpdh5xjj2m7akn"; @@ -1487,33 +269,41 @@ }; fluent-plugin-rewrite-tag-filter = { dependencies = ["fluent-config-regexp-type" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xra33l2pid84qmgr0ni9dmd114l035z9j4g66wdfyihncnaaamp"; + sha256 = "0kf8p1s02pwhkks82kmkkbfbf4qlhhqiczqah4w0dnp86wp6xyw5"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; fluent-plugin-s3 = { dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102d85igcnnlha8j0vw3pvc0425d38c9r0pryqhz7v1j4p2igi27"; + sha256 = "16zaxvf3rs5lmd933sgyrxkrws0qcd0z2ypbky45gyq8si1dpwcl"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.9"; }; fluent-plugin-scribe = { dependencies = ["fluentd" "thrift"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi"; + sha256 = "19m37d0saknifjg8kva96pgsc7zsmdlwvwiy9gvhi2d6c7bq3q30"; type = "gem"; }; - version = "0.10.14"; + version = "1.0.0"; }; fluent-plugin-webhdfs = { dependencies = ["fluentd" "webhdfs"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1yyv3f0g30x9dzhq74b5cq8z0wbyppw9bb6152v6yrwz25b16231"; @@ -1523,29 +313,38 @@ }; fluentd = { dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02a7xzpq3vs3lgwawygbkzbsjr2p46945l6wc3bkvws47v33yr4d"; + sha256 = "1ppdfa03gzv97px7xhdx5nnzc15g8l7yp10jw87qyl5cp62kpx3c"; type = "gem"; }; - version = "1.2.3"; + version = "1.4.2"; }; google-protobuf = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10r48i7g0387sd8a1cl8n2da54ar9nw29jshmydwmdrb8y5v5nic"; + sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.1"; }; "http_parser.rb" = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; type = "gem"; }; version = "0.6.0"; }; jmespath = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; @@ -1554,31 +353,39 @@ version = "1.4.0"; }; ltsv = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alfq3g0mih4w86736ybnzqmknphm2z95c9q0wl765i4lrmxng11"; + sha256 = "0wrjvc5079zhpn62k1yflrf7js6vaysrg1qwggf7bj2zi0p5rhys"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.2"; }; mongo = { dependencies = ["bson"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qdy2prwr9hv9691xxl0zqgp1s24jm6pknd2vq829yy6a1fv8f87"; + sha256 = "0k0f1826hixqfqgsc9g6rdqrzr5pzy46hszmk6869pmvm638jah1"; type = "gem"; }; - version = "2.2.7"; + version = "2.6.4"; }; msgpack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0zs8v59d77wlx4yylyh0lglsj8sp9jrq11yqngdgn95avfhxjw0s"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.9"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; @@ -1587,38 +394,50 @@ version = "1.13.1"; }; multipart-post = { + groups = ["default"]; + platforms = []; source = { + remotes = ["https://rubygems.org"]; sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; type = "gem"; }; version = "2.0.0"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; ruby-kafka = { + dependencies = ["digest-crc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9p93zgyify9barnzc4di09pm8bdaywqx68149bmw0zzhghqdqa"; + sha256 = "0b5i6vazw9s26nwifwsbd95sl35l5krh3yp4z2zpp6lpp6al36db"; type = "gem"; }; - version = "0.6.7"; + version = "0.7.6"; }; serverengine = { dependencies = ["sigdump"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gkm880njsi9x6vpb5grsspxb097hi8898drlbbkj1wl9qf2xv8l"; + sha256 = "01978684zvab2pbg7r8vm53n8m2h99pc9iqm1wy9gy67y1nxvz13"; type = "gem"; }; - version = "2.0.7"; + version = "2.1.0"; }; sigdump = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb"; @@ -1627,6 +446,8 @@ version = "0.2.4"; }; strptime = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8"; @@ -1635,6 +456,8 @@ version = "0.2.3"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -1643,6 +466,8 @@ version = "0.3.6"; }; thrift = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0aj23ndh5n5yqcvp4c12y7vl5wvxpl66zncf6n6ax2zvb6ig44cv"; @@ -1652,6 +477,8 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; @@ -1661,15 +488,19 @@ }; tzinfo-data = { dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fkihwl9k9pmygl6c4kdlzqv51hn33bvjnxs4q48gs4s63d8gva2"; + sha256 = "1105fp27d527k7rrq1yx1ikbzf1sra046ndayxikkjvay9ql61jz"; type = "gem"; }; - version = "1.2018.5"; + version = "1.2019.1"; }; webhdfs = { dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2"; @@ -1678,11 +509,13 @@ version = "0.8.0"; }; yajl-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01bk8pi6h9wdm0ikjqvl1nxlkrxv3q74m3yfg64va9wvk9sqjvvw"; + sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/nixpkgs/pkgs/tools/misc/hdf4/default.nix index ef3839f67de9..eb57cc45f6a0 100644 --- a/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON" "-DHDF4_BUILD_TOOLS=ON" "-DHDF4_BUILD_UTILS=ON" "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" diff --git a/nixpkgs/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch b/nixpkgs/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch deleted file mode 100644 index 8b32ea4bab1c..000000000000 --- a/nixpkgs/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 38c202df4db8eddd5e6f6f7d6506ce97912a3111 Mon Sep 17 00:00:00 2001 -From: Dana Robinson <derobins@hdfgroup.org> -Date: Mon, 26 Nov 2018 22:10:06 -0800 -Subject: [PATCH] Updated H5S to use the MPI-2 function MPI_Type_get_exten() - where available. OpenMPI 4.0 removed the deprecated MPI-1 MPI_type_extent() - call by default, so this avoids needing a special OpenMPI build. - ---- - src/H5Smpio.c | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -diff --git a/src/H5Smpio.c b/src/H5Smpio.c -index 2bd275a729..e71e2cb858 100644 ---- a/src/H5Smpio.c -+++ b/src/H5Smpio.c -@@ -879,7 +879,18 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, - HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) - } - -- MPI_Type_extent (inner_type, &inner_extent); -+#if MPI_VERSION >= 2 -+{ -+ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, -+ * so we're using the MPI-2 version even though we don't need the lb -+ * value. -+ */ -+ MPI_Aint unused_lb_arg; -+ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); -+} -+#else -+ MPI_Type_extent(inner_type, &inner_extent); -+#endif - stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; - - /* If the element count is larger than what a 32 bit integer can hold, -@@ -1500,7 +1511,18 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, - } - } - -- MPI_Type_extent (old_type, &old_extent); -+#if MPI_VERSION >= 2 -+{ -+ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, -+ * so we're using the MPI-2 version even though we don't need the lb -+ * value. -+ */ -+ MPI_Aint unused_lb_arg; -+ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); -+} -+#else -+ MPI_Type_extent(old_type, &old_extent); -+#endif - - /* Set up the arguments for MPI_Type_struct constructor */ - type[0] = outer_type; --- -2.18.1 - diff --git a/nixpkgs/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch b/nixpkgs/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch deleted file mode 100644 index 8dc831dbba12..000000000000 --- a/nixpkgs/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 8cf3bfb14bd2a80f13d269a9e84cd99f86f19254 Mon Sep 17 00:00:00 2001 -From: Dana Robinson <derobins@hdfgroup.org> -Date: Tue, 27 Nov 2018 10:31:54 -0800 -Subject: [PATCH] Yanked all MPI-1 calls - ---- - src/H5.c | 2 +- - src/H5Smpio.c | 24 ++++++++---------------- - testpar/t_cache.c | 20 ++++++++++---------- - 3 files changed, 19 insertions(+), 27 deletions(-) - -diff --git a/src/H5.c b/src/H5.c -index d1967e611b..bf4643ca59 100644 ---- a/src/H5.c -+++ b/src/H5.c -@@ -138,7 +138,7 @@ H5_init_library(void) - if (mpi_initialized && !mpi_finalized) { - int key_val; - -- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN, -+ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, - (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, - &key_val, NULL))) - HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code) -diff --git a/src/H5Smpio.c b/src/H5Smpio.c -index e71e2cb858..935d27972e 100644 ---- a/src/H5Smpio.c -+++ b/src/H5Smpio.c -@@ -879,18 +879,14 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, - HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) - } - --#if MPI_VERSION >= 2 --{ - /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, - * so we're using the MPI-2 version even though we don't need the lb - * value. - */ -- MPI_Aint unused_lb_arg; -- MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); --} --#else -- MPI_Type_extent(inner_type, &inner_extent); --#endif -+ { -+ MPI_Aint unused_lb_arg; -+ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); -+ } - stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; - - /* If the element count is larger than what a 32 bit integer can hold, -@@ -1511,18 +1507,14 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, - } - } - --#if MPI_VERSION >= 2 --{ - /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, - * so we're using the MPI-2 version even though we don't need the lb - * value. - */ -- MPI_Aint unused_lb_arg; -- MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); --} --#else -- MPI_Type_extent(old_type, &old_extent); --#endif -+ { -+ MPI_Aint unused_lb_arg; -+ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); -+ } - - /* Set up the arguments for MPI_Type_struct constructor */ - type[0] = outer_type; -diff --git a/testpar/t_cache.c b/testpar/t_cache.c -index 5e15ec274c..ca5ded9ecf 100644 ---- a/testpar/t_cache.c -+++ b/testpar/t_cache.c -@@ -1217,15 +1217,15 @@ setup_derived_types(void) - struct mssg_t sample; /* used to compute displacements */ - - /* setup the displacements array */ -- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) || -- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) { -+ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) || -+ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) { - - nerrors++; - success = FALSE; -@@ -1245,7 +1245,7 @@ setup_derived_types(void) - - if ( success ) { - -- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); -+ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); - - if ( result != MPI_SUCCESS ) { - --- -2.18.1 - diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index ae34cfd32358..e6402322d35a 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -16,11 +16,11 @@ assert !cpp || mpi == null; let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.10.4"; + version = "1.10.5"; name = "hdf5-${version}"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; - sha256 = "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj"; + sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8"; }; passthru = { @@ -47,10 +47,6 @@ stdenv.mkDerivation rec { patches = [ ./bin-mv.patch - # upstream patches for openmpi-4 compatiblity - # To be removed with the upgrade to 1.10.5 - ./0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch - ./0001-Yanked-all-MPI-1-calls.patch ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/misc/hexyl/default.nix b/nixpkgs/pkgs/tools/misc/hexyl/default.nix index a672544f1300..a888e9729f19 100644 --- a/nixpkgs/pkgs/tools/misc/hexyl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hexyl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "hexyl-${version}"; - version = "0.4.0"; + pname = "hexyl"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sharkdp"; - repo = "hexyl"; + repo = pname; rev = "v${version}"; - sha256 = "09h01y0r7km0vgljgc8bgiswbrq47id408vpya2da4mijbg4h82r"; + sha256 = "1b5y2lwcv802hjp105h35vda1d6rgysm9qvrm0v96srm0qqh8rq3"; }; - cargoSha256 = "1zy2jvzx62yjaiq25560krz1648vqwfr5kjbq3wz7nlmf1cs7s2c"; + cargoSha256 = "0lnwkp9jxz7c0jp7w8z2kpl2qkpd1np3s83nim8s6srl6aapc94c"; meta = with stdenv.lib; { description = "A command-line hex viewer"; diff --git a/nixpkgs/pkgs/tools/misc/hpl/default.nix b/nixpkgs/pkgs/tools/misc/hpl/default.nix new file mode 100644 index 000000000000..d9aaefb46d94 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/hpl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, openblasCompat, mpi } : + +stdenv.mkDerivation rec { + name = "hpl-${version}"; + version = "2.3"; + + src = fetchurl { + url = "http://www.netlib.org/benchmark/hpl/${name}.tar.gz"; + sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j"; + }; + + enableParallelBuilding = true; + + postInstall = '' + # only contains the static lib + rm -r $out/lib + + install -D testing/ptest/HPL.dat $out/share/hpl/HPL.dat + ''; + + buildInputs = [ openblasCompat mpi ]; + + meta = with stdenv.lib; { + description = "Portable Implementation of the Linpack Benchmark for Distributed-Memory Computers"; + homepage = http://www.netlib.org/benchmark/hpl/; + platforms = platforms.unix; + license = licenses.bsdOriginal; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/nixpkgs/pkgs/tools/misc/ipxe/default.nix index f2fac5e3d0f9..b06a1c47786f 100644 --- a/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -3,8 +3,8 @@ }: let - date = "20190310"; - rev = "b6ffe28a21c53a0946d95751c905d9e0b6c3b630"; + date = "20190318"; + rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218"; in stdenv.mkDerivation { @@ -13,8 +13,8 @@ stdenv.mkDerivation { buildInputs = [ perl cdrkit syslinux xz openssl ]; src = fetchgit { - url = git://git.ipxe.org/ipxe.git; - sha256 = "1s8sy75lpx8zq60wc0i35d8c1wwm1rq3scxpkq31623d097mch59"; + url = https://git.ipxe.org/ipxe.git; + sha256 = "0if3m8h1nfxy4n37cwlfbc5kand52290v80m4zvjppc81im3nr5g"; inherit rev; }; diff --git a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix index 2ec795e78e90..b6b56e1df937 100644 --- a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - name = "kisslicer-1.6.2"; + name = "kisslicer-1.6.3"; src = fetchzip { - url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.2_release.zip"; - sha256 = "0fb7hzic78skq3ykc37srnjsw0yri7m0pb3arlz076ws7jrcbr0f"; + url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.3_release.zip"; + sha256 = "1xmywj5jrcsqv1d5x3mphhvafs4mfm9l12npkhk7l03qxbwg9j82"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix index dfcefe092008..d489a5188f14 100644 --- a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix +++ b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: stdenv.mkDerivation rec { - version = "4.04"; + version = "4.05"; name = "quota-${version}"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "1pwfxza923j75z5lx0w89pj09745zi1swy77cm0zalbzgs4f2nvk"; + sha256 = "1fbsrxhhf1ls7i025db7p66yzjr0bqa2c63cni217v8l21fmnfzg"; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/nixpkgs/pkgs/tools/misc/logstash/default.nix b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index 9f3c441ffcd2..359c714228e0 100644 --- a/nixpkgs/pkgs/tools/misc/logstash/default.nix +++ b/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "01mkb9fr63m3ilp4cbbjccid5m8yc7iqhnli12ynfabsf7302fdz" - else "0r60183yyywabinsv9pkd8sx0wq68h740xi3172fypjfdcqs0g9c"; + then "18j2n6gnhfjmb6skhhrzs0d1zwa1aj9jv37rqvg4w3fimnm8p0sh" + else "181x8y6izrh587a6d1qipgj8wk71v4fggypkzjkns4my00nki42y"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix new file mode 100644 index 000000000000..bb4a6b1436be --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -0,0 +1,53 @@ +{ elk7Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = elk7Version; + name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = + if enableUnfree + then "1dzk9amg23vbkj92wx529i1m2rrfjc0gzkbg6w3f6xaix5zch0vp" + else "07q2gbd3xidcklid5ny22zpb3q5v0z3k2kva6g214k7rnkr9bhyy"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + buildInputs = [ + makeWrapper jre + ]; + + installPhase = '' + mkdir -p $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.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; + platforms = platforms.unix; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock index 58f62b64e718..e1e60663a270 100644 --- a/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: http://rubygems.org/ specs: - lolcat (99.9.19) + lolcat (99.9.69) manpages (~> 0.6.1) + optimist (~> 3.0.0) paint (~> 2.0.0) - trollop (~> 2.1.3) manpages (0.6.1) - paint (2.0.1) - trollop (2.1.3) + optimist (3.0.0) + paint (2.0.3) PLATFORMS ruby @@ -16,4 +16,4 @@ DEPENDENCIES lolcat BUNDLED WITH - 1.14.6 + 1.16.3 diff --git a/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix b/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix index 3e68f307530e..9e351eecb829 100644 --- a/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/lolcat/gemset.nix @@ -1,12 +1,12 @@ { lolcat = { - dependencies = ["manpages" "paint" "trollop"]; + dependencies = ["manpages" "optimist" "paint"]; source = { remotes = ["http://rubygems.org"]; - sha256 = "05zm92ad0ws9fklpz1xk94hy95argwana01c6rr2xbx2q4mcil9m"; + sha256 = "0d1yh2ikyhyh7am4qznd6fzv2pyvk82xrnsrsbbyxzcqfz9x6aa9"; type = "gem"; }; - version = "99.9.19"; + version = "99.9.69"; }; manpages = { source = { @@ -16,20 +16,20 @@ }; version = "0.6.1"; }; - paint = { + optimist = { source = { remotes = ["http://rubygems.org"]; - sha256 = "1gnh9cihc84w4xbw51pg15crjvhblbq6nkzljrp7kmn3434nsg0d"; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; type = "gem"; }; - version = "2.0.1"; + version = "3.0.0"; }; - trollop = { + paint = { source = { remotes = ["http://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; + sha256 = "0ldb269l3pzkihmsws19cr9h3l6naw8c2fqpav8ck3nllnyiv7r2"; type = "gem"; }; - version = "2.1.3"; + version = "2.0.3"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/misc/pdd/default.nix b/nixpkgs/pkgs/tools/misc/pdd/default.nix index da595e0591a4..f94d2cc27379 100644 --- a/nixpkgs/pkgs/tools/misc/pdd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pdd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pdd"; - version = "1.3.1"; + version = "1.4"; src = fetchFromGitHub { owner = "jarun"; repo = "pdd"; rev = "v${version}"; - sha256 = "0kl6d9nivf6jj1j70alz64iwbp3ip9rg4x506nannii2cfmmx5wr"; + sha256 = "1cirb8mmxxadks7az6a3a4sp8djv45cwa9dx0zrarzfmw0x7xb9g"; }; format = "other"; diff --git a/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/nixpkgs/pkgs/tools/misc/plantuml/default.nix index dd9b6d0b260b..4619d05c4c6a 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.2"; + version = "1.2019.4"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "17b9nwj0r4nbajql611lhy1kkgzigq8p8hkyv90psm7avwyd7fk2"; + sha256 = "0kd0f7kknl6x1dibh4gsx3pl58bzylx42lxwmh9zv4d53gm6a93r"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix index b0d1afc654d8..10972d9fa894 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "powerline-go"; - version = "1.11.0"; + version = "1.12.1"; name = "${pname}-${version}"; rev = "v${version}"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "justjanne"; repo = pname; inherit rev; - sha256 = "1s3d9p4jf23n63n6vx3frnw3wkmg3kyiazapixy66790qkx6ddi9"; + sha256 = "0r2n3hjgr7c7nwwcph7i2lv3709z9cyc8gmsinlzjwny998akyf4"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix b/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix index e033a1cf48cf..85bf229a2697 100644 --- a/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix +++ b/nixpkgs/pkgs/tools/misc/powerline-go/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211"; + sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "57f370e13068146efe1cb7129f79e5d51da8a242"; - sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb"; + rev = "2cbc9195c892b304060269ef280375236d2fcac9"; + sha256 = "1m66hhh37lxn525y2gnmh4ipc88c3wfiixr5ydywa9v1z90wxw5r"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226"; - sha256 = "1fdab3scp9fm88jxwjw8a3hh5ykx6ads3zcacgy48k2n6b0rqrdw"; + rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"; + sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "9950ad118b73f9207b991f01920a3509c68f7f2b"; - sha256 = "1607m89kpdxgc2lj14mrp02bg7c42g1zv0fzrl5961gvm5qzbjja"; + rev = "4b34438f7a67ee5f45cc6132e2bad873a20324e9"; + sha256 = "1xnsiaikz62wqjpaly1j4nqwp504gih5mgw9wdj1pp1d4bmx0vl0"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "7dd2c8130f5e924233f5543598300651c386d431"; - sha256 = "0ja6skzplirb7dgf5d4wi0navinf8j5iakak020lwm7287wnpcrg"; + rev = "f4905fbd45b6790792202848439271c74074bbfd"; + sha256 = "184d6ap2g92jvx0532lymdqbnx9vi9ips4dq5lnqbby0caccc6r1"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index 597d0b566d9e..7f9638a3ffc7 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "1k2nnq15h5grymiylnh1iqipxn315paq58habfmaix2zlj3n3dy2"; + sha256 = "0j9qn516j0fdz1x196xsdai3qk3jmlamm53zvngqjbjzdfkdclqw"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/misc/sl/default.nix b/nixpkgs/pkgs/tools/misc/sl/default.nix index 4299073d96ba..641a0c3e3652 100644 --- a/nixpkgs/pkgs/tools/misc/sl/default.nix +++ b/nixpkgs/pkgs/tools/misc/sl/default.nix @@ -7,29 +7,30 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "eyJhb"; repo = "sl"; - rev = "${version}"; + rev = version; sha256 = "029lv6vw39c7gj8bkfyqs8q4g32174vbmghhhgfk8wrhnxq60qn7"; }; buildInputs = [ ncurses ]; - buildFlags = [ "CC=cc" ]; - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp sl $out/bin - cp sl.1 $outputMan + runHook preInstall + + install -Dm755 -t $out/bin sl + install -Dm644 -t $out/share/man/man1 sl.1{,.ja} + + runHook postInstall ''; meta = with stdenv.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 { shortName = "Toyoda Masashi's free software license"; fullName = shortName; url = https://github.com/eyJhb/sl/blob/master/LICENSE; }; - maintainers = [ maintainers.eyjhb ]; - description = "Steam Locomotive runs across your terminal when you type 'sl'"; + maintainers = with maintainers; [ eyjhb ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix index 4cbb2943d3cf..eed527da4168 100644 --- a/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttfautohint/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "1.8.2"; + version = "1.8.3"; name = "ttfautohint-${version}"; src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "19w9g1ksr0vyblgcirppj0279gfj5s902jblzgav5a4n2mq42rrq"; + sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7"; }; postAutoreconf = '' diff --git a/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix new file mode 100644 index 000000000000..ac950894035b --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/vdirsyncer/stable.nix @@ -0,0 +1,52 @@ +{ lib, python3Packages, fetchpatch }: + +# Packaging documentation at: +# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst +python3Packages.buildPythonApplication rec { + version = "0.16.7"; + pname = "vdirsyncer"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; + }; + + propagatedBuildInputs = with python3Packages; [ + click click-log click-threading + requests_toolbelt + requests + requests_oauthlib # required for google oauth sync + atomicwrites + ]; + + nativeBuildInputs = with python3Packages; [ setuptools_scm ]; + + checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; + + patches = [ + # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 + (fetchpatch { + url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch; + sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; + }) + ]; + + postPatch = '' + # Invalid argument: 'perform_health_check' is not a valid setting + substituteInPlace tests/conftest.py \ + --replace "perform_health_check=False" "" + substituteInPlace tests/unit/test_repair.py \ + --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + ''; + + checkPhase = '' + make DETERMINISTIC_TESTS=true test + ''; + + meta = with lib; { + homepage = https://github.com/pimutils/vdirsyncer; + description = "Synchronize calendars and contacts"; + license = licenses.mit; + maintainers = with maintainers; [ loewenheim ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index b5bb97ce5724..d3cca59bf190 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,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 = "2019.04.01"; + version = "2019.04.07"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0srh04k0p088rxbyxvnhngqyymwqhykqv02sdaqvkl9jhp43r0sm"; + sha256 = "1krx4y8nzpaqpq9qs8dnv2y988jpdccyfl9sdx9wrb0baycl119k"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/airfield/deps.sh b/nixpkgs/pkgs/tools/networking/airfield/deps.sh index 216e3c11a9a2..77648e2fbfbc 100755 --- a/nixpkgs/pkgs/tools/networking/airfield/deps.sh +++ b/nixpkgs/pkgs/tools/networking/airfield/deps.sh @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -node2nix -6 -i deps.json \ +node2nix -8 -i deps.json \ --no-copy-node-env \ -e ../../../development/node-packages/node-env.nix -c node.nix diff --git a/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix index 13edd48e37d2..eb54c4248cb8 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node-packages.nix @@ -4,22 +4,22 @@ let sources = { - "ajv-5.5.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "5.5.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; - sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; - "asn1-0.2.3" = { + "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "assert-plus-1.0.0" = { @@ -49,22 +49,22 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.7.0" = { + "aws4-1.8.0" = { name = "aws4"; packageName = "aws4"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; - sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; }; }; - "bcrypt-pbkdf-1.0.1" = { + "bcrypt-pbkdf-1.0.2" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; "buffer-crc32-0.1.1" = { @@ -94,22 +94,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "combined-stream-1.0.6" = { + "combined-stream-1.0.7" = { name = "combined-stream"; packageName = "combined-stream"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"; + sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; "commander-0.6.1" = { @@ -175,13 +166,13 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "debug-3.1.0" = { + "debug-4.1.1" = { name = "debug"; packageName = "debug"; - version = "3.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; "delayed-stream-1.0.0" = { @@ -202,22 +193,22 @@ let sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; }; }; - "ecc-jsbn-0.1.1" = { + "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "extend-3.0.1" = { + "extend-3.0.2" = { name = "extend"; packageName = "extend"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"; - sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"; + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extsprintf-1.3.0" = { @@ -229,13 +220,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-1.1.0" = { + "fast-deep-equal-2.0.1" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "c053477817c86b51daa853c81e059b733d023614"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -256,13 +247,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "form-data-2.3.2" = { + "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "formidable-1.0.11" = { @@ -301,13 +292,13 @@ let sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "har-validator-5.0.3" = { + "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; - version = "5.0.3"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "http-signature-1.2.0" = { @@ -355,13 +346,13 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; - "json-schema-traverse-0.3.1" = { + "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -382,13 +373,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "lodash-4.17.10" = { + "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"; + sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; "methods-0.0.1" = { @@ -409,22 +400,22 @@ let sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; }; }; - "mime-db-1.33.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.33.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.18" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.18"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "mkdirp-0.3.3" = { @@ -436,22 +427,22 @@ let sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13"; }; }; - "ms-2.0.0" = { + "ms-2.1.1" = { name = "ms"; packageName = "ms"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; - "oauth-sign-0.8.2" = { + "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; - version = "0.8.2"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "pause-0.0.1" = { @@ -472,6 +463,15 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; + "psl-1.1.31" = { + name = "psl"; + packageName = "psl"; + version = "1.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -481,6 +481,15 @@ let 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=="; + }; + }; "qs-0.5.1" = { name = "qs"; packageName = "qs"; @@ -517,13 +526,13 @@ let sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; - "redis-commands-1.3.5" = { + "redis-commands-1.4.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.3.5"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; - sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA=="; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz"; + sha512 = "cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw=="; }; }; "redis-parser-2.6.0" = { @@ -562,22 +571,22 @@ let sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }; }; - "sshpk-1.14.2" = { + "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; - "tough-cookie-2.3.4" = { + "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.3.4"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; "tunnel-agent-0.6.0" = { @@ -607,13 +616,22 @@ let sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; - "uuid-3.3.0" = { + "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=="; + }; + }; + "uuid-3.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; - sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; }; }; "verror-1.10.0" = { @@ -644,13 +662,13 @@ in sources."cookie-0.0.5" sources."cookie-signature-0.0.1" sources."crc-0.2.0" - sources."debug-3.1.0" + sources."debug-4.1.1" sources."formidable-1.0.11" sources."fresh-0.1.0" sources."methods-0.0.1" sources."mime-1.2.6" sources."mkdirp-0.3.3" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."pause-0.0.1" sources."qs-0.5.1" sources."range-parser-0.0.4" @@ -661,7 +679,7 @@ in description = "Sinatra inspired web development framework"; }; production = true; - bypassCache = false; + bypassCache = true; }; "swig-0.14.0" = nodeEnv.buildNodePackage { name = "swig"; @@ -679,7 +697,7 @@ in description = "A fast django-like templating engine for node.js and browsers."; }; production = true; - bypassCache = false; + bypassCache = true; }; "consolidate-0.10.0" = nodeEnv.buildNodePackage { name = "consolidate"; @@ -695,7 +713,7 @@ in homepage = https://github.com/visionmedia/consolidate.js; }; production = true; - bypassCache = false; + bypassCache = true; }; redis = nodeEnv.buildNodePackage { name = "redis"; @@ -707,7 +725,7 @@ in }; dependencies = [ sources."double-ended-queue-2.1.0-0" - sources."redis-commands-1.3.5" + sources."redis-commands-1.4.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -717,22 +735,22 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; connect-redis = nodeEnv.buildNodePackage { name = "connect-redis"; packageName = "connect-redis"; - version = "3.3.3"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz"; - sha512 = "rpWsW2uk1uOe/ccY/JvW+RiLrhZm7auIx8z4yR+KXemFTIhJyD58jXiJbI0E/fZCnybawpdSqOZ+6/ah6aBeyg=="; + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.4.1.tgz"; + sha512 = "oXNcpLg/PJ6G4gbhyGwrQK9mUQTKYa2aEnOH9kWIxbNUjIFPqUmzz75RdLp5JTPSjrBVcz+9ll4sSxfvlW0ZLA=="; }; dependencies = [ - sources."debug-3.1.0" + sources."debug-4.1.1" sources."double-ended-queue-2.1.0-0" - sources."ms-2.0.0" + sources."ms-2.1.1" sources."redis-2.8.0" - sources."redis-commands-1.3.5" + sources."redis-commands-1.4.0" sources."redis-parser-2.6.0" ]; buildInputs = globalBuildInputs; @@ -742,18 +760,18 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; - sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; + url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz"; + sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg=="; }; dependencies = [ - sources."lodash-4.17.10" + sources."lodash-4.17.11" ]; buildInputs = globalBuildInputs; meta = { @@ -762,61 +780,66 @@ in license = "MIT"; }; production = true; - bypassCache = false; + bypassCache = true; }; request = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.87.0"; + version = "2.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; dependencies = [ - sources."ajv-5.5.2" - sources."asn1-0.2.3" + sources."ajv-6.10.0" + sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.7.0" - sources."bcrypt-pbkdf-1.0.1" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."co-4.6.0" - sources."combined-stream-1.0.6" + sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.1" - sources."extend-3.0.1" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.3.2" + sources."form-data-2.3.3" sources."getpass-0.1.7" sources."har-schema-2.0.0" - sources."har-validator-5.0.3" + sources."har-validator-5.1.3" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" - sources."oauth-sign-0.8.2" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" - sources."punycode-1.4.1" + sources."psl-1.1.31" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" - sources."tough-cookie-2.3.4" + sources."sshpk-1.16.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.3.0" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -826,6 +849,6 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/networking/airfield/node.nix b/nixpkgs/pkgs/tools/networking/airfield/node.nix index 8f3be4cc8c7f..29d77f0bf9a6 100644 --- a/nixpkgs/pkgs/tools/networking/airfield/node.nix +++ b/nixpkgs/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/networking/aria2/default.nix b/nixpkgs/pkgs/tools/networking/aria2/default.nix index 2cf735328974..8d9ec9288114 100644 --- a/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 -, cppunit +, cppunit, sphinx , Security }: @@ -23,13 +23,17 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ stdenv.lib.optional stdenv.isDarwin Security; configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; + prePatch = '' + patchShebangs doc/manual-src/en/mkapiref.py + ''; + checkInputs = [ cppunit ]; doCheck = false; # needs the net diff --git a/nixpkgs/pkgs/tools/networking/autossh/default.nix b/nixpkgs/pkgs/tools/networking/autossh/default.nix index 3ff06960156a..55b464607b11 100644 --- a/nixpkgs/pkgs/tools/networking/autossh/default.nix +++ b/nixpkgs/pkgs/tools/networking/autossh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.harding.motd.ca/autossh/; + homepage = https://www.harding.motd.ca/autossh/; description = "Automatically restart SSH sessions and tunnels"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/networking/boringtun/default.nix b/nixpkgs/pkgs/tools/networking/boringtun/default.nix new file mode 100644 index 000000000000..c7ddb44d0fe5 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/boringtun/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "boringtun"; + # "boringtun" is still undergoing review for security concerns. + # The GitHub page does not show any release yet, + # use 20190407 as version number to indicate that it is an unstable version. + version = "20190407"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = pname; + rev = "b040eb4fd1591b1d5ceb07c6cbb0856553f50adc"; + sha256 = "04i53dvxld2a0xzr0gfl895rcwfvisj1rfs7rl0444gml8s8xyb3"; + }; + + cargoSha256 = "0mqgd5r3rdzaw3vkmz0rswn3cwq9b4im6g4rrq7wr7pgrzq96xwm"; + + # To prevent configuration phase error that is caused by + # lacking a new line in file ".cargo/config", + # we append a new line to the end of file. + preConfigure = "echo '' >> .cargo/config"; + + # Testing this project requires sudo, Docker and network access, etc. + doCheck = false; + + meta = with stdenv.lib; { + description = "Userspace WireGuard® implementation in Rust"; + homepage = https://github.com/cloudflare/boringtun; + license = licenses.bsd3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/brook/default.nix b/nixpkgs/pkgs/tools/networking/brook/default.nix new file mode 100644 index 000000000000..b840628e2151 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "brook"; + version = "20190401"; + + goPackagePath = "github.com/txthinking/brook"; + + src = fetchFromGitHub { + owner = "txthinking"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "0kx0dpvr3llpdzmw5bvzhdvwkmzrv6kqbsilx6rgrvyl61y9pyry"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/txthinking/brook; + description = "A cross-platform Proxy/VPN software"; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ xrelkd ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/networking/brook/deps.nix b/nixpkgs/pkgs/tools/networking/brook/deps.nix new file mode 100644 index 000000000000..68fffd34e2a3 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/brook/deps.nix @@ -0,0 +1,173 @@ +[ + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226"; + sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57"; + sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "878a968ab22548362a09bdb3322f98b00f470d46"; + sha256 = "15nkffa8ylr5kkv52gyry675l8bzv3c0xx39j0fzz0vp2kcjyy8x"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "93c3765e9bb2e29c6a63277c9f829dae34ec24eb"; + sha256 = "043yalxp97vc9xsd5npms0h6slxrlzf8dzvd9l0wcxa8v0cl9lp6"; + }; + } + { + goPackagePath = "github.com/jinzhu/inflection"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/inflection"; + rev = "04140366298a54a039076d798123ffa108fff46c"; + sha256 = "1s4qcnwaajp3c5ykwx4dfy32hykwsm0ki7kx8lcw8b0z0grkz6qh"; + }; + } + { + goPackagePath = "github.com/jmoiron/sqlx"; + fetch = { + type = "git"; + url = "https://github.com/jmoiron/sqlx"; + rev = "1d3423c595d749e4613fce663591b44ae539d377"; + sha256 = "0947211fqibv9sqsk22lfnk080vqnsxmsan9fff5phygbmzbhzzb"; + }; + } + { + goPackagePath = "github.com/mdp/qrterminal"; + fetch = { + type = "git"; + url = "https://github.com/mdp/qrterminal"; + rev = "28b49810f53911623d0a538d8edc01b8cbe2bd0e"; + sha256 = "17dq5niw57r1iq1rn1crpgbq1ydrcxqpzc9gj7dd1snc0p9n1rv1"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "73601d4aed9d844322611759d7f3619110b7c88e"; + sha256 = "1frnj97bbch1qhg55fx2yz6mdjsz8fw94sj7pkrjms239j7vqcvm"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/patrickmn/go-cache"; + rev = "5633e0862627c011927fa39556acae8b1f1df58a"; + sha256 = "1zjk6yvig68zcbipa85dxz9xa82fk4zp4q33hwzxdv6h68wga5bs"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { + goPackagePath = "github.com/txthinking/gotun2socks"; + fetch = { + type = "git"; + url = "https://github.com/txthinking/gotun2socks"; + rev = "35016fdae05e78db993d43f55eb96ddbe3958252"; + sha256 = "11rl8pqyd6jzi5alpymzi0i5q7pk2492di44v85g7r24y6livrjg"; + }; + } + { + goPackagePath = "github.com/txthinking/mailx"; + fetch = { + type = "git"; + url = "https://github.com/txthinking/mailx"; + rev = "ebc2af2e1aa8d2178c30786c18eb138fbe40010d"; + sha256 = "02h5b922savsljcgjz3gxkydk52zd2gbs51prz88l60n6miv9k70"; + }; + } + { + goPackagePath = "github.com/txthinking/socks5"; + fetch = { + type = "git"; + url = "https://github.com/txthinking/socks5"; + rev = "254e122c4eaf8657900905ed5bed5777870b9df8"; + sha256 = "1q43sxzacj216mdzl44khhx51w1z78jpraw955dnjv9va0zqbhmi"; + }; + } + { + goPackagePath = "github.com/txthinking/x"; + fetch = { + type = "git"; + url = "https://github.com/txthinking/x"; + rev = "e13a838cdc21596c45b4e6b6fd15c822597c9ae3"; + sha256 = "0l5gzhy3h3qynfkgd789hxkv433yqdn1mmk945bwjha7vrm4rx2z"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "38d8ce5564a5b71b2e3a00553993f1b9a7ae852f"; + sha256 = "1x52liy2540pw75sqsw4vpg41vq2dnmqpc0j5r7k6jxv6xmbr5mb"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "eb5bcb51f2a31c7d5141d810b70815c05d9c9146"; + sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "31e7599a6c37728c25ca34167be099d072ad335d"; + sha256 = "18i17j7nkkc5dl9rpzm8l345r409hfj4knfnldar684337x1irrf"; + }; + } + { + goPackagePath = "gopkg.in/russross/blackfriday.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/russross/blackfriday.v2"; + rev = "d3b5b032dc8e8927d31a5071b56e14c89f045135"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "rsc.io/qr"; + fetch = { + type = "git"; + url = "https://github.com/rsc/qr"; + rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe"; + sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3"; + }; + } +] diff --git a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 6c440fc48fd8..993e9ad74692 100644 --- a/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, runtimeShell }: let - version = "1.7.23"; + version = "1.7.36"; jar = fetchurl { name = "burpsuite.jar"; url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; - sha256 = "1y83qisn9pkn88vphpli7h8nacv8jv3sq0h04zbri25nfkgvl4an"; + sha256 = "12m4fn04yd89r6x4m4yd668p5v0bs9b1h6p239bjj11ykyi3g51a"; }; launcher = '' #!${runtimeShell} diff --git a/nixpkgs/pkgs/tools/networking/connman/default.nix b/nixpkgs/pkgs/tools/networking/connman/default.nix index e960f8c3a848..a4e8c17a545e 100644 --- a/nixpkgs/pkgs/tools/networking/connman/default.nix +++ b/nixpkgs/pkgs/tools/networking/connman/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.36"; + version = "1.37"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; - sha256 = "0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7"; + sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; }; buildInputs = [ openconnect polkit diff --git a/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/nixpkgs/pkgs/tools/networking/dropbear/default.nix index 32d55d2009a5..c51f0a4fdf02 100644 --- a/nixpkgs/pkgs/tools/networking/dropbear/default.nix +++ b/nixpkgs/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2018.76"; + name = "dropbear-2019.78"; src = fetchurl { url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; + sha256 = "19242qlr40pbqfqd0gg6h8qpj38q6lgv03ja6sahj9vj2abnanaj"; }; dontDisableStatic = enableStatic; diff --git a/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix index 6926f1522c71..6fdcfaa70db0 100644 --- a/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/nixpkgs/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { homepage = https://github.com/hzeller/gmrender-resurrect; license = licenses.gpl2; platforms = platforms.linux; + broken = true; maintainers = [ maintainers.koral ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix index b2826a5cbc6b..8c71018ba869 100644 --- a/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "0sw9fjamd5wjrsxnxsih9532yf6x3rrjmv5ybskkpk7b6acyqjj1"; + sha256 = "1gn8i3jxy6zwrqxmkzc1n55sw29jxdjr4ihv33q2kcp7b90b4wsq"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 1d2bfdc91189..612e3ec0f835 100644 --- a/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -11,9 +11,21 @@ stdenv.mkDerivation rec { patches = [ ./whois-Update-Canadian-TLD-server.patch ./service-name.patch + # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 + ./inetutils-1_9-PATH_PROCNET_DEV.patch ]; - buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; + nativeBuildInputs = [ help2man perl /* for `whois' */ ]; + buildInputs = [ ncurses /* for `talk' */ ]; + + # Don't use help2man if cross-compiling + # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html + # https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44 + preConfigure = let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; + in lib.optionalString isCross '' + export HELP2MAN=true + ''; configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd diff --git a/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch b/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch new file mode 100644 index 000000000000..2592989a90a3 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch @@ -0,0 +1,26 @@ +inetutils: define PATH_PROCNET_DEV if not already defined + +this prevents the following compilation error : +system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) + +this patch comes from : + http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/ + +Upstream-Status: Inappropriate [not author] + +Signed-of-by: Eric Bénard <eric@eukrea.com> +--- +diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c +--- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500 ++++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500 +@@ -49,6 +49,10 @@ + #include "../ifconfig.h" + + ++#ifndef PATH_PROCNET_DEV ++ #define PATH_PROCNET_DEV "/proc/net/dev" ++#endif ++ + /* ARPHRD stuff. */ + + static void diff --git a/nixpkgs/pkgs/tools/networking/ip2location/default.nix b/nixpkgs/pkgs/tools/networking/ip2location/default.nix index 00a3f7f3b6b0..3c2e7f53beeb 100644 --- a/nixpkgs/pkgs/tools/networking/ip2location/default.nix +++ b/nixpkgs/pkgs/tools/networking/ip2location/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = http://www.ip2location.com/free/applications; + homepage = https://www.ip2location.com/free/applications; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/networking/keepalived/default.nix b/nixpkgs/pkgs/tools/networking/keepalived/default.nix index d38ff60f7062..43d0944a4159 100644 --- a/nixpkgs/pkgs/tools/networking/keepalived/default.nix +++ b/nixpkgs/pkgs/tools/networking/keepalived/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://keepalived.org; + homepage = https://keepalived.org; description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix index 15ec2ef41cd7..6f0732b8cfdf 100644 --- a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modem-manager/default.nix @@ -1,56 +1,41 @@ { stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig -, libmbim, libqmi, systemd, fetchpatch }: +, libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: stdenv.mkDerivation rec { - name = "modem-manager-${version}"; - version = "1.7.990"; + pname = "modem-manager"; + version = "1.10.0"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; + sha256 = "1qkfnxqvaraz1npahqvm5xc73mbxxic8msnsjmlwkni5c2ckj3zx"; }; - nativeBuildInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; - patches = [ - # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) - (fetchpatch { - url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609"; - sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j"; - }) - ]; - configureFlags = [ "--with-polkit" - "--with-udev-base-dir=$(out)/lib/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-udev-base-dir=${placeholder ''out''}/lib/udev" + "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d" + "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" "--sysconfdir=/etc" "--localstatedir=/var" - "--with-suspend-resume=systemd" + "--with-systemd-suspend-resume" + "--with-systemd-journal" ]; - installFlags = [ "DESTDIR=\${out}" ]; - - preInstall = '' - mkdir -p $out/etc/systemd/system + preCheck = '' + export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" ''; - postInstall = '' - # rename to modem-manager to be in style - mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service - rm -rf $out/$out/etc - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done + doCheck = true; + postInstall = '' # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. - ln -s $out/etc/systemd/system/modem-manager.service \ + ln -s $out/etc/systemd/system/ModemManager.service \ $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service ''; diff --git a/nixpkgs/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix index f8c3d7541008..75462659699c 100644 --- a/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -1,31 +1,26 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe -, xapian, glib, gmime, texinfo , emacs, guile +, xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk24x-gtk3, libsoup, icu , withMug ? false }: stdenv.mkDerivation rec { name = "mu-${version}"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; - rev = "v${version}"; - sha256 = "0y6azhcmqdx46a9gi7mn8v8p0mhfx2anjm5rj7i69kbr6j8imlbc"; + rev = version; + sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz"; }; - # 0.9.18 and 1.0 have 2 failing tests but previously we had no tests - patches = [ - ./failing_tests.patch - ]; - # test-utils coredumps so don't run those postPatch = '' sed -i -e '/test-utils/d' lib/parser/Makefile.am ''; buildInputs = [ - sqlite xapian glib gmime texinfo emacs guile libsoup icu + sqlite xapian glib gmime3 texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; @@ -54,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; - homepage = http://www.djcbsoftware.nl/code/mu/; + homepage = https://www.djcbsoftware.nl/code/mu/; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; diff --git a/nixpkgs/pkgs/tools/networking/mu/failing_tests.patch b/nixpkgs/pkgs/tools/networking/mu/failing_tests.patch deleted file mode 100644 index c45834ff2082..000000000000 --- a/nixpkgs/pkgs/tools/networking/mu/failing_tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/mu/tests/test-mu-query.c b/mu/tests/test-mu-query.c -index 73cbd3f4..46a0b131 100644 ---- a/mu/tests/test-mu-query.c -+++ b/mu/tests/test-mu-query.c -@@ -753,10 +753,10 @@ main (int argc, char *argv[]) - g_test_add_func ("/mu-query/test-mu-query-sizes", - test_mu_query_sizes); - -- g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", -- test_mu_query_dates_helsinki); -- g_test_add_func ("/mu-query/test-mu-query-dates-sydney", -- test_mu_query_dates_sydney); -+ /* g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", */ -+ /* test_mu_query_dates_helsinki); */ -+ /* g_test_add_func ("/mu-query/test-mu-query-dates-sydney", */ -+ /* test_mu_query_dates_sydney); */ - g_test_add_func ("/mu-query/test-mu-query-dates-la", - test_mu_query_dates_la); diff --git a/nixpkgs/pkgs/tools/networking/network-manager/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/default.nix index 48848c0ead72..1695e23514a9 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ let pname = "NetworkManager"; in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.14.4"; + version = "1.16.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm"; + sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf"; }; outputs = [ "out" "dev" ]; @@ -88,13 +88,15 @@ in stdenv.mkDerivation rec { # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' - # rename to network-manager to be in style - mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service - # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + + # Add the legacy service name from before #51382 to prevent NetworkManager + # from not starting back up: + # TODO: remove this once 19.10 is released + ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service ''; passthru = { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch index 949608095528..adf70421ed82 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch @@ -43,7 +43,7 @@ + ping_binary = "@inetutils@/bin/ping"; log_domain = LOGD_IP4; } - } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) { + } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { gw = nm_ip6_config_best_default_route_get (priv->ip_config_6); if (gw) { nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); @@ -54,12 +54,13 @@ } --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c -@@ -421,7 +421,7 @@ +@@ -421,8 +421,8 @@ /* construct the argument list */ argv = g_ptr_array_sized_new (4); - g_ptr_array_add (argv, "/sbin/modprobe"); + g_ptr_array_add (argv, "@kmod@/bin/modprobe"); + g_ptr_array_add (argv, "--use-blacklist"); g_ptr_array_add (argv, (char *) arg1); va_start (ap, arg1); diff --git a/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 1fcbce28cc44..f4ffe620e744 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3, +{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let pname = "NetworkManager-fortisslvpn"; - version = "1.2.8"; + version = "1.2.10"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w"; + sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s"; }; patches = [ @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ openfortivpn networkmanager ppp ] ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig file ]; configureFlags = [ "--without-libnm-glib" diff --git a/nixpkgs/pkgs/tools/networking/nfdump/default.nix b/nixpkgs/pkgs/tools/networking/nfdump/default.nix index 7af852095124..5ad3adfc9153 100644 --- a/nixpkgs/pkgs/tools/networking/nfdump/default.nix +++ b/nixpkgs/pkgs/tools/networking/nfdump/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchFromGitHub, bzip2, yacc, flex }: +{ stdenv, fetchFromGitHub +, autoconf, automake, libtool, pkg-config +, bzip2, libpcap, flex, yacc }: -let version = "1.6.16"; in +let version = "1.6.17"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nfdump-${version}"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "0dgrzf9m4rg5ygibjw21gjdm9am3570wys7wdh5k16nsnyai1gqm"; + sha256 = "1z8zpvd9jfi2raafcbkykw55y0hd4mp74jvna19h3k0g86mqkxya"; }; - nativeBuildInputs = [yacc flex]; - buildInputs = [bzip2]; + nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; + buildInputs = [ bzip2 libpcap ]; + + preConfigure = '' + # The script defaults to glibtoolize on darwin, so we pass the correct + # name explicitly. + LIBTOOLIZE=libtoolize ./autogen.sh + ''; + + configureFlags = [ + "--enable-nsel" + "--enable-sflow" + "--enable-readpcap" + "--enable-nfpcapd" + ]; meta = with stdenv.lib; { description = "Tools for working with netflow data"; diff --git a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix index 26bcc8f803f1..d0aec7889efa 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-1/default.nix @@ -28,4 +28,8 @@ buildGoPackage rec { ''; buildFlags = [ "-tags release" ]; + + meta = { + homepage = https://ngrok.com/; + }; } diff --git a/nixpkgs/pkgs/tools/networking/nzbget/default.nix b/nixpkgs/pkgs/tools/networking/nzbget/default.nix index 20a448b0ded6..3575cc65b2b2 100644 --- a/nixpkgs/pkgs/tools/networking/nzbget/default.nix +++ b/nixpkgs/pkgs/tools/networking/nzbget/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://nzbget.net; + homepage = https://nzbget.net; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/nixpkgs/pkgs/tools/networking/ocserv/default.nix index 63a74c3ddb61..fdb281e6c372 100644 --- a/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ocserv-${version}"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "13lijg5qkkpn35laaimpw9l5g2dnnbmqn74lpcknmp6nm6j2wvci"; + sha256 = "072256099l1c6p7dvvzp0gyafh1zvmmgmnpy0fcmv9sy80qg3p44"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 3e9d1f9f5f7e..97bf456dbbd9 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -50,8 +50,6 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; - buildInputs = with pythonPackages; [ unzip numpy mock ]; - # The `backup' command requires `sqlite3'. propagatedBuildInputs = with pythonPackages; [ twisted foolscap nevow simplejson zfec pycryptopp darcsver @@ -59,7 +57,7 @@ pythonPackages.buildPythonApplication rec { service-identity pyyaml magic-wormhole treq ]; - checkInputs = with pythonPackages; [ hypothesis twisted ]; + checkInputs = with pythonPackages; [ mock hypothesis twisted ]; # Install the documentation. postInstall = '' diff --git a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix index 5e3bf176b2c9..92df5d55524b 100644 --- a/nixpkgs/pkgs/tools/networking/pcapfix/default.nix +++ b/nixpkgs/pkgs/tools/networking/pcapfix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.3"; + name = "pcapfix-1.1.4"; src = fetchurl { url = "https://f00l.de/pcapfix/${name}.tar.gz"; - sha256 = "0f9g6yh1dc7x1n28xs4lcwlk6sa3mpz0rbw0ddhajqidag2k07sr"; + sha256 = "0m6308ka33wqs568b7cwa1f5q0bv61j2nwfizdyzrazw673lnh6d"; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; diff --git a/nixpkgs/pkgs/tools/networking/persepolis/default.nix b/nixpkgs/pkgs/tools/networking/persepolis/default.nix new file mode 100644 index 000000000000..bfa309f79df2 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/persepolis/default.nix @@ -0,0 +1,60 @@ +{ stdenv, lib, buildPythonApplication, fetchFromGitHub, makeDesktopItem, makeWrapper +, aria +, libnotify +, pulseaudio +, psutil +, pyqt5 +, requests +, setproctitle +, sound-theme-freedesktop +, youtube-dl +}: + +buildPythonApplication rec { + pname = "persepolis"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "persepolisdm"; + repo = "persepolis"; + rev = "${version}"; + sha256 = "0xngk8wgj5k27mh3bcrf2wwzqr8a3g0d4pc5i5vcavnnaj03j44m"; + }; + + # see: https://github.com/persepolisdm/persepolis/blob/3.1.0/setup.py#L130 + doCheck = false; + + preBuild='' + substituteInPlace setup.py --replace "answer = input(" "answer = 'y'#" + ''; + + postPatch = '' + sed -i 's|/usr/share/sounds/freedesktop/stereo/|${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/|' setup.py + sed -i "s|'persepolis = persepolis.__main__'|'persepolis = persepolis.scripts.persepolis:main'|" setup.py + ''; + + postInstall = '' + mkdir -p $out/share/applications + cp $src/xdg/com.github.persepolisdm.persepolis.desktop $out/share/applications + wrapProgram $out/bin/persepolis --prefix PATH : "${lib.makeBinPath [aria libnotify ]}" + ''; + + buildInputs = [ makeWrapper ]; + + propagatedBuildInputs = [ + pulseaudio + psutil + pyqt5 + requests + setproctitle + sound-theme-freedesktop + youtube-dl + ]; + + meta = with stdenv.lib; { + description = "Persepolis Download Manager is a GUI for aria2."; + homepage = https://persepolisdm.github.io/; + license = licenses.gpl3; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/ppp/default.nix b/nixpkgs/pkgs/tools/networking/ppp/default.nix index cea8a3f133f4..26dc71b7d619 100644 --- a/nixpkgs/pkgs/tools/networking/ppp/default.nix +++ b/nixpkgs/pkgs/tools/networking/ppp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, libpcap }: +{ stdenv, fetchurl, substituteAll, libpcap, openssl }: stdenv.mkDerivation rec { version = "2.4.7"; @@ -27,10 +27,14 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/collab-maint/pkg-ppp.git/plain/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch"; sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8"; }) + (fetchurl { + url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch; + sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; + }) ./musl-fix-headers.patch ]; - buildInputs = [ libpcap ]; + buildInputs = [ libpcap openssl ]; postPatch = '' # strip is not found when cross compiling with seemingly no way to point diff --git a/nixpkgs/pkgs/tools/networking/redir/default.nix b/nixpkgs/pkgs/tools/networking/redir/default.nix index 350d31c19dad..e584354952a4 100644 --- a/nixpkgs/pkgs/tools/networking/redir/default.nix +++ b/nixpkgs/pkgs/tools/networking/redir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "redir-${version}"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "troglobit"; repo = "redir"; rev = "v${version}"; - sha256 = "015vxpy6n7xflkq0lgls4f4vw7ynvv2635bwykzglin3v5ssrm2k"; + sha256 = "13n401i3q0xwpfgr21y47kgihi057wbh59xlsna8b8zpm973qny1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/socat/default.nix b/nixpkgs/pkgs/tools/networking/socat/default.nix index 37fe3398ae8b..834ea1bd873d 100644 --- a/nixpkgs/pkgs/tools/networking/socat/default.nix +++ b/nixpkgs/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, readline, which, nettools }: stdenv.mkDerivation rec { - name = "socat-1.7.3.2"; + name = "socat-1.7.3.3"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3"; + sha256 = "0jnhjijyq74g3wa4ph0am83z6vq7qna7ac0xqjma8s4197z3zmhd"; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/networking/sstp/default.nix b/nixpkgs/pkgs/tools/networking/sstp/default.nix index e8db3a071843..7bbc872c98e1 100644 --- a/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, ppp, libevent, openssl }: +{ stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: stdenv.mkDerivation rec { name = "sstp-client-${version}"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz"; - sha256 = "087vp3n7nv001fsgbmkjpgl3a2vhbix22cflrqi5bv9h8181p18v"; + sha256 = "1zv7rx6wh9rhbyg9pg6759by8hc6n4162zrrw0y812cnaw3b8zj8"; }; patchPhase = @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "--with-pppd-plugin-dir=$(out)/lib/pppd" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libevent openssl ppp ]; meta = { diff --git a/nixpkgs/pkgs/tools/networking/stubby/default.nix b/nixpkgs/pkgs/tools/networking/stubby/default.nix index 4685143c934b..89af381d0d6d 100644 --- a/nixpkgs/pkgs/tools/networking/stubby/default.nix +++ b/nixpkgs/pkgs/tools/networking/stubby/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stubby"; name = "${pname}-${version}"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "getdnsapi"; repo = pname; rev = "v${version}"; - sha256 = "034y783dvh43v5ajxlgn4y9y7mdk1lwy87d7isaxpkigs1jqbrma"; + sha256 = "164gm5cbnq785s78bqmbsgxrxkq8hw930xwkxxzi1f6jgz928dnf"; }; nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/nixpkgs/pkgs/tools/networking/stunnel/default.nix index e00b5335d35e..b85e146971b2 100644 --- a/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.50"; + version = "5.53"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "0j811iakljjxw39qchmqf235jdkwixb0i4xxjyi55f08558947cm"; + sha256 = "119560alb8k0qz2zkjb2i80ikmn76fa6dg681fvrw9hlxsb9hhw0"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index a977a83e23f0..53af27b4deba 100644 --- a/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tcpreplay-${version}"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "0d2ywaxq0iaa1kfhgsfhsk1c4w4lakxafsw90dn4m6k82486dflm"; + sha256 = "0ld9v88g5xs2rykimksmhlkwbv2r97575c4aqmqdxbvc37crnisg"; }; buildInputs = [ libpcap ]; diff --git a/nixpkgs/pkgs/tools/networking/tgt/default.nix b/nixpkgs/pkgs/tools/networking/tgt/default.nix index e1e19609d513..9f3075b374e2 100644 --- a/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -2,7 +2,7 @@ , docbook_xsl }: let - version = "1.0.75"; + version = "1.0.76"; in stdenv.mkDerivation rec { name = "tgt-${version}"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { owner = "fujita"; repo = "tgt"; rev = "v${version}"; - sha256 = "008x7xz49fnqi91hw4nim4f25gp5qyjgzxfikmj7gz81mh4hhamj"; + sha256 = "1q01ay0zn5gmy6df1iw1ic11p8zygxlp0r3nd887vvvjvlp3xrvc"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; diff --git a/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/nixpkgs/pkgs/tools/networking/tox-node/default.nix new file mode 100644 index 000000000000..28be00099b8b --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/tox-node/default.nix @@ -0,0 +1,43 @@ +{ stdenv, rustPlatform, fetchFromGitHub +, libsodium, openssl +, pkgconfig +}: + +with rustPlatform; + +buildRustPackage rec { + name = "tox-node-${version}"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "tox-rs"; + repo = "tox-node"; + rev = "v${version}"; + sha256 = "0p1k4glqm3xasck66fywkyg42lbccad9rc6biyvi24rn76qip4jm"; + }; + + buildInputs = [ libsodium openssl ]; + nativeBuildInputs = [ pkgconfig ]; + + SODIUM_USE_PKG_CONFIG = "yes"; + + installPhase = '' + runHook preInstall + + install -D target/release/tox-node $out/bin/tox-node + + runHook postInstall + ''; + + doCheck = false; + + cargoSha256 = "18w1ycvj2q4q8lj81wn5lfljh5wa7b230ahqdz30w20pv1cazsv2"; + + meta = with stdenv.lib; { + description = "A server application to run tox node written in pure Rust"; + homepage = https://github.com/tox-rs/tox-node; + license = [ licenses.mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ suhr ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/unbound/python.nix b/nixpkgs/pkgs/tools/networking/unbound/python.nix index c20169d39135..f41aa35df90e 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/python.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/python.nix @@ -5,7 +5,7 @@ let in stdenv.mkDerivation rec { pname = "pyunbound"; name = "${pname}-${version}"; - version = "1.7.3"; + version = "1.9.0"; src = fetchurl { url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index fc77846efc39..3e572a10da0a 100644 --- a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.16"; + version = "2.17"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1bkwr151bnv72aka2r9jwaq8lkz1p6031wr5pss4sij978qn5xld"; + sha256 = "1865p3yczgpq8gvgh4cpgbx2ibc1fwycd7pagga9sj8r3q0giqyk"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/networking/wget/default.nix b/nixpkgs/pkgs/tools/networking/wget/default.nix index 57ab0bab5167..38a24eddc288 100644 --- a/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "wget-${version}"; - version = "1.20.1"; + version = "1.20.3"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "0a29qsqxkk8145vkyy35q5a1wc7qzwx3qj3gmfrkmi9xs96yhqqg"; + sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix index b4b339edb5f7..21e869b7b01e 100644 --- a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix @@ -91,7 +91,6 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_LIBARCHIVE=ON" "-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_MKSQUASHFS=ON" - "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix index d98ad1d8cb79..e462202f6153 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "1pnq2gphdv0rkc317rnkdx2qv0cd7p3k4v5f0ys5rya2akkxx4wn"; + sha256 = "12z0sa7g79x46q2ybpy6i9rf1x4cnwajw8dsjzra2qhssyp8rp9c"; }; - cargoSha256 = "0y6swl5ngkd489g53c100gyjl1sp8vidl8j6zfcasw5lbkli3acs"; + cargoSha256 = "10nfa0pd4zhz36f9yx80qd0bbsmqdjk8r6656jyzh92ydncry1as"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix index df1bf794062f..6605d9de65ae 100644 --- a/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix +++ b/nixpkgs/pkgs/tools/package-management/checkinstall/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation { description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index 864c229b8803..33620bb51f17 100644 --- a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.5"; + version = "1.19.6"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0i1mwqf60n25f89zfvp7fsa4v5rlqxhkhqah35g6j2k1ffcpqcpd"; + sha256 = "0s1pyj7g8ign630biqq1ycjy8cw733fk1dgas9w59mav3wns3caf"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index d725692f4054..7590a37a8e36 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -167,10 +167,10 @@ in rec { }; nixStable = callPackage common rec { - name = "nix-2.2"; + name = "nix-2.2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "63238d00d290b8a93925891fc9164439d3941e2ccc569bf7f7ca32f53c3ec0c7"; + sha256 = "f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/nixpkgs/pkgs/tools/package-management/nixui/generate.sh b/nixpkgs/pkgs/tools/package-management/nixui/generate.sh index c7a93a716731..334edb4a027a 100755 --- a/nixpkgs/pkgs/tools/package-management/nixui/generate.sh +++ b/nixpkgs/pkgs/tools/package-management/nixui/generate.sh @@ -1,4 +1,4 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -exec node2nix -6 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env +exec node2nix -8 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix index 8f3be4cc8c7f..29d77f0bf9a6 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/nixui.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix index 846e9bcfc12a..b019c7ef3772 100644 --- a/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix +++ b/nixpkgs/pkgs/tools/package-management/nixui/node-packages.nix @@ -102,6 +102,6 @@ in license = "Apache-2.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix index 5b7872200402..2e9f93177e45 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite -, gobject-introspection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive +, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x"; }; - buildInputs = [ glib polkit python gobject-introspection vala_0_38 ] + buildInputs = [ glib polkit python gobject-introspection ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; + nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize diff --git a/nixpkgs/pkgs/tools/security/afl/default.nix b/nixpkgs/pkgs/tools/security/afl/default.nix index c90d031e989b..2ee0c478212c 100644 --- a/nixpkgs/pkgs/tools/security/afl/default.nix +++ b/nixpkgs/pkgs/tools/security/afl/default.nix @@ -69,7 +69,7 @@ let homepage = "http://lcamtuf.coredump.cx/afl/"; license = stdenv.lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; }; }; in afl diff --git a/nixpkgs/pkgs/tools/security/afl/qemu.nix b/nixpkgs/pkgs/tools/security/afl/qemu.nix index a007eb3913db..9e0f19361fb0 100644 --- a/nixpkgs/pkgs/tools/security/afl/qemu.nix +++ b/nixpkgs/pkgs/tools/security/afl/qemu.nix @@ -1,7 +1,5 @@ -{ stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, ncurses, perl -, attr, libcap, vde2, texinfo, libuuid, flex, bison, lzo, snappy -, libaio, libcap_ng, gnutls, pixman, autoconf -, writeText +{ stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, perl +, texinfo, libuuid, flex, bison, pixman, autoconf }: with stdenv.lib; @@ -41,9 +39,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - zlib glib pixman ncurses attr libcap - vde2 libuuid lzo snappy libcap_ng gnutls - ] ++ optionals (stdenv.isLinux) [ libaio ]; + zlib glib pixman libuuid + ]; enableParallelBuilding = true; @@ -63,9 +60,9 @@ stdenv.mkDerivation rec { "--disable-gtk" "--disable-sdl" "--disable-vnc" + "--disable-kvm" "--target-list=${cpuTarget}" "--enable-pie" - "--enable-kvm" "--sysconfdir=/etc" "--localstatedir=/var" ]; diff --git a/nixpkgs/pkgs/tools/security/bitwarden-cli/generate.sh b/nixpkgs/pkgs/tools/security/bitwarden-cli/generate.sh new file mode 100755 index 000000000000..5bcee4c0513a --- /dev/null +++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/generate.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +exec node2nix -8 \ + --input node-packages.json \ + --output node-packages-generated.nix \ + --composition node-packages.nix \ + --node-env ./../../../development/node-packages/node-env.nix diff --git a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix index f709bd3d122d..e258571a6207 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix @@ -4,13 +4,58 @@ let sources = { - "ansi-escapes-3.1.0" = { + "abab-2.0.0" = { + name = "abab"; + packageName = "abab"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz"; + sha512 = "sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="; + }; + }; + "acorn-6.1.1" = { + name = "acorn"; + packageName = "acorn"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; + sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; + }; + }; + "acorn-globals-4.3.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz"; + sha512 = "hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw=="; + }; + }; + "acorn-walk-6.1.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz"; + sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="; + }; + }; + "ajv-6.10.0" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; + }; + }; + "ansi-escapes-3.2.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; - sha512 = "UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; "ansi-regex-3.0.0" = { @@ -31,6 +76,42 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "array-equal-1.0.0" = { + name = "array-equal"; + packageName = "array-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz"; + sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; + }; + }; + "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=="; + }; + }; + "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"; + }; + }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -40,6 +121,33 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "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.8.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + }; + }; + "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"; + }; + }; "big-integer-1.6.36" = { name = "big-integer"; packageName = "big-integer"; @@ -49,6 +157,24 @@ let sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="; }; }; + "browser-process-hrtime-0.1.3" = { + name = "browser-process-hrtime"; + packageName = "browser-process-hrtime"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; + sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="; + }; + }; + "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-2.4.1" = { name = "chalk"; packageName = "chalk"; @@ -121,6 +247,60 @@ let sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ=="; }; }; + "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"; + }; + }; + "cssom-0.3.6" = { + name = "cssom"; + packageName = "cssom"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz"; + sha512 = "DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A=="; + }; + }; + "cssstyle-1.2.2" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz"; + sha512 = "43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow=="; + }; + }; + "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"; + }; + }; + "data-urls-1.1.0" = { + name = "data-urls"; + packageName = "data-urls"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz"; + sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; + }; + }; + "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"; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -130,6 +310,24 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; + "domexception-1.0.1" = { + name = "domexception"; + packageName = "domexception"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz"; + sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug=="; + }; + }; + "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"; + }; + }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -139,6 +337,51 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "escodegen-1.11.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; + sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "estraverse-4.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "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=="; + }; + }; "external-editor-3.0.3" = { name = "external-editor"; packageName = "external-editor"; @@ -148,6 +391,42 @@ let sha512 = "bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA=="; }; }; + "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-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "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"; + }; + }; "figures-2.0.0" = { name = "figures"; packageName = "figures"; @@ -157,6 +436,15 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; + "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"; + }; + }; "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; @@ -166,6 +454,15 @@ let sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; + "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"; + }; + }; "graceful-fs-4.1.15" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -175,6 +472,24 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; + "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-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -184,6 +499,24 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "html-encoding-sniffer-1.0.2" = { + name = "html-encoding-sniffer"; + packageName = "html-encoding-sniffer"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; + sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; + }; + }; + "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"; + }; + }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -220,6 +553,87 @@ let sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "jsdom-13.2.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "13.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz"; + sha512 = "cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw=="; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; @@ -229,6 +643,15 @@ let sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="; }; }; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + }; "lowdb-1.0.0" = { name = "lowdb"; packageName = "lowdb"; @@ -247,22 +670,22 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; - "mime-db-1.37.0" = { + "mime-db-1.38.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.37.0"; + version = "1.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz"; - sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"; + sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-2.1.21" = { + "mime-types-2.1.22" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.21"; + version = "2.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz"; - sha512 = "3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"; + sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; "mimic-fn-1.2.0" = { @@ -301,6 +724,24 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; + "nwsapi-2.1.3" = { + name = "nwsapi"; + packageName = "nwsapi"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.3.tgz"; + sha512 = "RowAaJGEgYXEZfQ7tvvdtAQUKPyTR6T6wNu0fwlNsGQYr/h3yQc6oI8WnVZh3Y/Sylwc+dtAlvPqfFZjhTyk3A=="; + }; + }; + "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=="; + }; + }; "onetime-2.0.1" = { name = "onetime"; packageName = "onetime"; @@ -310,6 +751,15 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; + "optionator-0.8.2" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + }; + }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -328,6 +778,24 @@ let sha512 = "ylm8pmgyz9rkS3Ng/ru5tHUF3JxWwKYP0aZZWZ8eCGdSxoqgYiDUXLNQei73mUJOjHw8QNu5ZNCsLoDpkMA6sg=="; }; }; + "parse5-5.1.0" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz"; + sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; + }; + }; + "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"; + }; + }; "pify-3.0.0" = { name = "pify"; packageName = "pify"; @@ -337,6 +805,33 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; + "pn-1.1.0" = { + name = "pn"; + packageName = "pn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz"; + sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; + }; + }; + "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"; + }; + }; + "psl-1.1.31" = { + name = "psl"; + packageName = "psl"; + version = "1.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; + sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + }; + }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; @@ -346,6 +841,51 @@ let 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=="; + }; + }; + "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=="; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "request-promise-core-1.1.2" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz"; + sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag=="; + }; + }; + "request-promise-native-1.0.7" = { + name = "request-promise-native"; + packageName = "request-promise-native"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz"; + sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w=="; + }; + }; "restore-cursor-2.0.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -364,13 +904,22 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "rxjs-6.3.3" = { + "rxjs-6.4.0" = { name = "rxjs"; packageName = "rxjs"; - version = "6.3.3"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; - sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz"; + sha512 = "Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw=="; + }; + }; + "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=="; }; }; "safer-buffer-2.1.2" = { @@ -382,6 +931,15 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "saxes-3.1.9" = { + name = "saxes"; + packageName = "saxes"; + version = "3.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/saxes/-/saxes-3.1.9.tgz"; + sha512 = "FZeKhJglhJHk7eWG5YM0z46VHmI3KJpMBAQm3xa9meDvd+wevB5GuBB0wc0exPInZiBBHqi00DbS8AcvCGCFMw=="; + }; + }; "signal-exit-3.0.2" = { name = "signal-exit"; packageName = "signal-exit"; @@ -391,6 +949,33 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; + "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=="; + }; + }; + "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=="; + }; + }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; "steno-0.4.4" = { name = "steno"; packageName = "steno"; @@ -427,6 +1012,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "symbol-tree-3.2.2" = { + name = "symbol-tree"; + packageName = "symbol-tree"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz"; + sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -454,6 +1048,33 @@ let sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "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=="; + }; + }; + "tr46-1.0.1" = { + name = "tr46"; + packageName = "tr46"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + }; "tslib-1.9.3" = { name = "tslib"; packageName = "tslib"; @@ -463,6 +1084,150 @@ let sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; }; }; + "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"; + }; + }; + "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=="; + }; + }; + "uuid-3.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + }; + }; + "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"; + }; + }; + "w3c-hr-time-1.0.1" = { + name = "w3c-hr-time"; + packageName = "w3c-hr-time"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; + sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + }; + }; + "w3c-xmlserializer-1.1.2" = { + name = "w3c-xmlserializer"; + packageName = "w3c-xmlserializer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz"; + sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; + }; + }; + "webidl-conversions-4.0.2" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; + }; + }; + "whatwg-encoding-1.0.5" = { + name = "whatwg-encoding"; + packageName = "whatwg-encoding"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; + }; + }; + "whatwg-mimetype-2.3.0" = { + name = "whatwg-mimetype"; + packageName = "whatwg-mimetype"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; + }; + }; + "whatwg-url-7.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz"; + sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ=="; + }; + }; + "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"; + }; + }; + "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=="; + }; + }; + "xml-name-validator-3.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; + }; + }; + "xmlchars-1.3.1" = { + name = "xmlchars"; + packageName = "xmlchars"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlchars/-/xmlchars-1.3.1.tgz"; + sha512 = "tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw=="; + }; + }; "zxcvbn-4.4.2" = { name = "zxcvbn"; packageName = "zxcvbn"; @@ -478,17 +1243,31 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.7.0"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.7.0.tgz"; - sha512 = "rynqUqyfC33dMQ21OlrOu4MQVEvtjyHw1kmu85+l0j9f2CQWEffeqVwoHF5GTtQOXev4PMyqRfSSYI6dRsseag=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.7.4.tgz"; + sha512 = "WCYARJaSpcItFvxPFdRXTO9s26HbYFazL3wSlZ7HuL4tiML/7AfPD4wO3J7fgBn1ghU5NGJ7YZIL+oPmiuw6+Q=="; }; dependencies = [ - sources."ansi-escapes-3.1.0" + sources."abab-2.0.0" + sources."acorn-6.1.1" + sources."acorn-globals-4.3.0" + sources."acorn-walk-6.1.1" + sources."ajv-6.10.0" + sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."array-equal-1.0.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.0" sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" + sources."browser-process-hrtime-0.1.3" + sources."caseless-0.12.0" sources."chalk-2.4.1" sources."chardet-0.7.0" sources."cli-cursor-2.1.0" @@ -497,44 +1276,122 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.6" sources."commander-2.18.0" + sources."core-util-is-1.0.2" + sources."cssom-0.3.6" + sources."cssstyle-1.2.2" + sources."dashdash-1.14.1" + sources."data-urls-1.1.0" + sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" + sources."domexception-1.0.1" + sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.11.1" + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."extend-3.0.2" sources."external-editor-3.0.3" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" + sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."getpass-0.1.7" sources."graceful-fs-4.1.15" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" sources."has-flag-3.0.0" + sources."html-encoding-sniffer-1.0.2" + sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."jsdom-13.2.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."levn-0.3.0" sources."lodash-4.17.11" + sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.37.0" - sources."mime-types-2.1.21" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" sources."mute-stream-0.0.7" sources."node-fetch-2.2.0" sources."node-forge-0.7.6" + sources."nwsapi-2.1.3" + sources."oauth-sign-0.9.0" sources."onetime-2.0.1" + sources."optionator-0.8.2" sources."os-tmpdir-1.0.2" sources."papaparse-4.6.0" + sources."parse5-5.1.0" + sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."punycode-1.4.1" + sources."pn-1.1.0" + sources."prelude-ls-1.1.2" + sources."psl-1.1.31" + sources."punycode-2.1.1" + sources."qs-6.5.2" + (sources."request-2.88.0" // { + dependencies = [ + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" + ]; + }) + sources."request-promise-core-1.1.2" + sources."request-promise-native-1.0.7" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" - sources."rxjs-6.3.3" + sources."rxjs-6.4.0" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + sources."saxes-3.1.9" sources."signal-exit-3.0.2" + sources."source-map-0.6.1" + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" sources."steno-0.4.4" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" + sources."symbol-tree-3.2.2" sources."through-2.3.8" - sources."tldjs-2.3.1" + (sources."tldjs-2.3.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) sources."tmp-0.0.33" + sources."tough-cookie-2.5.0" + sources."tr46-1.0.1" sources."tslib-1.9.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + sources."w3c-hr-time-1.0.1" + sources."w3c-xmlserializer-1.1.2" + sources."webidl-conversions-4.0.2" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-7.0.0" + sources."wordwrap-1.0.0" + sources."ws-6.2.1" + sources."xml-name-validator-3.0.0" + sources."xmlchars-1.3.1" sources."zxcvbn-4.4.2" ]; buildInputs = globalBuildInputs; @@ -544,6 +1401,6 @@ in license = "GPL-3.0"; }; production = true; - bypassCache = false; + bypassCache = true; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix index 0b559600b1b4..6fb6421eb2db 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden-cli/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/nixpkgs/pkgs/tools/security/browserpass/default.nix b/nixpkgs/pkgs/tools/security/browserpass/default.nix index c1c9e679f22c..055444d5566d 100644 --- a/nixpkgs/pkgs/tools/security/browserpass/default.nix +++ b/nixpkgs/pkgs/tools/security/browserpass/default.nix @@ -8,13 +8,13 @@ let v2 = callPackage ./2.nix {}; in buildGoPackage rec { pname = "browserpass"; - version = "3.0.1"; + version = "3.0.6"; src = fetchFromGitHub { owner = "browserpass"; repo = "browserpass-native"; rev = version; - sha256 = "1i3xxysiiapz9y2v0gp13inx7j0d7n0khpmcsy9k95pzn53526dx"; + sha256 = "0q3bsla07zjl6i69nj1axbkg2ia89pvh0jg6nlqgbm2kpzzbn0pz"; }; nativeBuildInputs = [ makeWrapper ]; @@ -27,6 +27,8 @@ in buildGoPackage rec { # variables to be valid by default substituteInPlace Makefile \ --replace "PREFIX ?= /usr" "" + sed -i -e 's/SED :=.*/SED := sed/' Makefile + sed -i -e 's/INSTALL :=.*/INSTALL := install/' Makefile ''; DESTDIR = placeholder "bin"; diff --git a/nixpkgs/pkgs/tools/security/eid-mw/default.nix b/nixpkgs/pkgs/tools/security/eid-mw/default.nix index 9ac62dc334f7..155c63c87e13 100644 --- a/nixpkgs/pkgs/tools/security/eid-mw/default.nix +++ b/nixpkgs/pkgs/tools/security/eid-mw/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.13"; + version = "4.4.16"; src = fetchFromGitHub { - sha256 = "14bgn2k0xbd6241qdghg787pgxy7k9rvcspaf74zwwyibaqknzyx"; + sha256 = "1q82fw63xzrnrgh1wyh457hal6vfdl6swqfq7l6kviywiwlzx7kd"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { let eid-nssdb-in = substituteAll { inherit (stdenv) shell; + isExecutable = true; src = ./eid-nssdb.in; }; in diff --git a/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in b/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in index fc05a20a6758..636b4c1ee118 100644 --- a/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in +++ b/nixpkgs/pkgs/tools/security/eid-mw/eid-nssdb.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ rootdb="/etc/pki/nssdb" userdb="$HOME/.pki/nssdb" diff --git a/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix index 0415b10b25d8..37da20225205 100644 --- a/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "lastpass-cli"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "lastpass"; repo = pname; rev = "v${version}"; - sha256 = "12qjqvqzi3pq7hrdpq59bcxqy6yj1mhx145g9rky1jm2ipzpfayq"; + sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a"; }; nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/security/lynis/default.nix b/nixpkgs/pkgs/tools/security/lynis/default.nix index ceff23911c7e..dfbda2b5e073 100644 --- a/nixpkgs/pkgs/tools/security/lynis/default.nix +++ b/nixpkgs/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.7.2"; + version = "2.7.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "0dbbfk47dpxx7zpb98n4w3ls3z5di57qnr2nsgxjvp49gk9j3f6k"; + sha256 = "0md1w86i3fy9l78i98ijr5136nbhdiik2dxyw9qnzmvdlvkqmw70"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/notary/default.nix b/nixpkgs/pkgs/tools/security/notary/default.nix index 071bfdaea005..221817b004df 100644 --- a/nixpkgs/pkgs/tools/security/notary/default.nix +++ b/nixpkgs/pkgs/tools/security/notary/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { runHook postInstall ''; - doCheck = true; + #doCheck = true; # broken by tzdata: 2018g -> 2019a checkPhase = '' make test PKGS=github.com/theupdateframework/notary/cmd/notary ''; diff --git a/nixpkgs/pkgs/tools/security/proxmark3/default.nix b/nixpkgs/pkgs/tools/security/proxmark3/default.nix new file mode 100644 index 000000000000..afaed796057c --- /dev/null +++ b/nixpkgs/pkgs/tools/security/proxmark3/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline }: + +stdenv.mkDerivation rec { + pname = "proxmark3"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "Proxmark"; + repo = pname; + rev = "v${version}"; + sha256 = "1qw28n1bhhl91ix77lv50qcr919fq3hjc8zhhqphwxal2svgx2jf"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses readline ]; + + postPatch = '' + substituteInPlace client/Makefile --replace '-ltermcap' ' ' + substituteInPlace liblua/Makefile --replace '-ltermcap' ' ' + ''; + + preBuild = '' + cd client + ''; + + installPhase = '' + mkdir -p $out/bin + cp proxmark3 $out/bin + ''; + + meta = with stdenv.lib; { + description = "Client for proxmark3, powerful general purpose RFID tool"; + homepage = http://www.proxmark.org; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/vault/default.nix b/nixpkgs/pkgs/tools/security/vault/default.nix index bf5d34a8dd15..86cc6221a5c1 100644 --- a/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/nixpkgs/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vault-${version}"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1c5v1m8b6nm28mjwpsgc73n8q475pkzpdvyx46rf3xyrh01rfrnz"; + sha256 = "11hyqqpfz839ipqv534vvljyarnr9wn98rzvyfwnx2lq76h2adqn"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/nixpkgs/pkgs/tools/security/vulnix/default.nix b/nixpkgs/pkgs/tools/security/vulnix/default.nix index c1fd40f24c68..96c3e78b6a7c 100644 --- a/nixpkgs/pkgs/tools/security/vulnix/default.nix +++ b/nixpkgs/pkgs/tools/security/vulnix/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.8.0"; + version = "1.8.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "15j8zz7qmf6c6vhim08yn1knn0qhwypmc7bxw608zg5nf50vghyb"; + sha256 = "1kpwqsnz7jisi622halzl4s5q42d76nbq6ra800gscnfx48hqw9r"; }; outputs = [ "out" "doc" "man" ]; diff --git a/nixpkgs/pkgs/tools/system/facter/default.nix b/nixpkgs/pkgs/tools/system/facter/default.nix index d775df98aac9..899d9aa795ae 100644 --- a/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/nixpkgs/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { - sha256 = "1sqj8777vwb2izm86y74sivbpyxcx95sflgjn0pbqni311ck972v"; + sha256 = "1cj56s3gghkja4zrcyzhrwq5ac0r7zjfgj7jzp0i56vdv8a1mihr"; rev = version; repo = "facter"; owner = "puppetlabs"; diff --git a/nixpkgs/pkgs/tools/system/goreman/default.nix b/nixpkgs/pkgs/tools/system/goreman/default.nix new file mode 100644 index 000000000000..d58d19fd6ed1 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/goreman/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + name = "goreman-${version}"; + version = "0.2.1"; + + goPackagePath = "github.com/mattn/goreman"; + subPackages = ["."]; + + src = fetchFromGitHub { + owner = "mattn"; + repo = "goreman"; + rev = "v${version}"; + sha256 = "1h7ip788j7bkygahpp7ylgnrx9jrbhwjzqpjhd1pflmlaxcbflcy"; + }; + + meta = with lib; { + description = "foreman clone written in go language"; + homepage = "https://github.com/mattn/goreman"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} + diff --git a/nixpkgs/pkgs/tools/system/gotop/default.nix b/nixpkgs/pkgs/tools/system/gotop/default.nix index 745139f9e50b..daf9ce58c911 100644 --- a/nixpkgs/pkgs/tools/system/gotop/default.nix +++ b/nixpkgs/pkgs/tools/system/gotop/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "gotop-${version}"; - version = "2.0.1"; + pname = "gotop"; + version = "3.0.0"; goPackagePath = "github.com/cjbassi/gotop"; src = fetchFromGitHub { - repo = "gotop"; owner = "cjbassi"; + repo = pname; rev = version; - sha256 = "0xpm8nrn53kz65f93czflgdgr2a33qfi1w0gsgngrmaliq1vlpji"; + sha256 = "1kndj5qjaqgizjakh642fay2i0i1jmfjlk1p01gnjbh2b0yzvj1r"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/system/ior/default.nix b/nixpkgs/pkgs/tools/system/ior/default.nix index ead7970da860..ad7715f0fe69 100644 --- a/nixpkgs/pkgs/tools/system/ior/default.nix +++ b/nixpkgs/pkgs/tools/system/ior/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - homepage = http://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; + homepage = https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; description = "Parallel file system I/O performance test"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/system/proot/default.nix b/nixpkgs/pkgs/tools/system/proot/default.nix index 2381ce6c0db1..c8028ed74a7c 100644 --- a/nixpkgs/pkgs/tools/system/proot/default.nix +++ b/nixpkgs/pkgs/tools/system/proot/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/GNUmakefile \ --replace /bin/echo ${coreutils}/bin/echo + # our cross machinery defines $CC and co just right + sed -i /CROSS_COMPILE/d src/GNUmakefile ''; buildInputs = [ talloc ] ++ stdenv.lib.optional enablePython python; diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 8237a4928a0b..a31ce8f65e4b 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "stress-ng-${version}"; - version = "0.09.54"; + version = "0.09.57"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz"; - sha256 = "0qbgabrxm8aj4a6bgf55mi7rv9sqcgl3kkm7j3qhkqjfn9rqzslb"; + sha256 = "0xp55m1kif8hcjdcdhgaarghqf1gz5fa24qwl6zpmxkzl6bn002x"; }; # All platforms inputs then Linux-only ones diff --git a/nixpkgs/pkgs/tools/text/csvkit/default.nix b/nixpkgs/pkgs/tools/text/csvkit/default.nix index 1ff9cee241c6..f581e44bcc8a 100644 --- a/nixpkgs/pkgs/tools/text/csvkit/default.nix +++ b/nixpkgs/pkgs/tools/text/csvkit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "csvkit"; - version = "1.0.3"; + version = "1.0.4"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "a6c859c1321d4697dc41252877249091681297f093e08d9c1e1828a6d52c260c"; + sha256 = "1830lb95rh1iyi3drlwxzb6y3pqkii0qiyzd40c1kvhvaf1s6lqk"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/text/fanficfare/default.nix b/nixpkgs/pkgs/tools/text/fanficfare/default.nix index 3315d435afbb..a865859b1864 100644 --- a/nixpkgs/pkgs/tools/text/fanficfare/default.nix +++ b/nixpkgs/pkgs/tools/text/fanficfare/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchurl, python27Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: -python27Packages.buildPythonApplication rec { - version = "3.1.1"; - name = "fanficfare-${version}"; - nameprefix = ""; +python3Packages.buildPythonApplication rec { + pname = "FanFicFare"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "1wklii24vbvq2vi5pqgp3z4lazcplh2i7r2w4d8lkm6pzbw0s8px"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1ir3m8wknr8shdbmbpiaw73mdpa7mvidkl6pbs9ca23mgwivxa84"; }; - propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + chardet + html5lib + html2text + ]; + + doCheck = false; # no tests exist meta = with stdenv.lib; { - description = "FanFicFare is a tool for making eBooks from fanfiction web sites"; + description = "Tool for making eBooks from fanfiction web sites"; homepage = https://github.com/JimmXinu/FanFicFare; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/text/link-grammar/default.nix b/nixpkgs/pkgs/tools/text/link-grammar/default.nix index 294aa1576801..e565b37fc9ee 100644 --- a/nixpkgs/pkgs/tools/text/link-grammar/default.nix +++ b/nixpkgs/pkgs/tools/text/link-grammar/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.5.1"; + version = "5.6.0"; pname = "link-grammar"; outputs = [ "bin" "out" "dev" "man" ]; src = fetchurl { url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; - sha256 = "1x8kj1yr3b7b6qrvc5b8mm90ff3m4qdbdqplvzii2xlkpvik92ff"; + sha256 = "0v4hn72npjlcf5aaw3kqmvf05vf15mp2r1s2nbj5ggxpprjj6dsm"; }; nativeBuildInputs = [ pkgconfig python3 ]; diff --git a/nixpkgs/pkgs/tools/text/ripgrep/default.nix b/nixpkgs/pkgs/tools/text/ripgrep/default.nix index 81c88ecad9e5..00a16abb70af 100644 --- a/nixpkgs/pkgs/tools/text/ripgrep/default.nix +++ b/nixpkgs/pkgs/tools/text/ripgrep/default.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { - name = "ripgrep-${version}"; - version = "0.10.0"; + pname = "ripgrep"; + version = "11.0.1"; src = fetchFromGitHub { owner = "BurntSushi"; - repo = "ripgrep"; + repo = pname; rev = version; - sha256 = "017fz5kv1kv9jz7mb7vcxrklf5vybvfz2x61g6myzshqz4z1v1yb"; + sha256 = "0vak82d4vyw0w8agswbyxa6g3zs2h9mxm2xjw0xs9qccvmi7whbb"; }; - cargoSha256 = "0k2b2vbklfdjk2zdc8ip480drc12gy1whlwj94p44hr3402azcgr"; + cargoSha256 = "0i31d0m145dsjfix589p5pfp83qp3a5wvz1v9sp4bxn3rggmw734"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; diff --git a/nixpkgs/pkgs/tools/text/shfmt/default.nix b/nixpkgs/pkgs/tools/text/shfmt/default.nix index 2ab568ba8416..12b57cb82dfd 100644 --- a/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -2,16 +2,16 @@ buildGoPackage rec { name = "shfmt-${version}"; - version = "1.1.0"; - rev = "v${version}"; + version = "2.6.4"; - goPackagePath = "github.com/mvdan/sh"; + goPackagePath = "mvdan.cc/sh"; + subPackages = ["cmd/shfmt"]; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; - inherit rev; - sha256 = "0h1qy27z6j1cgkk3hkvl7w3wjqc5flgn92r3j6frn8k2wzwj7zhz"; + rev = "v${version}"; + sha256 = "1jifac0fi0sz6wzdgvk6s9xwpkdng2hj63ldbaral8n2j9km17hh"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix index cb1780a6903c..7c21e621ea6d 100644 --- a/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.3.2"; + version = "1.4.0"; goPackagePath = "github.com/errata-ai/vale"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0jpklca4m6wpndy6spj30s6ssb5y9ysyncxj7i6fg2g0m4dzzh8w"; + sha256 = "05vrnmw7kpgxf2989jvmkwj9c3mv3zkr4z5rpmsplnhvgsnidg4g"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix index 3c2b4f5e8854..f764a2fac07d 100644 --- a/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/jing-trang/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { 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". - homepage = "http://www.thaiopensource.com/relaxng/trang.html"; + homepage = https://www.thaiopensource.com/relaxng/trang.html; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix index 7001b6e36423..8c4b93ab2656 100644 --- a/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/asciidoctor/default.nix @@ -47,7 +47,7 @@ bundlerApp { meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; - homepage = http://asciidoctor.org/; + homepage = https://asciidoctor.org/; license = licenses.mit; maintainers = with maintainers; [ gpyh ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index 33937c7c53b4..9988bcc3585c 100644 --- a/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "amazon-ecs-cli-${version}"; - version = "1.12.1"; + version = "1.13.1"; src = fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "100iv4cchnxl1s02higga5v3hvawi4c7sqva97x34qigr4r7fxwm"; + sha256 = "0wiq32szmy2vk7yjjrcfisl9wrydcyiw986vhk0haidxkgw0gkv0"; }; unpackPhase = ":"; diff --git a/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/nixpkgs/pkgs/tools/virtualization/govc/default.nix index 527c47ffc34c..f2fdbcc670d9 100644 --- a/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "govc-${version}"; - version = "0.16.0"; + version = "0.20.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "09fllx7l2hsjrv1jl7g06xngjy0xwn5n5zng6x8dspgsl6kblyqp"; + sha256 = "16pgjhlps21vk3cb5h2y0b6skq095rd8kl0618rwrz84chdnzahk"; }; meta = { diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index fac60ece8108..1b6b362d975c 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -95,6 +95,7 @@ mapAliases ({ firefoxWrapper = firefox; # 2015-09 flameGraph = flamegraph; # added 2018-04-25 font-awesome-ttf = font-awesome; # 2018-02-25 + font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 @@ -261,6 +262,7 @@ mapAliases ({ qwt6 = libsForQt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 + rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 @@ -353,6 +355,8 @@ mapAliases ({ xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 + yarn2nix = throw "Use upstream https://github.com/moretea/yarn2nix"; # added 2019-04-12 + mkYarnPackage = yarn2nix; # added 2019-04-12 youtubeDL = youtube-dl; # added 2014-10-26 zdfmediathk = mediathekview; # added 2019-01-19 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 6318e334175b..c8d951f6cdaf 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -157,6 +157,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + demoit = callPackage ../servers/demoit { }; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -167,6 +169,8 @@ in dockerTools = callPackage ../build-support/docker { }; + nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { }; + docker-compose = python3Packages.callPackage ../applications/virtualization/docker-compose {}; docker-ls = callPackage ../tools/misc/docker-ls { }; @@ -326,10 +330,7 @@ in makeAutostartItem = callPackage ../build-support/make-startupitem { }; - makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: - callPackage ../build-support/kernel/make-initrd.nix { - inherit contents compressor prepend; - }; + makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; } ../build-support/setup-hooks/make-wrapper.sh; @@ -858,6 +859,7 @@ in aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; + inherit (pythonPackages) sphinx; }; aria = aria2; @@ -943,24 +945,43 @@ in bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/6.x.nix { }) + inherit (callPackages ../misc/logging/beats/5.x.nix { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }) + filebeat5 + heartbeat5 + metricbeat5 + packetbeat5; + + inherit (callPackages ../misc/logging/beats/6.x.nix { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }) filebeat6 heartbeat6 metricbeat6 packetbeat6 journalbeat6; + inherit (callPackages ../misc/logging/beats/7.x.nix { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }) + filebeat7 + heartbeat7 + metricbeat7 + packetbeat7 + journalbeat7; + filebeat = filebeat6; heartbeat = heartbeat6; metricbeat = metricbeat6; packetbeat = packetbeat6; - inherit (callPackages ../misc/logging/beats/5.x.nix { }) - filebeat5 - heartbeat5 - metricbeat5 - packetbeat5; - bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; @@ -969,6 +990,8 @@ in bibtex2html = callPackage ../tools/misc/bibtex2html { }; + bicon = callPackage ../applications/misc/bicon { }; + bindfs = callPackage ../tools/filesystems/bindfs { }; bitbucket-cli = python2Packages.bitbucket-cli; @@ -1029,6 +1052,8 @@ in borgbackup = callPackage ../tools/backup/borg { }; + boringtun = callPackage ../tools/networking/boringtun { }; + boomerang = libsForQt5.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; @@ -1051,6 +1076,8 @@ in bro = callPackage ../applications/networking/ids/bro { }; + brook = callPackage ../tools/networking/brook { }; + broot = callPackage ../tools/misc/broot { }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; @@ -1584,6 +1611,8 @@ in ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; + ir-standard-fonts = callPackage ../data/fonts/ir-standard-fonts { }; + lynis = callPackage ../tools/security/lynis { }; mathics = pythonPackages.mathics; @@ -1624,6 +1653,8 @@ in nfdump = callPackage ../tools/networking/nfdump { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; + noteshrink = callPackage ../tools/misc/noteshrink { }; noti = callPackage ../tools/misc/noti { @@ -1651,6 +1682,8 @@ in pbzx = callPackage ../tools/compression/pbzx { }; + persepolis = python3Packages.callPackage ../tools/networking/persepolis { }; + pev = callPackage ../development/tools/analysis/pev { }; photon = callPackage ../tools/networking/photon { }; @@ -1748,7 +1781,11 @@ in mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + mongodb-tools = callPackage ../tools/misc/mongodb-tools { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; moosefs = callPackage ../tools/filesystems/moosefs { }; @@ -1831,7 +1868,11 @@ in bepasty = callPackage ../tools/misc/bepasty { }; - bettercap = callPackage ../tools/security/bettercap { }; + bettercap = callPackage ../tools/security/bettercap { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; @@ -2067,7 +2108,6 @@ in libkkc = callPackage ../tools/inputmethods/libkkc { }; ibus = callPackage ../tools/inputmethods/ibus { - gconf = gnome2.GConf; inherit (gnome3) dconf; }; @@ -2087,7 +2127,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { @@ -2257,7 +2297,9 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { }; + dbeaver = callPackage ../applications/misc/dbeaver { + jdk = jdk11; + }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -2545,11 +2587,16 @@ in # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. elk5Version = "5.6.9"; - elk6Version = "6.5.1"; + elk6Version = "6.7.1"; + elk7Version = "7.0.0"; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; - elasticsearch6 = callPackage ../servers/search/elasticsearch { }; - elasticsearch6-oss = callPackage ../servers/search/elasticsearch { + elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; + elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { + enableUnfree = false; + }; + elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { }; + elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; }; elasticsearch = elasticsearch6; @@ -3667,6 +3714,8 @@ in junkie = callPackage ../tools/networking/junkie { }; + just = callPackage ../development/tools/just { }; + go-jira = callPackage ../applications/misc/go-jira { }; john = callPackage ../tools/security/john { }; @@ -3756,8 +3805,12 @@ in keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; - kibana6 = callPackage ../development/tools/misc/kibana/default.nix { }; - kibana6-oss = callPackage ../development/tools/misc/kibana/default.nix { + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; + kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { + enableUnfree = false; + }; + kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; + kibana7-oss = callPackage ../development/tools/misc/kibana/7.x.nix { enableUnfree = false; }; kibana = kibana6; @@ -3846,8 +3899,12 @@ in lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; - logstash6 = callPackage ../tools/misc/logstash { }; - logstash6-oss = callPackage ../tools/misc/logstash { + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; + logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { + enableUnfree = false; + }; + logstash7 = callPackage ../tools/misc/logstash/7.x.nix { }; + logstash7-oss = callPackage ../tools/misc/logstash/7.x.nix { enableUnfree = false; }; logstash = logstash6; @@ -3978,10 +4035,7 @@ in nodejs = hiPrio nodejs-8_x; - nodejs-slim = nodejs-slim-6_x; - - nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {}; - nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { enableNpm = false; }; + nodejs-slim = nodejs-slim-8_x; nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {}; nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; }; @@ -4009,10 +4063,6 @@ in nodejs = pkgs.nodejs-8_x; }); - nodePackages_6_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v6.nix { - nodejs = pkgs.nodejs-6_x; - }); - nodePackages = nodePackages_10_x; npm2nix = nodePackages.npm2nix; @@ -4351,7 +4401,11 @@ in miredo = callPackage ../tools/networking/miredo { }; - mirrorbits = callPackage ../servers/mirrorbits { }; + mirrorbits = callPackage ../servers/mirrorbits { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; mitmproxy = callPackage ../tools/networking/mitmproxy { }; @@ -5105,6 +5159,8 @@ in prototypejs = callPackage ../development/libraries/prototypejs { }; + proxmark3 = callPackage ../tools/security/proxmark3 { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; @@ -5524,6 +5580,8 @@ in shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; + shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { }; + shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5645,7 +5703,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - solr = callPackage ../servers/search/solr { }; + solr = solr_8; + solr_7 = callPackage ../servers/search/solr { }; + solr_8 = callPackage ../servers/search/solr/8.x.nix { }; solvespace = callPackage ../applications/graphics/solvespace { }; @@ -5971,6 +6031,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + tox-node = callPackage ../tools/networking/tox-node { }; + toxvpn = callPackage ../tools/networking/toxvpn { }; toybox = callPackage ../tools/misc/toybox { }; @@ -6432,7 +6494,11 @@ in waf = callPackage ../development/tools/build-managers/waf { python = python3; }; wafHook = makeSetupHook { deps = [ python ]; - substitutions = { inherit waf; }; + substitutions = { + inherit waf; + crossFlags = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) + ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; + }; } ../development/tools/build-managers/waf/setup-hook.sh; wakelan = callPackage ../tools/networking/wakelan { }; @@ -6586,9 +6652,6 @@ in yarn = callPackage ../development/tools/yarn { }; - yarn2nix = throw "Use upstream https://github.com/moretea/yarn2nix"; - mkYarnPackage = yarn2nix; - yasr = callPackage ../applications/audio/yasr { }; yank = callPackage ../tools/misc/yank { }; @@ -6856,15 +6919,7 @@ in cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - # Users installing via `nix-env` will likely be using the REPL, - # which has a hard dependency on Z3, so make sure it is available. - cryptol = haskellPackages.cryptol.overrideDerivation (oldAttrs: { - buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ]; - installPhase = (oldAttrs.installPhase or "") + '' - wrapProgram $out/bin/cryptol \ - --prefix 'PATH' ':' "${lib.getBin z3}/bin" - ''; - }); + cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal {}) crystal_0_25 @@ -6974,7 +7029,7 @@ in crossLibcStdenv = overrideCC stdenv (if stdenv.targetPlatform.useLLVM or false - then buildPackages.llvmPackages_7.lldClangNoLibc + then buildPackages.llvmPackages_8.lldClangNoLibc else buildPackages.gccCrossStageStatic); # The GCC used to build libc for the target platform. Normal gccs will be @@ -6983,6 +7038,7 @@ in libcCross1 = if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode + else if stdenv.targetPlatform.libc == "nblibc" then netbsd.headers else null; binutils1 = wrapBintoolsWith { bintools = binutils-unwrapped; @@ -7667,14 +7723,12 @@ in inherit (darwin) apple_sdk; }; - # For beta and nightly releases use the nixpkgs-mozilla overlay - rust = callPackage ../development/compilers/rust ({ + rust = callPackage ../development/compilers/rust { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvm = llvm_7; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { - stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' - }); - inherit (rust) cargo rustc; + }; + rustPackages = rust.packages.stable; + inherit (rustPackages) cargo rustc rustPlatform; + inherit (rust) makeRustPlatform; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; @@ -7690,9 +7744,6 @@ in defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; - makeRustPlatform = callPackage ../build-support/rust/make-rust-platform.nix {}; - rustPlatform = recurseIntoAttrs (makeRustPlatform rust); - cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-release = callPackage ../tools/package-management/cargo-release { @@ -7704,7 +7755,9 @@ in cargo-asm = callPackage ../development/tools/rust/cargo-asm { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; @@ -7807,6 +7860,7 @@ in vala_0_38 vala_0_40 vala_0_42 + vala_0_44 vala; valadoc = callPackage ../development/tools/valadoc { }; @@ -8093,8 +8147,6 @@ in ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl528 perldevel; - pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; php = php72; @@ -8183,6 +8235,7 @@ in polyml = callPackage ../development/compilers/polyml { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; + polyml57 = callPackage ../development/compilers/polyml/5.7.nix { }; pure = callPackage ../development/interpreters/pure { llvm = llvm_35; @@ -8532,6 +8585,8 @@ in automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; + automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { }; + automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; @@ -8618,6 +8673,8 @@ in cadre = callPackage ../development/tools/cadre { }; + cask = callPackage ../development/tools/cask { }; + casperjs = callPackage ../development/tools/casperjs { inherit (texFunctions) fontsConf; }; @@ -8880,6 +8937,7 @@ in }; foreman = callPackage ../tools/system/foreman { }; + goreman = callPackage ../tools/system/goreman { }; framac = callPackage ../development/tools/analysis/frama-c { }; @@ -8897,6 +8955,8 @@ in pmd = callPackage ../development/tools/analysis/pmd { }; + pmdk = callPackage ../development/libraries/pmdk { }; + jdepend = callPackage ../development/tools/analysis/jdepend { }; fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; @@ -9107,6 +9167,8 @@ in mk = callPackage ../development/tools/build-managers/mk { }; + mkcert = callPackage ../development/tools/misc/mkcert { }; + mkdocs = callPackage ../development/tools/documentation/mkdocs { }; moby = callPackage ../development/tools/misc/moby { }; @@ -9277,8 +9339,6 @@ in withPEPatterns = true; }; - rhc = callPackage ../development/tools/rhc { }; - rman = callPackage ../development/tools/misc/rman { }; rolespec = callPackage ../development/tools/misc/rolespec { }; @@ -9964,7 +10024,7 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox; }; # Aliases @@ -10223,6 +10283,7 @@ in else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode + else if name == "nblibc" then targetPackages.netbsdCross.libc else throw "Unknown libc"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; @@ -10541,6 +10602,8 @@ in hiredis = callPackage ../development/libraries/hiredis { }; + hiredis-vip = callPackage ../development/libraries/hiredis-vip { }; + hivex = callPackage ../development/libraries/hivex { }; hound = callPackage ../development/tools/misc/hound { }; @@ -10740,6 +10803,8 @@ in lcms2 = callPackage ../development/libraries/lcms2 { }; + ldacbt = callPackage ../development/libraries/ldacbt { }; + ldb = callPackage ../development/libraries/ldb { python = python2; }; @@ -10760,6 +10825,8 @@ in lib3ds = callPackage ../development/libraries/lib3ds { }; + lib3mf = callPackage ../development/libraries/lib3mf { }; + libaacs = callPackage ../development/libraries/libaacs { }; libaal = callPackage ../development/libraries/libaal { }; @@ -11487,6 +11554,8 @@ in libotr = callPackage ../development/libraries/libotr { }; + libow = callPackage ../development/libraries/libow { }; + libp11 = callPackage ../development/libraries/libp11 { }; libpar2 = callPackage ../development/libraries/libpar2 { }; @@ -11848,8 +11917,11 @@ in ## libGL/libGLU/Mesa stuff - # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them - libGL = mesa_noglu.stubs; + # Default libGL implementation, should provide headers and + # libGL.so/libEGL.so/... to link agains them. Android NDK provides + # an OpenGL implementation, we can just use that. + libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv + else mesa_noglu.stubs; # Default libGLU libGLU = mesa_glu; @@ -12268,8 +12340,9 @@ in buildPythonApplication click future six; }; - protobuf = protobuf3_6; + protobuf = protobuf3_7; + protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { }; @@ -12659,10 +12732,13 @@ in schroedinger = callPackage ../development/libraries/schroedinger { }; - SDL = callPackage ../development/libraries/SDL { + SDL = callPackage ../development/libraries/SDL ({ inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; - }; + } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { + # libGLU doesn’t work with Android’s SDL + libGLU = null; + }); SDL_sixel = callPackage ../development/libraries/SDL_sixel { }; @@ -12765,7 +12841,11 @@ in sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; }; - skydive = callPackage ../tools/networking/skydive { }; + skydive = callPackage ../tools/networking/skydive { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; slang = callPackage ../development/libraries/slang { }; @@ -13222,6 +13302,8 @@ in wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; + waylandpp = callPackage ../development/libraries/waylandpp { }; + wcslib = callPackage ../development/libraries/wcslib { }; webkitgtk = callPackage ../development/libraries/webkitgtk { @@ -13398,7 +13480,7 @@ in zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_7; + llvmPackages = llvmPackages_8; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -13529,8 +13611,11 @@ in buildGo111Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_11; }; + buildGo112Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_12; + }; - buildGoPackage = buildGo111Package; + buildGoPackage = buildGo112Package; buildGo111Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_11; @@ -13591,19 +13676,14 @@ in ### DEVELOPMENT / PERL MODULES - # the latest Maint version - perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { - perl = perl528; - overrides = (config.perlPackageOverrides or (p: {})) pkgs; - }); - # the latest Devel version - perldevelPackages = recurseIntoAttrs (callPackage ./perl-packages.nix { - perl = perldevel; - overrides = (config.perlPackageOverrides or (p: {})) pkgs; - }); + perlInterpreters = callPackages ../development/interpreters/perl {}; + inherit (perlInterpreters) perl528 perldevel; + + perl528Packages = recurseIntoAttrs perl528.pkgs; + perldevelPackages = perldevel.pkgs; + perl = perl528; perlPackages = perl528Packages; - inherit (perlPackages) perl; ack = perlPackages.ack; @@ -14295,7 +14375,7 @@ in samba3 = callPackage ../servers/samba/3.x.nix { }; samba4 = callPackage ../servers/samba/4.x.nix { - python = python2; + python = python3; }; sambaMaster = callPackage ../servers/samba/master.nix { }; @@ -14329,6 +14409,8 @@ in shairport-sync = callPackage ../servers/shairport-sync { }; + showoff = callPackage ../servers/http/showoff {}; + serfdom = callPackage ../servers/serf { }; seyren = callPackage ../servers/monitoring/seyren { }; @@ -14581,7 +14663,11 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { + # XXX: this is failing with Go 1.12. Error is related to cgo, an + # update to this package might fix it. + buildGoPackage = buildGo111Package; + }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -14661,9 +14747,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = callPackage ../os-specific/linux/ffado { - inherit (python2Packages) python pyqt4 dbus-python; - }; + ffado = callPackage ../os-specific/linux/ffado { }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -15787,6 +15871,8 @@ in documentation-highlighter = callPackage ../misc/documentation-highlighter { }; + documize-community = callPackage ../servers/documize-community { }; + doulos-sil = callPackage ../data/fonts/doulos-sil { }; cabin = callPackage ../data/fonts/cabin { }; @@ -16060,7 +16146,7 @@ in papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; - papis = callPackage ../tools/misc/papis { }; + papis = with python3Packages; toPythonApplication papis; paps = callPackage ../tools/misc/paps { }; @@ -16365,7 +16451,6 @@ in androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; - android-studio-preview = androidStudioPackages.preview; animbar = callPackage ../applications/graphics/animbar { }; @@ -16842,7 +16927,6 @@ in headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; - opus = callPackage ../applications/audio/deadbeef/plugins/opus.nix { }; }; deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix { @@ -16919,6 +17003,10 @@ in dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { + buildClient = false; + buildServerGui = false; + }; droopy = callPackage ../applications/networking/droopy { inherit (python3Packages) wrapPython; @@ -17472,14 +17560,13 @@ in welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { - qt5 = qt59; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; wireshark-qt = wireshark; # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = wireshark.override { withGtk = true; withQt = false; }; - wireshark-cli = wireshark.override { withGtk = false; withQt = false; }; + wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead."; + wireshark-cli = wireshark.override { withQt = false; }; fbida = callPackage ../applications/graphics/fbida { }; @@ -17873,6 +17960,8 @@ in howl = callPackage ../applications/editors/howl { }; + hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; + ht = callPackage ../applications/editors/ht { }; hubstaff = callPackage ../applications/misc/hubstaff { }; @@ -17916,10 +18005,7 @@ in slack-term = callPackage ../applications/networking/instant-messengers/slack-term { }; - singularity = callPackage ../applications/virtualization/singularity { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + singularity = callPackage ../applications/virtualization/singularity { }; spectmorph = callPackage ../applications/audio/spectmorph { }; @@ -18448,6 +18534,8 @@ in mac = callPackage ../development/libraries/mac { }; + macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { }; + magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; @@ -18551,7 +18639,7 @@ in mirage = callPackage ../applications/graphics/mirage { }; - mixxx = callPackage ../applications/audio/mixxx { + mixxx = libsForQt5.callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; }; @@ -19686,6 +19774,8 @@ in peru = callPackage ../applications/version-management/peru {}; + petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer {}; + pmidi = callPackage ../applications/audio/pmidi { }; printrun = callPackage ../applications/misc/printrun { }; @@ -20081,6 +20171,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; + vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; verbiste = callPackage ../applications/misc/verbiste { @@ -20484,12 +20576,18 @@ in kodiPlain = callPackage ../applications/video/kodi { }; + kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); kodi = wrapKodi { kodi = kodiPlain; }; + kodi-wayland = wrapKodi { + kodi = kodiPlainWayland; + }; + kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = @@ -20943,6 +21041,8 @@ in exult = callPackage ../games/exult { }; + fltrator = callPackage ../games/fltrator { }; + factorio = callPackage ../games/factorio { releaseType = "alpha"; }; factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; }; @@ -21542,6 +21642,8 @@ in xsokoban = callPackage ../games/xsokoban { }; + xtris = callPackage ../games/xtris { }; + inherit (callPackage ../games/quake2/yquake2 { }) yquake2 yquake2-ctf @@ -21578,7 +21680,7 @@ in clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5 go_1_11; + inherit pkgs libsForQt5; inherit (lib) makeScope; }); @@ -21784,6 +21886,8 @@ in ecopcr = callPackage ../applications/science/biology/ecopcr { }; + eggnog-mapper = callPackage ../applications/science/biology/eggnog-mapper { }; + emboss = callPackage ../applications/science/biology/emboss { }; ezminc = callPackage ../applications/science/biology/EZminc { }; @@ -21804,6 +21908,8 @@ in kallisto = callPackage ../applications/science/biology/kallisto { }; + migrate = callPackage ../applications/science/biology/migrate { }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { }; muscle = callPackage ../applications/science/biology/muscle { }; @@ -22141,7 +22247,7 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml (attrs: { + polyml = stdenv.lib.overrideDerivation polyml57 (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); @@ -22579,6 +22685,7 @@ in epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { }; + epson-escpr2 = callPackage ../misc/drivers/epson-escpr2 { }; epson_201207w = callPackage ../misc/drivers/epson_201207w { }; @@ -23558,7 +23665,7 @@ in ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; vdr = callPackage ../applications/video/vdr { }; - vdrPlugins = vdr.plugins // (recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { })); + vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; @@ -23619,8 +23726,10 @@ in fts = if stdenv.hostPlatform.isMusl then netbsd.fts else null; - inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) - netbsd; + netbsd = callPackages ../os-specific/bsd/netbsd {}; + netbsdCross = callPackages ../os-specific/bsd/netbsd { + stdenv = crossLibcStdenv; + }; yrd = callPackage ../tools/networking/yrd { }; diff --git a/nixpkgs/pkgs/top-level/coq-packages.nix b/nixpkgs/pkgs/top-level/coq-packages.nix index f08f2eacc23c..2659a3302025 100644 --- a/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/nixpkgs/pkgs/top-level/coq-packages.nix @@ -2,8 +2,9 @@ let mkCoqPackages' = self: coq: - let callPackage = newScope self ; in rec { - inherit callPackage coq; + let newScope = self.newScope; + callPackage = self.callPackage; in { + inherit coq; coqPackages = self; contribs = recurseIntoAttrs @@ -75,7 +76,7 @@ in rec { * a `dontFilter` attribute into the Coq derivation. */ mkCoqPackages = coq: - let self = mkCoqPackages' self coq; in + let self = lib.makeScope newScope (lib.flip mkCoqPackages' coq); in if coq.dontFilter or false then self else filterCoqPackages coq self; diff --git a/nixpkgs/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix index 6551fb9aff17..35a6fafa51a0 100644 --- a/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -65,6 +65,12 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; + ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { + bootPkgs = packages.ghc822Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_6; + llvmPackages = pkgs.llvmPackages_6; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc863Binary; inherit (buildPackages.python3Packages) sphinx; @@ -129,6 +135,11 @@ in { ghc = bh.compiler.ghc864; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; }; + ghc865 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc865; + ghc = bh.compiler.ghc865; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index 68e7fde3a521..f79f6ea3c0ca 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -53,6 +53,8 @@ let atdgen = callPackage ../development/ocaml-modules/atdgen { }; + base64_2 = callPackage ../development/ocaml-modules/base64/2.0.nix { }; + base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { @@ -144,12 +146,15 @@ let cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { + base64 = base64_2; lwt = lwt2; }; cohttp = if lib.versionOlder "4.03" ocaml.version - then callPackage ../development/ocaml-modules/cohttp { } + then callPackage ../development/ocaml-modules/cohttp { + base64 = base64_2; + } else cohttp_p4; cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { }; @@ -337,7 +342,10 @@ let then callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { } else js_of_ocaml_2; - js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; }; + js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { + base64 = base64_2; + lwt = lwt2; + }; js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {}; @@ -574,7 +582,10 @@ let ounit = callPackage ../development/ocaml-modules/ounit { }; - piqi = callPackage ../development/ocaml-modules/piqi { }; + piqi = callPackage ../development/ocaml-modules/piqi { + base64 = base64_2; + }; + piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index 598197888b61..5c9e8f288a60 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -5,20 +5,40 @@ for each package in a separate file: the call to the function would be almost as much code as the function itself. */ -{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: +{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides, + buildPackages}: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.1 or above assert stdenv.lib.versionAtLeast perl.version "5.28.1"; let inherit (stdenv.lib) maintainers; - self = _self // overrides; + self = _self // (overrides pkgs); _self = with self; { inherit perl; callPackage = pkgs.newScope self; - buildPerlPackage = callPackage ../development/perl-modules/generic { }; + # Check whether a derivation provides a perl module. + 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)); + + # Convert derivation to a perl module. + toPerlModule = drv: + drv.overrideAttrs( oldAttrs: { + # Use passthru in order to prevent rebuilds when possible. + passthru = (oldAttrs.passthru or {}) // { + perlModule = perl; + requiredPerlModules = requiredPerlModules drv.propagatedBuildInputs; + }; + }); + + buildPerlPackage = callPackage ../development/perl-modules/generic { + inherit toPerlModule; + }; # Helper functions for packages that use Module::Build to build. buildPerlModule = { buildInputs ? [], ... } @ args: @@ -61,7 +81,7 @@ let propagatedBuildInputs = [ FileNext ]; meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; - homepage = http://betterthangrep.com/; + homepage = https://beyondgrep.com; license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; }; @@ -109,10 +129,10 @@ let }; AlienBuild = buildPerlPackage { - name = "Alien-Build-1.49"; + name = "Alien-Build-1.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.49.tar.gz; - sha256 = "1wsg794pbqgywyfqdrwrsjcj5qgas3h72j4w2iph9ir6b93rb11p"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.60.tar.gz; + sha256 = "0wzwi5l71sn0wrbjsikjlh2y7yn68m3hal8s9v43rc6w20q3z877"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny ]; buildInputs = [ DevelHide PkgConfig Test2Suite ]; @@ -181,10 +201,10 @@ let }; AnyEvent = buildPerlPackage rec { - name = "AnyEvent-7.14"; + name = "AnyEvent-7.15"; src = fetchurl { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "539358d225bad34b4a64f5217f8c2a707b15e3a28c74120c9dd2270c7cca7d2a"; + sha256 = "111db2335c71f789edaec271126b3810356691eb1214dd3f67b527a88ec9e354"; }; buildInputs = [ CanaryStability ]; meta = { @@ -353,10 +373,10 @@ let }; AppFatPacker = buildPerlPackage rec { - name = "App-FatPacker-0.010007"; + name = "App-FatPacker-0.010008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010007.tar.gz; - sha256 = "1g9nff9fdg7dvja0ix2yv32w5xcj963ybcf7x22j61g6r81845fi"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz; + sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j"; }; meta = { description = "pack your dependencies onto your script file"; @@ -378,10 +398,10 @@ let }; Appperlbrew = buildPerlModule rec { - name = "App-perlbrew-0.85"; + name = "App-perlbrew-0.86"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0i3d2csihn5x27lfykwgjpq60ij21s19fzbjsacqq93x46qyim9y"; + sha256 = "11qh94am7fghizmjaf5c7w868svjbv9g4ffirykj8qa6q40zdspp"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; @@ -413,14 +433,14 @@ let }; AppSqitch = buildPerlModule rec { - version = "0.9998"; + version = "0.9999"; name = "App-Sqitch-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "5539f15c0e26ad3595e658e2c21481b0748cc89f6dca0a6ded1fdc62f88c8a5a"; + sha256 = "f5bfa80206738ab8a70358a3b0557661c7459e11ec07dece23ecafa1f34372b3"; }; - buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings ]; - propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; + buildInputs = [ CaptureTiny IOPager TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { homepage = https://sqitch.org/; @@ -487,10 +507,10 @@ let }; ArrayFIFO = buildPerlPackage rec { - name = "Array-FIFO-0.12"; + name = "Array-FIFO-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; - sha256 = "806a931d5a953255a0416978c39987a75e5cbe592a88d44a7b909f4f86888d5d"; + sha256 = "be2aeb5f5a9af1a96f0033508a569ca93ad19ad15dc7c6b998e6d7bc740c66f7"; }; buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; @@ -819,10 +839,10 @@ let }; BKeywords = buildPerlPackage rec { - name = "B-Keywords-1.19"; + name = "B-Keywords-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "1kdzhdksnqrmij98bnifv2p2125zvpf0rmzxjiav65ipydi4rsw9"; + sha256 = "12jvx5gnypqxal4valkf9lidba9nz7kjk2wvm07q3hkmdqxw1zk0"; }; meta = { description = "Lists of reserved barewords and symbol names"; @@ -885,10 +905,10 @@ let }; BusinessHours = buildPerlPackage rec { - name = "Business-Hours-0.12"; + name = "Business-Hours-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz; - sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv"; + url = mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz; + sha256 = "1hiybixagj3i1hsnfr134jgs9wv4azkwq6kijr9zlkxqzczzw1x8"; }; propagatedBuildInputs = [ SetIntSpan ]; meta = { @@ -1029,11 +1049,12 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "1m896j0xdfhldsx8abf10cc16ll1fm9wbav42dpzal9fh07d9f9v"; }; - buildInputs = [ pkgs.cairo Cairo Glib ExtUtilsDepends ExtUtilsPkgConfig ]; + buildInputs = [ pkgs.cairo ]; meta = { description = "Integrate Cairo into the Glib type system"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ Cairo Glib ]; }; cam_pdf = buildPerlModule rec { @@ -1299,10 +1320,10 @@ let }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90123"; + name = "Catalyst-Runtime-5.90124"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90123.tar.gz; - sha256 = "f4484409ee2f7e9dddf148e7509e7a3eaf4df0c22b97a94dddc2171909485f3b"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90124.tar.gz; + sha256 = "2a60cbe7c1f6fec25f0e7fd3f66273386d73edb625748cc0d8c4f20e62983e00"; }; 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 ]; @@ -2248,17 +2269,17 @@ let }; }; - Clipboard = buildPerlPackage { - name = "Clipboard-0.13"; + Clipboard = buildPerlModule { + name = "Clipboard-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/K/KI/KING/Clipboard-0.13.tar.gz; - sha256 = "eebf1c9cb2484be850abdae017147967cf47f8ccd99293771517674b0046ec8a"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.19.tar.gz; + sha256 = "34b9dccac5d559b2b2769e5e315205c8292be2ff9f6e5333112a2377c69abbb3"; }; meta = { description = "Clipboard - Copy and Paste with any OS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin MacPasteboard; + propagatedBuildInputs = [ CGI URI ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard; # Disable test on darwin because MacPasteboard fails when not logged in interactively. # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. @@ -2304,10 +2325,10 @@ let }; CodeTidyAll = buildPerlPackage rec { - name = "Code-TidyAll-0.72"; + name = "Code-TidyAll-0.73"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.72.tar.gz; - sha256 = "0py9z3f7ld93a7qibrc917qkwjh7pcl0r9khzg7dlr4rra0xq9fn"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.73.tar.gz; + sha256 = "1fvw73q5vj5b12y9jj9mmwl0dipdjlvpsw5rzvldr4csicrpiz6q"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -2355,10 +2376,10 @@ let }; CompressRawBzip2 = buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.081"; + name = "Compress-Raw-Bzip2-2.084"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "081mpkjy688lg48997fqh3d7ja12vazmz02fw84495civg4vb4l6"; + sha256 = "0kwjrsl519bv48b7698a9anj6l0n3z1vrd1a7im2r1pbffxxw5kx"; }; # Don't build a private copy of bzip2. @@ -2476,10 +2497,10 @@ let }; ConfigIniFiles = buildPerlModule rec { - name = "Config-IniFiles-3.000000"; + name = "Config-IniFiles-3.000001"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "cd92f6b7f1aa3e03abf6251f1e6129dab8a2b835e8b17c7c4cc3e8305c1c9b29"; + sha256 = "48ada0a6c6a5b6cbe1bfb261fe56e3bf8492ff9420f7321b6a972924416659ea"; }; propagatedBuildInputs = [ IOStringy ]; meta = { @@ -2710,12 +2731,12 @@ let }; CPAN = buildPerlPackage rec { - name = "CPAN-2.22"; + name = "CPAN-2.25"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "c6f2a44cd95ef5989ef0abc83dca38ae645bd5ea09de67461251f2d782989990"; + sha256 = "b4cbef12b872f34e29c3cdcd511c5ed004c4486939001b60e493dc25956552a9"; }; - propagatedBuildInputs = [ ArchiveZip CPANChecksums Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; + 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 ]; @@ -2723,10 +2744,10 @@ let }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.08"; + name = "Cpanel-JSON-XS-4.09"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "2bc1475b698b5a419bb55127b07732794b495e2a6e0f4ed39bdcbd39a64e7c2d"; + sha256 = "99c0155e554222b0cb24b032ced9a4f7bdfd2b3c98d07657ac020fbe5c3495a3"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -2784,10 +2805,10 @@ let }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.86"; + name = "CPAN-Perl-Releases-3.90"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0g90xm43pydfjq794ay4dvgvhjdr4xrjgmravj8wb2kqc65pm2za"; + sha256 = "19pjq3x9nb76m4a5g37miw1js5mmfqhv1z2gyya3kjc8wbjb1qjc"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -3508,10 +3529,10 @@ let }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.221"; + name = "Data-UUID-1.224"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz; - sha256 = "0rw60wib0mj5z0v909mplh750y40hzyzf4z0b6h4ajxplyiv5irw"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz; + sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69"; }; }; @@ -3601,10 +3622,10 @@ let }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.75"; + name = "Date-Manip-6.76"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "0zdnrdm7bj4qwnmd2r3gj80dm1brr63px04iy5blxa5i5azczyy1"; + sha256 = "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -3678,12 +3699,12 @@ let }; DateTimeFormatBuilder = buildPerlPackage { - name = "DateTime-Format-Builder-0.81"; + name = "DateTime-Format-Builder-0.82"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz; - sha256 = "7cd58a8cb53bf698407cc992f89e4d49bf3dc55baf4f3f00f1def63a0fff33ef"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz; + sha256 = "383faeb22b992c77ca65a5257992dd2f6db91a7db73ea4601c512e1c6c2e1ca3"; }; - propagatedBuildInputs = [ ClassFactoryUtil DateTimeFormatStrptime ParamsValidate ]; + propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; license = stdenv.lib.licenses.artistic2; @@ -3811,13 +3832,13 @@ let }; DateTimeFormatStrptime = buildPerlPackage rec { - name = "DateTime-Format-Strptime-1.75"; + name = "DateTime-Format-Strptime-1.76"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "4fcfb2ac4f79d7ff2855a405f39050d2ea691ee098ce54ede8af79c8d6ab3c19"; + sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d"; }; buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ DateTime PackageDeprecationManager ]; + propagatedBuildInputs = [ DateTime ]; meta = { description = "Parse and format strp and strf time patterns"; license = stdenv.lib.licenses.artistic2; @@ -3878,10 +3899,10 @@ let }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-2.21"; + name = "DateTime-TimeZone-2.23"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "54d685f79df1033c259502cd9c22b1a9d37b627bf815faecebaa27f8e1079e1e"; + sha256 = "6ae40286031853a4319c5b34516f1c09e429d5caa5f782165cc27175c89fe54f"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -3978,10 +3999,10 @@ let }; DevelPatchPerl = buildPerlPackage rec { - name = "Devel-PatchPerl-1.52"; + name = "Devel-PatchPerl-1.56"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0iynq3sgxyidr8d6x0gb1yk5nvzr7xmyslk2bs8hkp9sbxpznsaf"; + sha256 = "1b97a6b82qh1dsv13rgxyiv4lffp360crgc9wiq3pyj0zr13nfc2"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { @@ -4005,10 +4026,10 @@ let }; DevelPPPort = buildPerlPackage rec { - name = "Devel-PPPort-3.43"; + name = "Devel-PPPort-3.44"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.43.tar.gz; - sha256 = "90fd98fb24e1d7252011ff181244e04c8c8135933e67eab93c57ed6a61ed86f4"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.44.tar.gz; + sha256 = "06561decc76f0aaba8e77f72b74624e19e2ad448a654c489c61bc786660832c5"; }; meta = { description = "Perl/Pollution/Portability"; @@ -4255,6 +4276,18 @@ let }; }; + DataBinary = buildPerlPackage { + name = "Data-Binary-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz; + sha256 = "0wwdrgkz4yqpzdmfvid63v5v10b9hwdsg15jvks0hwdc23ga48a8"; + }; + meta = { + description = "Simple detection of binary versus text in strings"; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + DBIxIntrospector = buildPerlPackage rec { name = "DBIx-Introspector-0.001005"; src = fetchurl { @@ -4853,10 +4886,10 @@ let }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.911"; + name = "Email-Address-1.912"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.911.tar.gz; - sha256 = "10qfc2va6dhshjgw6xvxk88cd88s44kbxp47xmixx297wv3l69zl"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz; + sha256 = "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg"; }; meta = { description = "RFC 2822 Address Parsing"; @@ -4865,10 +4898,10 @@ let }; EmailAddressList = buildPerlPackage { - name = "Email-Address-List-0.05"; + name = "Email-Address-List-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Email-Address-List-0.05.tar.gz; - sha256 = "705c23fc2163c2347ba0aea998450259f7b10577a368c6d310bd4e98b427a033"; + url = mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz; + sha256 = "305b94c778011cee70d9f21514d92e985fa9dccbb84c64798f0c1f0b24eb870e"; }; buildInputs = [ JSON ]; propagatedBuildInputs = [ EmailAddress ]; @@ -5067,11 +5100,12 @@ let }; Encode = buildPerlPackage rec { - name = "Encode-2.98"; + name = "Encode-3.00"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "303d396477c94c43c2f83da1a8025d68de76bd7e52c2cc35fbdf5c59b4c2cffa"; + sha256 = "4b538b47459cf5747b7395ccc8c8c9b3b661cc016c50b8a67e10fe19590fea5e"; }; + postInstall = "rm $out/bin/{enc2xs,encguess,piconv} $out/share/man/man1/{enc2xs,encguess,piconv}.1"; # remove the files perl-5.28 already has meta = { description = "Character encodings in Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -5434,10 +5468,10 @@ let }; ExtUtilsMakeMakerCPANfile = buildPerlPackage rec { - name = "ExtUtils-MakeMaker-CPANfile-0.08"; + name = "ExtUtils-MakeMaker-CPANfile-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.08.tar.gz; - sha256 = "0yg2z4six807lraqh8ncsq6l62vj7zi0a38ha9nvmhd6lbipmsql"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz; + sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc"; }; propagatedBuildInputs = [ ModuleCPANfile ]; meta = { @@ -5583,12 +5617,12 @@ let }; FileChangeNotify = buildPerlPackage { - name = "File-ChangeNotify-0.29"; + name = "File-ChangeNotify-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.29.tar.gz; - sha256 = "438d4295ef5f854ace61037a11726ef65dc0bf73e296bd12fc7e2108602a444b"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz; + sha256 = "192bdb1ce76266c6a694a8e962d039e3adeeb829b6ac1e23f5057f2b506392bd"; }; - buildInputs = [ TestException TestRequires TestWithoutModule ]; + buildInputs = [ Test2Suite TestRequires TestWithoutModule ]; propagatedBuildInputs = [ ModulePluggable Moo TypeTiny namespaceautoclean ]; meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; @@ -5620,10 +5654,10 @@ let }; FileBOM = buildPerlModule rec { - name = "File-BOM-0.15"; + name = "File-BOM-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz"; - sha256 = "431c8b39397fd5ad5b1a1100d3647a06e9f94304d46db44ffc0a0e5c5c06a1c1"; + sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Readonly ]; @@ -6030,12 +6064,10 @@ let }; FileSlurp = buildPerlPackage { - name = "File-Slurp-9999.25"; - # WARNING: check on next update if deprecation warning is gone - patches = [ ../development/perl-modules/File-Slurp/silence-deprecation.patch ]; + name = "File-Slurp-9999.26"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.25.tar.gz; - sha256 = "1hg3bhf5m78d77p4174cnldd75ppyrvr5rkc8w289ihvwsx9gsn7"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.26.tar.gz; + sha256 = "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; @@ -6082,10 +6114,10 @@ let }; FileTemp = buildPerlPackage { - name = "File-Temp-0.2308"; + name = "File-Temp-0.2309"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2308.tar.gz; - sha256 = "1m6iz26znn85r7pnnwlqsda0x5mm2c8qcz5ickl945dbw8icp88w"; + url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz; + sha256 = "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1"; }; meta = { description = "return name and handle of a temporary file safely"; @@ -6135,10 +6167,10 @@ let }; FileWhich = buildPerlPackage rec { - name = "File-Which-1.22"; + name = "File-Which-1.23"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "e8a8ffcf96868c6879e82645db4ff9ef00c2d8a286fed21971e7280f52cf0dd4"; + sha256 = "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078"; }; meta = { homepage = http://perl.wdlabs.com/File-Which; @@ -6258,10 +6290,10 @@ let }; GD = buildPerlPackage rec { - name = "GD-2.69"; + name = "GD-2.71"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.69.tar.gz; - sha256 = "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x"; + url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz; + sha256 = "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5"; }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ]; @@ -6408,12 +6440,13 @@ let }; Glib = buildPerlPackage rec { - name = "Glib-1.328"; + name = "Glib-1.329"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1mb40h76kk1wfcl0dqd1r8wfsn4ik29jln3mcsjhmadasynw5725"; + sha256 = "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v"; }; buildInputs = [ pkgs.glib ]; + doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; @@ -6423,13 +6456,12 @@ let }; GlibObjectIntrospection = buildPerlPackage rec { - name = "Glib-Object-Introspection-0.046"; + name = "Glib-Object-Introspection-0.047"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1d3gl943p27gd42kxc1i9sp5z55gpgcslz1jvx7cxd6mflhdlck6"; + sha256 = "1sk32pcv4ik3sniqbjrz8nlw7f2a76l87wx1rwdjypv6h9pjnrnk"; }; - buildInputs = [ Glib ExtUtilsDepends ExtUtilsPkgConfig ]; - propagatedBuildInputs = [ pkgs.gobject-introspection ]; + propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; meta = { description = "Dynamically create Perl language bindings"; license = stdenv.lib.licenses.lgpl2Plus; @@ -6547,8 +6579,8 @@ let url = "mirror://cpan/authors/id/P/PE/PERLMAX/${name}.tar.gz"; sha256 = "0l1vsvyv9hjxhsxrahq4h64axh7qmk50kiz2spa3s1hr7s3qfk72"; }; - buildInputs = [ pkgs.gtk3 GlibObjectIntrospection Glib ]; - propagatedBuildInputs = [ pkgs.goocanvas2 ]; + buildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ pkgs.goocanvas2 Gtk3 ]; meta = { description = "Perl binding for GooCanvas2 widget using Glib::Object::Introspection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6729,8 +6761,7 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "0baxyhlzdf7avka40h1niiir8vz4nilqkiwh876i0hv0f8xj3nqa"; }; - buildInputs = [ Cairo CairoGObject Glib GlibObjectIntrospection ]; - propagatedBuildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { description = "Perl interface to the 3.x series of the gtk+ toolkit"; license = stdenv.lib.licenses.lgpl21Plus; @@ -6743,11 +6774,11 @@ let url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/${name}.tar.gz"; sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; }; - buildInputs = [ Gtk3 Glib GlibObjectIntrospection Cairo CairoGObject ]; meta = { description = "A simple interface to Gtk3's complex MVC list widget"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ Gtk3 ]; }; Guard = buildPerlPackage rec { @@ -7467,10 +7498,10 @@ let }; Imager = buildPerlPackage rec { - name = "Imager-1.007"; + name = "Imager-1.010"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz"; - sha256 = "adc12651e53e9226eb05482bf5f6faf77703af036fb922bc8c3f077f25b98d63"; + sha256 = "fc22e3e302f139d74a98d8068ccddfd92166141ddd4ca5c40f102070bcd7a3c7"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; @@ -7621,10 +7652,10 @@ let }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.081"; + name = "IO-Compress-2.084"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "5211c775544dc8c511af08edfb1c0c22734daa2789149c2a88d68e17b43546d9"; + sha256 = "1dbd503eda643aa58d1ef9b4d44c57889243d0ce6c54d5b45babceb860d76db5"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { @@ -7742,12 +7773,12 @@ let }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.060"; + name = "IO-Socket-SSL-2.064"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c"; + sha256 = "5827c6459ed2dce1da0ba6f442d198fa2c81554e045930e32b92c6d39e3ac3f5"; }; - propagatedBuildInputs = [ MozillaCA NetSSLeay ]; + propagatedBuildInputs = [ NetSSLeay ]; # Fix path to default certificate store. postPatch = '' substituteInPlace lib/IO/Socket/SSL.pm \ @@ -7934,10 +7965,10 @@ let }; Inline = buildPerlPackage rec { - name = "Inline-0.80"; + name = "Inline-0.81"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.81.tar.gz; + sha256 = "1f973868dcca56a3a99b25d253fa18bf2d53670f8bbfa498261267647707b1e3"; }; buildInputs = [ TestWarn ]; meta = { @@ -8037,10 +8068,10 @@ let }; JSON = buildPerlPackage { - name = "JSON-4.00"; + name = "JSON-4.02"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.00.tar.gz; - sha256 = "0s0h3a1y74851fgvrhq3qv8kw1z1ccwzz1ghn6vh91l7fl81znn4"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz; + sha256 = "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4"; }; # Do not abort cross-compilation on failure to load native JSON module into host perl preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -8079,10 +8110,10 @@ let }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-4.00"; + name = "JSON-PP-4.02"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.00.tar.gz; - sha256 = "0g0g6qxcic5p34n51dlpq2s9f23qzlxxqsgprv7x962k894qxx5y"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.02.tar.gz; + sha256 = "11wlh4clq0cddiamh1ipps3fh9ly01j4pcdh8f4nw7912bw7pimc"; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -8118,10 +8149,10 @@ let }; JSONXS = buildPerlPackage { - name = "JSON-XS-4.0"; + name = "JSON-XS-4.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.0.tar.gz; - sha256 = "0118yrzagwlcfj5yldn3h23zzqs2rx282jlm068nf7fjlvy4m7s7"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.01.tar.gz; + sha256 = "0p1yjwwrq3x1f831jhwxlb76h92px01a316zv65zzmhzkbin446c"; }; propagatedBuildInputs = [ TypesSerialiser ]; buildInputs = [ CanaryStability ]; @@ -8526,10 +8557,10 @@ let }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.59"; + name = "Locale-Codes-3.60"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.59.tar.gz; - sha256 = "388dea3d088aa0513f21091e0fe4a9c61ab2c173c83052b3120a52b103592c03"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.60.tar.gz; + sha256 = "32829bc49d927335de6994f3cfd55c5e693881602564c2aa966fe86740371194"; }; meta = { description = "A distribution of modules to handle locale codes"; @@ -8791,10 +8822,10 @@ let }; MCE = buildPerlPackage rec { - name = "MCE-1.837"; + name = "MCE-1.838"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.837.tar.gz; - sha256 = "0si12wv02i8cn2xw6lk0m2apqrd88awcli1yadmvikq5rnfhcypa"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.838.tar.gz; + sha256 = "1xg63kd2la5zh7cvapv1l1wsxjallj4xv5l15bdp8jl3vvffwdhi"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; @@ -8923,7 +8954,7 @@ let sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; - propagatedBuildInputs = [ IOSocketSSL LWP ]; + propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ]; doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; @@ -9007,11 +9038,11 @@ let }; MailBox = buildPerlPackage rec { - version = "3.005"; + version = "3.006"; name = "Mail-Box-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "103v5jiv5mlckss1yardjvil506sx60f3g2ph2kgx9x6sy1sd93m"; + sha256 = "1fm17z13jq7ff2f4ynnajdzzdqa4sb0kx5nfy9fvb0nzw49qd502"; }; doCheck = false; @@ -9036,10 +9067,10 @@ let }; MailMessage = buildPerlPackage rec { - name = "Mail-Message-3.007"; + name = "Mail-Message-3.008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.007.tar.gz; - sha256 = "1hpf68i5w20dxcibqj5w5h8mx9qa6vjhr34bicrvdh7d3dfxq0bn"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz; + sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { @@ -9060,10 +9091,10 @@ let }; MailIMAPClient = buildPerlPackage { - name = "Mail-IMAPClient-3.40"; + name = "Mail-IMAPClient-3.42"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.40.tar.gz; - sha256 = "1n8fq6j8nxs85v5qwmrr3ain900rvj9i8n7in4r5bw7kiihdv3xz"; + url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz; + sha256 = "0znf035ikaxyfishv507qq6g691xvbnziqlcwfikkj2l1kan88hw"; }; propagatedBuildInputs = [ ParseRecDescent ]; }; @@ -9404,7 +9435,7 @@ let url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000007.tar.gz; sha256 = "1wg1x1pqamapfhn6rbffqipncgs15k99q34agdamv76i6782ny8r"; }; - propagatedBuildInputs = [ MathInt128 MaxMindDBReader pkgs.libmaxminddb ]; + propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ]; meta = { description = "Fast XS implementation of MaxMind DB reader"; @@ -9714,12 +9745,12 @@ let }; ModuleCPANTSAnalyse = buildPerlPackage rec { - name = "Module-CPANTS-Analyse-0.96"; + name = "Module-CPANTS-Analyse-1.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-0.96.tar.gz; - sha256 = "1c38fnbx9w1s841am1i5h33lcqr9bwc9bni21n907nmyp41wr297"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.00.tar.gz; + sha256 = "0r77g2h0d3p81scf294x5qkvi76hzwvbfji0m86abidjav5jk6a2"; }; - propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo FileFindObject IOCapture JSONMaybeXS ModuleExtractUse ModulePluggable SetScalar SoftwareLicenseCCpack ]; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; meta = { description = "Generate Kwalitee ratings for a distribution"; @@ -9743,10 +9774,10 @@ let }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20181218"; + name = "Module-CoreList-5.20190220"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20181218.tar.gz; - sha256 = "1rq8i4wsd9k38djv18j6rpyiya7d6z67ac8gwvsp2yqs1hqqvpfi"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20190220.tar.gz; + sha256 = "0v5yavg3ggal8aj00426wkjw38yrji449lkaaxs0ynwjqhnq01i7"; }; meta = { homepage = http://dev.perl.org/; @@ -9942,11 +9973,11 @@ let }; }; - ModuleScanDeps = let version = "1.26"; in buildPerlPackage { + ModuleScanDeps = let version = "1.27"; in buildPerlPackage { name = "Module-ScanDeps-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz"; - sha256 = "1awin0lfliskrw86mhks6qszxrwbwhr66fc79cv00598mrjzn223"; + sha256 = "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f"; }; buildInputs = [ TestRequires ]; meta = { @@ -10018,10 +10049,10 @@ let }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-8.10"; + name = "Mojolicious-8.12"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "0rfzfc2iy42qnxlzv6rndc3vwfm2nlqdipqfmbpjr42wrf4x3g4v"; + sha256 = "1sc9bdac4p9ha6xfmi3xj2dzip4bhxxzn5zvzyxqgbyvvr52k2dw"; }; meta = { homepage = https://mojolicious.org; @@ -10389,10 +10420,10 @@ let }; MouseXGetopt = buildPerlModule rec { - name = "MouseX-Getopt-0.37"; + name = "MouseX-Getopt-0.38"; src = fetchurl { url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; - sha256 = "a6221043e7be3217ce56d2a6425a413d9cd28e2f52053995a6ceb118e8e963bc"; + sha256 = "de3ea8ef452dd9501ea8c4eda8744b7224602602b04692607edd7d62b79f038f"; }; buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; @@ -10482,10 +10513,10 @@ let }; MooseXGetopt = buildPerlModule rec { - name = "MooseX-Getopt-0.72"; + name = "MooseX-Getopt-0.74"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "a378411a061ed239554d2b7f86b2b82bf55f600901243a6ec3fd29557d171b2e"; + sha256 = "1de0df3b431ebe9f3563bdf4569eacd7e07e865a8397f2a990d0cb57d4cb2c24"; }; buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; @@ -11015,7 +11046,7 @@ let sha256 = "5f5f1142185a67b87406a3fb31f221564f61838a70ef4c07284a66c55e82ad05"; }; meta = { - homepage = http://wiki.github.com/toddr/Net-Ident/; + homepage = https://github.com/toddr/Net-Ident; description = "Lookup the username on the remote end of a TCP/IP connection"; license = stdenv.lib.licenses.mit; }; @@ -11356,10 +11387,10 @@ let }; NetSFTPForeign = buildPerlPackage rec { - name = "Net-SFTP-Foreign-1.89"; + name = "Net-SFTP-Foreign-1.90"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; - sha256 = "9bd33e130581c1fc3eb6108eaf9056c1507428cace04a572f7afe816d83b08a7"; + sha256 = "d1eafb34f669ab6de675058292778ba2e0e42ecafd59abb1128ba31d62a0419d"; }; propagatedBuildInputs = [ pkgs.openssl ]; patchPhase = '' @@ -11765,10 +11796,10 @@ let }; PackageStash = buildPerlPackage { - name = "Package-Stash-0.37"; + name = "Package-Stash-0.38"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz; - sha256 = "06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c"; + url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz; + sha256 = "c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; @@ -11779,10 +11810,10 @@ let }; PackageStashXS = buildPerlPackage { - name = "Package-Stash-XS-0.28"; + name = "Package-Stash-XS-0.29"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz; - sha256 = "11nl69n8i56p91pd0ia44ip0vpv2cxwpbfakrv01vvv8az1cbn13"; + url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz; + sha256 = "1akqk10qxwk798qppajqbczwmhy4cs9g0lg961m3vq218slnnryk"; }; buildInputs = [ TestFatal TestRequires ]; meta = { @@ -12420,10 +12451,10 @@ let }; PlackMiddlewareReverseProxy = buildPerlPackage { - name = "Plack-Middleware-ReverseProxy-0.15"; + name = "Plack-Middleware-ReverseProxy-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.15.tar.gz; - sha256 = "1zmsccdy6wr5hxzj07r1nsmaymyibk87p95z0wzknjw10lwmqs9f"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz; + sha256 = "0a512n62pnk5ayj3zdzyj50iy1qi8nwh6ygks2h7nrh7gp9k2jc7"; }; propagatedBuildInputs = [ Plack ]; meta = { @@ -12433,10 +12464,10 @@ let }; PlackMiddlewareSession = buildPerlModule rec { - name = "Plack-Middleware-Session-0.30"; + name = "Plack-Middleware-Session-0.32"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.30.tar.gz; - sha256 = "0cwlhfj1644jq8axv4cghsqqjsx2y7hj7g0y5l179fcgmbp2ndzf"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.32.tar.gz; + sha256 = "00jnyclvggb4g7q6489x4x1sxfpxy9xyxrqkg2aqpn05fcqwfznp"; }; propagatedBuildInputs = [ DigestHMAC DigestSHA1 Plack ]; buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; @@ -12613,10 +12644,10 @@ let }; ProcProcessTable = buildPerlPackage { - name = "Proc-ProcessTable-0.55"; + name = "Proc-ProcessTable-0.56"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.55.tar.gz; - sha256 = "3b9660d940a0c016c5e48108fa9dbf9f30492b505aa0a26d22b09554f05714f5"; + url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.56.tar.gz; + sha256 = "99fb8fd11e4e438399dd362d95b5b2073f1f340e9b3a7f04e76b6c7428170660"; }; meta = { description = "Perl extension to access the unix process table"; @@ -12750,6 +12781,20 @@ let }; }; + PerlPrereqScannerNotQuiteLite = buildPerlPackage { + name = "Perl-PrereqScanner-NotQuiteLite-0.9904"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9904.tar.gz; + sha256 = "1qf6x49sjswazh7bicpm7wnwpdnx245ws02s53dvbxcbw2c66hsn"; + }; + propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; + meta = { + description = "a tool to scan your Perl code for its prerequisites"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PerlVersion = buildPerlPackage rec { name = "Perl-Version-1.013"; src = fetchurl { @@ -12967,10 +13012,10 @@ let }; PodMarkdownGithub = buildPerlPackage rec { - name = "Pod-Markdown-Github-0.03"; + name = "Pod-Markdown-Github-0.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.03.tar.gz; - sha256 = "0y555pb78j0lz24kdgiwkmk1vcv4lg3a3mvnw9vm2qqnkp7p0nag"; + url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz; + sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk"; }; propagatedBuildInputs = [ PodMarkdown ]; buildInputs = [ TestDifferences ]; @@ -13197,12 +13242,22 @@ let sha256 = "d6d3c711657a380f1cb24d8b54a1cd20f725f7f54665189e9e67bb0b877109a3"; }; meta = { - homepage = http://wiki.github.com/toddr/Regexp-Parser; + homepage = https://github.com/toddr/Regexp-Parser; description = "Base class for parsing regexes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; + RegexpTrie = buildPerlPackage { + name = "Regexp-Trie-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz; + sha256 = "1yn5l6x3xyic9jxw9jggqsbggcv7rc8ggj4zbnlz9hfvv17gjazv"; + }; + meta = { + }; + }; + RESTClient = buildPerlPackage rec { name = "REST-Client-273"; src = fetchurl { @@ -14390,10 +14445,10 @@ let }; TAPParserSourceHandlerpgTAP = buildPerlModule rec { - name = "TAP-Parser-SourceHandler-pgTAP-3.34"; + name = "TAP-Parser-SourceHandler-pgTAP-3.35"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "1q9h5h3m31vfch17djjacnjqvfkyw0b8ndwv1kk8a09bp8sbsh8v"; + sha256 = "1655337l1cyd7q62007wrk87q2gbbwfq9xjy1wgx3hyflxpkkvl4"; }; meta = { description = "Stream TAP from pgTAP test scripts"; @@ -14624,18 +14679,34 @@ let TermReadKey = buildPerlPackage rec { name = "TermReadKey-${version}"; - version = "2.37"; + version = "2.38"; src = fetchurl { url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz"; - sha256 = "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa"; - }; + sha256 = "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s"; + }; + cross = stdenv.hostPlatform != stdenv.buildPlatform; + + # use native libraries from the host when running build commands + postConfigure = if cross then let + host_perl = buildPackages.perl; + host_self = buildPackages.perlPackages.TermReadKey; + perl_lib = "${host_perl}/lib/perl5/${host_perl.version}"; + self_lib = "${host_self}/lib/perl5/site_perl/${host_perl.version}"; + in '' + sed -ie 's|"-I$(INST_ARCHLIB)"|"-I${perl_lib}" "-I${self_lib}"|g' Makefile + '' else null; + + # TermReadKey uses itself in the build process + nativeBuildInputs = if cross then [ + buildPackages.perlPackages.TermReadKey + ] else []; }; TermReadLineGnu = buildPerlPackage rec { - name = "Term-ReadLine-Gnu-1.35"; + name = "Term-ReadLine-Gnu-1.36"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz"; - sha256 = "575d32d4ab67cd656f314e8d0ee3d45d2491078f3b2421e520c4273e92eb9125"; + sha256 = "9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925"; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lreadline -lncursesw"; @@ -14781,10 +14852,10 @@ let }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000117"; + name = "Test2-Suite-0.000118"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "e8877a90655ace2e8302104e0de27faf777397194738b085b209749c091ef154"; + sha256 = "e9225132b585d6730d3de6b0caa2648b9c67995732c0a081efcfcad37b8af227"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -15022,11 +15093,11 @@ let }; }; - TestDifferences = buildPerlModule { - name = "Test-Differences-0.64"; + TestDifferences = buildPerlPackage { + name = "Test-Differences-0.66"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz; - sha256 = "9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.66.tar.gz; + sha256 = "83633a171e83ff03a0eb1f5a699f05b506a34190bcf8726979bbfd9dc16c223a"; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { @@ -15209,10 +15280,10 @@ let }; TestKwalitee = buildPerlPackage rec { - name = "Test-Kwalitee-1.27"; + name = "Test-Kwalitee-1.28"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.27.tar.gz; - sha256 = "095kpj2011jk1mpnb07fs7yi190hmqh85mj662gx0dkpl9ic7a5w"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz; + sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl"; }; propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; @@ -15545,10 +15616,10 @@ let }; TestPortabilityFiles = buildPerlPackage { - name = "Test-Portability-Files-0.09"; + name = "Test-Portability-Files-0.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.09.tar.gz; - sha256 = "16d31fa941af1a79faec0192e09880cb19225cde649c03d2e3ceda9b455a621c"; + url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz; + sha256 = "08e4b432492dc1b44b55d5db57952eb76379c7f434ee8f16aca64d491f401a16"; }; meta = { description = "Check file names portability"; @@ -15756,10 +15827,10 @@ let }; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302141"; + name = "Test-Simple-1.302162"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302141.tar.gz; - sha256 = "d7045bc814cba0426684a32c44d90ced5b83075659f0fcefed88c32f8fd395b7"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302162.tar.gz; + sha256 = "73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4"; }; meta = { description = "Basic utilities for writing tests"; @@ -15945,10 +16016,10 @@ let }; TestWWWMechanizeCatalyst = buildPerlPackage rec { - name = "Test-WWW-Mechanize-Catalyst-0.60"; + name = "Test-WWW-Mechanize-Catalyst-0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz; + sha256 = "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq"; }; doCheck = false; # listens on an external port propagatedBuildInputs = [ CatalystRuntime WWWMechanize ]; @@ -16091,10 +16162,10 @@ let }; TextCSV = buildPerlPackage rec { - name = "Text-CSV-1.97"; + name = "Text-CSV-1.99"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.97.tar.gz; - sha256 = "cc350462efa8d39d5c8a1da5f205bc31620cd52d9865a769c8e3ed1b41640fd5"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.99.tar.gz; + sha256 = "e74ec039b12cc51d346bf1d814af7db8a05cb0a98340e7547a21646da8668cd2"; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; @@ -16116,10 +16187,10 @@ let }; TextCSV_XS = buildPerlPackage rec { - name = "Text-CSV_XS-1.37"; + name = "Text-CSV_XS-1.38"; src = fetchurl { url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz"; - sha256 = "20e16da9c38b0938f308c01d954f49d2c6922bac0d2d979bf2ad483fe7476ba2"; + sha256 = "d6317ae0ed0658e00037ecedaa3da2ff8565c86b0516ef8a93322b959de313dd"; }; meta = { description = "Comma-Separated Values manipulation routines"; @@ -16380,10 +16451,10 @@ let }; TextTemplate = buildPerlPackage { - name = "Text-Template-1.53"; + name = "Text-Template-1.55"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz; - sha256 = "ae221cbba2b27967a12bda3f531547e897eb38ae0a92c084607fd5a6a8085bc4"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.55.tar.gz; + sha256 = "a4948be945250c17f9f0aaee56cc79b3195dcebcb75215b55d6ed1ca2b02f18b"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; }; @@ -16829,10 +16900,10 @@ let }; TypeTiny = buildPerlPackage { - name = "Type-Tiny-1.004002"; + name = "Type-Tiny-1.004004"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004002.tar.gz; - sha256 = "e52c7e9593052aed157a15d473b5c25a1dbb3454bf3cd6913df94cc9bb2be707"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004004.tar.gz; + sha256 = "081281ea004cdd89003d938aa52c1398e24411dd8f7163b14d0977a13f7062be"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { @@ -16911,10 +16982,10 @@ let }; UnicodeLineBreak = buildPerlPackage rec { - name = "Unicode-LineBreak-2018.003"; + name = "Unicode-LineBreak-2019.001"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEZUMI/${name}.tar.gz"; - sha256 = "1cbilpy7ypr26rjr6cmrbkxhsm1l6yx7s1p7lcf0l3vi7vzr4346"; + sha256 = "12iinva5gqc9g7qzxrvmh45n714z0ad9g7wq2dxwgp6drbj64rs8"; }; propagatedBuildInputs = [ MIMECharset ]; meta = { @@ -16940,10 +17011,10 @@ let }; URI = buildPerlPackage rec { - name = "URI-1.74"; + name = "URI-1.76"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d"; + url = mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz; + sha256 = "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e"; }; buildInputs = [ TestNeeds ]; meta = { @@ -17176,10 +17247,10 @@ let }; WWWMechanize = buildPerlPackage { - name = "WWW-Mechanize-1.90"; + name = "WWW-Mechanize-1.91"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.90.tar.gz; - sha256 = "038i9nh643cmi4y4r8fsp0xvzz4zfh5srh8sw3w5kzxjq126pr44"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.91.tar.gz; + sha256 = "0cb14m1vhaf0mgn2fqwi5hm72xhfi77hpq2g57swgy0w83x7m27b"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -17188,7 +17259,7 @@ let description = "Handy web browsing in a Perl object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ CGI HTTPServerSimple PerlCritic PerlTidy TestDeep TestFatal TestOutput TestWarnings ]; + buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { @@ -17425,10 +17496,10 @@ let }; XMLLibXML = buildPerlPackage rec { - name = "XML-LibXML-2.0132"; + name = "XML-LibXML-2.0134"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0xnl281hb590i287fxpl947f1s4zl9dnvc4ajvsqi89w23im453j"; + sha256 = "1ks69xymv6zkj7hvaymjvb78ch81abri7kg4zrwxhdfsqb8a9g7h"; }; SKIP_SAX_INSTALL = 1; buildInputs = [ pkgs.libxml2 ]; @@ -17722,10 +17793,10 @@ let }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.75"; + name = "YAML-LibYAML-0.76"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.75.tar.gz; - sha256 = "1jlj6yrh3kv6f6q2x253lds664916fgps0praih5gwxagnld9k32"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.76.tar.gz; + sha256 = "1m94g36sl9rasjlvlsf65xcal5hvkc3gbzd7l68h17az75269kyy"; }; }; diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix index e7763bc557b6..c2a268b8bfed 100644 --- a/nixpkgs/pkgs/top-level/php-packages.nix +++ b/nixpkgs/pkgs/top-level/php-packages.nix @@ -10,8 +10,8 @@ let isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; apcu = buildPecl { - name = "apcu-5.1.15"; - sha256 = "0v91fxh3z3amwicqlmz7lvnh4zfl2d7kj2zc8pvlvj2lms8ql5zc"; + name = "apcu-5.1.17"; + sha256 = "14y7alvj5q17q1b544bxidavkn6i40cjbq2nv1m0k70ai5vv84bb"; buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; doCheck = true; checkTarget = "test"; @@ -21,8 +21,8 @@ let }; apcu_bc = buildPecl { - name = "apcu_bc-1.0.4"; - sha256 = "1raww7alwayg9nk0akly1mdrjypxlwg8safnmaczl773cwpw5cbw"; + name = "apcu_bc-1.0.5"; + sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; @@ -166,14 +166,14 @@ let }; sqlsrv = buildPecl rec { - name = "sqlsrv-5.6.0"; - sha256 = "089iy2lz7p3x9c88zaxrg37m74gh3phxqsldr33nj16rpb5d67bc"; + name = "sqlsrv-5.6.1"; + sha256 = "0ial621zxn9zvjh7k1h755sm2lc9aafc389yxksqcxcmm7kqmd0a"; buildInputs = [ pkgs.unixODBC ]; }; pdo_sqlsrv = buildPecl rec { - name = "pdo_sqlsrv-5.6.0"; - sha256 = "11g07l6mn804hbcmwqwfd6a4yx5bz54bmk5j2dpm8nil1rq9qb7r"; + name = "pdo_sqlsrv-5.6.1"; + sha256 = "02ill1iqffa5fha9iz4y91823scml24ikfk8pn90jyycfwv07x6a"; buildInputs = [ pkgs.unixODBC ]; }; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 1cabba8ea42f..1572eb7f6542 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -730,6 +730,8 @@ in { pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + pyschedule = callPackage ../development/python-modules/pyschedule { }; + pyside = callPackage ../development/python-modules/pyside { }; pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { @@ -748,8 +750,12 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; + pytest-click = callPackage ../development/python-modules/pytest-click { }; + pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; python-binance = callPackage ../development/python-modules/python-binance { }; @@ -940,6 +946,8 @@ in { aioprocessing = callPackage ../development/python-modules/aioprocessing { }; + aioresponses = callPackage ../development/python-modules/aioresponses { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; aiounifi = callPackage ../development/python-modules/aiounifi { }; @@ -952,6 +960,8 @@ in { allpairspy = callPackage ../development/python-modules/allpairspy { }; + annexremote = callPackage ../development/python-modules/annexremote { }; + ansible = callPackage ../development/python-modules/ansible { }; ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; @@ -1072,6 +1082,8 @@ in { avro3k = callPackage ../development/python-modules/avro3k {}; + aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; + python-slugify = callPackage ../development/python-modules/python-slugify { }; awesome-slugify = callPackage ../development/python-modules/awesome-slugify {}; @@ -1177,6 +1189,8 @@ in { cheroot = callPackage ../development/python-modules/cheroot {}; + chevron = callPackage ../development/python-modules/chevron {}; + cli-helpers = callPackage ../development/python-modules/cli-helpers {}; cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; @@ -1969,6 +1983,8 @@ in { humanize = callPackage ../development/python-modules/humanize { }; + humanfriendly = callPackage ../development/python-modules/humanfriendly { }; + hupper = callPackage ../development/python-modules/hupper {}; hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; @@ -2120,6 +2136,8 @@ in { paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; + papis = callPackage ../development/python-modules/papis { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; pathspec = callPackage ../development/python-modules/pathspec { }; @@ -3366,6 +3384,8 @@ in { nixpkgs = callPackage ../development/python-modules/nixpkgs { }; + nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; nose = callPackage ../development/python-modules/nose { }; @@ -3740,8 +3760,6 @@ in { pyblock = callPackage ../development/python-modules/pyblock { }; - pybcrypt = callPackage ../development/python-modules/pybcrypt { }; - pyblosxom = callPackage ../development/python-modules/pyblosxom { }; pycapnp = callPackage ../development/python-modules/pycapnp { }; @@ -4201,6 +4219,8 @@ in { setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; + shippai = callPackage ../development/python-modules/shippai {}; simanneal = callPackage ../development/python-modules/simanneal { }; @@ -4418,6 +4438,8 @@ in { xlwt = callPackage ../development/python-modules/xlwt { }; + xxhash = callPackage ../development/python-modules/xxhash { }; + youtube-dl = callPackage ../tools/misc/youtube-dl {}; youtube-dl-light = callPackage ../tools/misc/youtube-dl { @@ -4429,6 +4451,8 @@ in { zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + zerorpc = callPackage ../development/python-modules/zerorpc { }; + zipstream = callPackage ../development/python-modules/zipstream { }; zodb = callPackage ../development/python-modules/zodb {}; @@ -4863,6 +4887,8 @@ in { graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; + graph_nets = callPackage ../development/python-modules/graph_nets { }; + influxgraph = callPackage ../development/python-modules/influxgraph { }; graphitepager = callPackage ../development/python-modules/graphitepager { }; @@ -4913,6 +4939,8 @@ in { snapperGUI = callPackage ../development/python-modules/snappergui { }; + dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; + uncertainties = callPackage ../development/python-modules/uncertainties { }; funcy = callPackage ../development/python-modules/funcy { }; @@ -5129,6 +5157,8 @@ in { tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; + tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; tensorflow = diff --git a/nixpkgs/pkgs/top-level/static.nix b/nixpkgs/pkgs/top-level/static.nix index e6ef50e7ee95..fe9c04de04cd 100644 --- a/nixpkgs/pkgs/top-level/static.nix +++ b/nixpkgs/pkgs/top-level/static.nix @@ -95,9 +95,6 @@ in { static = true; shared = false; }; - libjpeg = super.libjpeg.override { - static = true; - }; gifsicle = super.gifsicle.override { static = true; }; diff --git a/nixpkgs/pkgs/top-level/unix-tools.nix b/nixpkgs/pkgs/top-level/unix-tools.nix index 7d4986068332..00edb7c09072 100644 --- a/nixpkgs/pkgs/top-level/unix-tools.nix +++ b/nixpkgs/pkgs/top-level/unix-tools.nix @@ -20,7 +20,10 @@ let bin = "${getBin provider}/bin/${cmd}"; manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz"; in runCommand "${cmd}-${version}" { - meta.platforms = map (n: { kernel.name = n; }) (attrNames providers); + meta = { + priority = 10; + platforms = map (n: { kernel.name = n; }) (attrNames providers); + }; passthru = { inherit provider; }; preferLocalBuild = true; } '' |